[oe-commits] org.oe.dev merge of '061e46a6247ee375f1eb975b1700e93e10652cb9'
thesing commit
oe at amethyst.openembedded.net
Thu Sep 4 13:47:25 UTC 2008
merge of '061e46a6247ee375f1eb975b1700e93e10652cb9'
and 'a8b3738fe9d7578507efdb8edd971c36ca53b159'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: a4756265268a114b43a67457632e11ecf67f7b8a
ViewMTN: http://monotone.openembedded.org/revision/info/a4756265268a114b43a67457632e11ecf67f7b8a
Files:
1
packages/nonworking/clucene/clucene-0.8.12-pre
packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch
packages/nonworking/clucene/clucene_0.8.12-pre.bb
packages/nonworking/clucene
packages/clucene
packages/kde4
packages/clucene/clucene-core_0.9.21.bb
packages/jpeg/jasper_1.900.1.bb
packages/kde4/akonadi_1.0.bb
packages/kde4/automoc-native_svn.bb
packages/kde4/gmm_3.0.bb
packages/kde4/kde4-native.inc
packages/kde4/kde4.inc
packages/kde4/qca_2.0.0.bb
packages/kde4/soprano_2.1.bb
packages/kde4/strigi_0.5.10.bb
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/e17/e-wm_svn.bb
packages/e17/illume_svn.bb
packages/images/fso-image.bb
packages/openmoko-projects/tichy_svn.bb
files/device_table-collie.txt
packages/kexecboot/linux-kexecboot-2.6.24
conf/machine/include/kexecboot.inc
files/device_table-kexecboot.txt
packages/kexecboot/linux-kexecboot-2.6.24/80-kexec-atags.patch
packages/kexecboot/linux-kexecboot-2.6.24/binutils-buildid-arm.patch
packages/kexecboot/linux-kexecboot-2.6.24/connectplus-prevent-oops-HACK.patch
packages/kexecboot/linux-kexecboot-2.6.24/connectplus-remove-ide-HACK.patch
packages/kexecboot/linux-kexecboot-2.6.24/defconfig-akita
packages/kexecboot/linux-kexecboot-2.6.24/defconfig-c7x0
packages/kexecboot/linux-kexecboot-2.6.24/defconfig-poodle
packages/kexecboot/linux-kexecboot-2.6.24/defconfig-spitz
packages/kexecboot/linux-kexecboot-2.6.24/defconfig-tosa
packages/kexecboot/linux-kexecboot-2.6.24/hostap-monitor-mode.patch
packages/kexecboot/linux-kexecboot-2.6.24/hrw-hostapcard.patch
packages/kexecboot/linux-kexecboot-2.6.24/htcuni-acx.patch
packages/kexecboot/linux-kexecboot-2.6.24/htcuni.patch
packages/kexecboot/linux-kexecboot-2.6.24/mtd-module.patch
packages/kexecboot/linux-kexecboot-2.6.24/poodle-bootparams.patch
packages/kexecboot/linux-kexecboot-2.6.24/poodle_buildfixes.patch
packages/kexecboot/linux-kexecboot-2.6.24/poodle_serial_vcc.patch
packages/kexecboot/linux-kexecboot-2.6.24/poodle_ts.patch
packages/kexecboot/linux-kexecboot-2.6.24/pxa-resume.patch
packages/kexecboot/linux-kexecboot-2.6.24/pxa-serial-hack.patch
packages/kexecboot/linux-kexecboot-2.6.24/pxa27x-resume.patch
packages/kexecboot/linux-kexecboot-2.6.24/pxa2xx_udc-clock.patch
packages/kexecboot/linux-kexecboot-2.6.24/pxa_fb_overlay.patch
packages/kexecboot/linux-kexecboot-2.6.24/pxafb.patch
packages/kexecboot/linux-kexecboot-2.6.24/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/kexecboot/linux-kexecboot-2.6.24/sharpsl-rc-r1.patch
packages/kexecboot/linux-kexecboot-2.6.24/sharpsl-rc-r2.patch
packages/kexecboot/linux-kexecboot-2.6.24/spitz_h_rewrite.patch
packages/kexecboot/linux-kexecboot-2.6.24/squashfs3.3.patch
packages/kexecboot/linux-kexecboot-2.6.24/versatile-armv6.patch
packages/kexecboot/linux-kexecboot-2.6.24/wm8750-treble.patch
packages/kexecboot/linux-kexecboot-2.6.24/zylonite-boot.patch
packages/kexecboot/linux-kexecboot_2.6.24.bb
conf/machine/collie.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/poodle.conf
Diffs:
#
# mt diff -r061e46a6247ee375f1eb975b1700e93e10652cb9 -ra4756265268a114b43a67457632e11ecf67f7b8a
#
#
#
# delete "packages/nonworking/clucene/clucene-0.8.12-pre"
#
# delete "packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch"
#
# delete "packages/nonworking/clucene/clucene_0.8.12-pre.bb"
#
# rename "packages/nonworking/clucene"
# to "packages/clucene"
#
# add_dir "packages/kde4"
#
# add_file "packages/clucene/clucene-core_0.9.21.bb"
# content [dae00620f34a32ad1e3db098afcf75322e9840bd]
#
# add_file "packages/jpeg/jasper_1.900.1.bb"
# content [003d093fff9fe52fcd1d5637cb0377d11e72f1be]
#
# add_file "packages/kde4/akonadi_1.0.bb"
# content [5d8691a0640cfb4a5247513c6b6863efc83ac636]
#
# add_file "packages/kde4/automoc-native_svn.bb"
# content [9acabdbfd6bc9987aac16d973ce31412d6e4aba7]
#
# add_file "packages/kde4/gmm_3.0.bb"
# content [c9eb9deeabc3e1d5a9f0ccc4f431e4e714f974eb]
#
# add_file "packages/kde4/kde4-native.inc"
# content [0e7ea00b643e2bb80546fdda97b07bd2ef4ac986]
#
# add_file "packages/kde4/kde4.inc"
# content [f57698146a8b7caf172621fe9ebdb6b67bcaf071]
#
# add_file "packages/kde4/qca_2.0.0.bb"
# content [087ac932b5dc8f6b288cbc81592e6b6e90debb04]
#
# add_file "packages/kde4/soprano_2.1.bb"
# content [8834522284fac6810714a134e2c660a6f7da0809]
#
# add_file "packages/kde4/strigi_0.5.10.bb"
# content [be310a384240e28023da1b34432487efe8cbfaf8]
#
# patch "conf/distro/include/fso-autorev.inc"
# from [598b7ea3ddecc3a43f0d1e4b1d47cf8f3cb38ee2]
# to [d62be855a73965d9e957103353793b910d68a183]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [6093c706b26cd5f5224fe3815530fb8f7a237e41]
# to [f91aae6535b6f654b682188cd9b38d22eeb9ac9c]
#
# patch "packages/e17/e-wm_svn.bb"
# from [31e37ed1d926bba319e08d51364517f6a2733054]
# to [6a946a3dba1311a21cbf60f7c6610489b8311265]
#
# patch "packages/e17/illume_svn.bb"
# from [2ab6738c659f003fae47e269585c37a5f62e8801]
# to [042e9033db9dc33830b308b01828e66474d92c30]
#
# patch "packages/images/fso-image.bb"
# from [bb6fcd20d903b540d25167c4e360ed2fbbcc7db6]
# to [6bc4b8ec1a0b100e0b0ddf88f58b0bab5d2866e2]
#
# patch "packages/openmoko-projects/tichy_svn.bb"
# from [3db3dbc56b7c3213e909b48cf04cf2c90298886b]
# to [45cfa4ee87aa72478e4ccb6e09aa9350c0dd9898]
#
============================================================
--- packages/clucene/clucene-core_0.9.21.bb dae00620f34a32ad1e3db098afcf75322e9840bd
+++ packages/clucene/clucene-core_0.9.21.bb dae00620f34a32ad1e3db098afcf75322e9840bd
@@ -0,0 +1,23 @@
+DESCRIPTION = "CLucene is a C++ port of Lucene: the high-performance, full-featured text search engine written in Java."
+SECTION = "libs"
+LICENSE = "LGPL"
+
+DEPENDS = "libtool"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/clucene/clucene-core-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-multithreading dps_static_const_type=2"
+
+do_configure() {
+ gnu-configize
+ cp ${STAGING_DATADIR}/libtool/config.sub ${S}/config
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN}-dev += "${libdir}/CLucene"
============================================================
--- packages/jpeg/jasper_1.900.1.bb 003d093fff9fe52fcd1d5637cb0377d11e72f1be
+++ packages/jpeg/jasper_1.900.1.bb 003d093fff9fe52fcd1d5637cb0377d11e72f1be
@@ -0,0 +1,14 @@
+DESCRIPTION = "Jpeg 2000 implementation"
+LICENSE = "MIT"
+
+SRC_URI = "http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip"
+
+inherit autotools lib_package
+
+EXTRA_OECONF = "--enable-shared"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/kde4/akonadi_1.0.bb 5d8691a0640cfb4a5247513c6b6863efc83ac636
+++ packages/kde4/akonadi_1.0.bb 5d8691a0640cfb4a5247513c6b6863efc83ac636
@@ -0,0 +1,9 @@
+require kde4.inc
+
+DEPENDS += "automoc-native"
+
+PV = "1.0"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/akonadi;module=1.0;proto=svn"
+
+S= "${WORKDIR}/1.0"
+
============================================================
--- packages/kde4/automoc-native_svn.bb 9acabdbfd6bc9987aac16d973ce31412d6e4aba7
+++ packages/kde4/automoc-native_svn.bb 9acabdbfd6bc9987aac16d973ce31412d6e4aba7
@@ -0,0 +1,8 @@
+require kde4.inc
+require kde4-native.inc
+inherit native
+
+SRC_URI = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport;module=automoc;proto=svn"
+
+S = "${WORKDIR}/automoc"
+
============================================================
--- packages/kde4/gmm_3.0.bb c9eb9deeabc3e1d5a9f0ccc4f431e4e714f974eb
+++ packages/kde4/gmm_3.0.bb c9eb9deeabc3e1d5a9f0ccc4f431e4e714f974eb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The Getfem++ project focuses on the development of a generic and efficient C++ library for finite element methods."
+LICENSE = "LGPLv2"
+
+inherit autotools
+
+SRC_URI = "http://download.gna.org/getfem/stable/gmm-3.0.tar.gz"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/kde4/kde4-native.inc 0e7ea00b643e2bb80546fdda97b07bd2ef4ac986
+++ packages/kde4/kde4-native.inc 0e7ea00b643e2bb80546fdda97b07bd2ef4ac986
@@ -0,0 +1,14 @@
+
+# Ugly, use qt4 from the buildhost till someone adds a qt4-native recipe
+
+EXTRA_OECMAKE = "-DQT_LIBRARY_DIR=/usr/lib \
+ -DQT_INSTALL_LIBS=/usr/lib \
+ -DQT_INCLUDE_DIR=/usr/include/qt4 \
+ -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+ -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+ -DQT_UIC3_EXECUTABLE=${OE_QMAKE_UIC3} \
+ -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+ -DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+ -DQT_QTCORE_INCLUDE_DIR=/usr/include/qt4/QtCore \
+ "
+
============================================================
--- packages/kde4/kde4.inc f57698146a8b7caf172621fe9ebdb6b67bcaf071
+++ packages/kde4/kde4.inc f57698146a8b7caf172621fe9ebdb6b67bcaf071
@@ -0,0 +1,46 @@
+LICENSE = "GPL"
+
+inherit qt4x11 cmake
+
+PV = "4.1+svnr${SRCREV}"
+SRCREV = "856719"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/4.1;module=${PN};proto=svn"
+
+# OE lacks some native qt4 tools, so we use the ones form the host :/
+EXTRA_OECMAKE = "-DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
+ -DQT_INSTALL_LIBS=${OE_QMAKE_LIBDIR_QT} \
+ -DQT_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT} \
+ -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+ -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+ -DQT_UIC3_EXECUTABLE=${OE_QMAKE_UIC3} \
+ -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+ -DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+ -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
+ -DQT_DBUSXML2CPP_EXECUTABLE=/usr/bin/qdbusxml2cpp \
+ -DQT_DBUSCPP2XML_EXECUTABLE=/usr/bin/qdbuscpp2xml \
+ "
+
+
+S = "${WORKDIR}/${PN}"
+
+
+do_install_append() {
+ install -d ${D}/${libdir}/qt4
+ mv ${D}/${STAGING_DIR_TARGET}/qt4/plugins* ${D}/${libdir}/qt4 || true
+}
+
+FILES_${PN} += "${libdir}/qt4 \
+ ${datadir}/mime \
+ ${datadir}/dbus-1 \
+ ${datadir}/config \
+ "
+
+FILES_${PN}-dbg += "${libdir}/qt4/.debug \
+ ${libdir}/qt4/*/.debug \
+ ${libdir}/qt4/*/*/.debug"
+
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/kde4/qca_2.0.0.bb 087ac932b5dc8f6b288cbc81592e6b6e90debb04
+++ packages/kde4/qca_2.0.0.bb 087ac932b5dc8f6b288cbc81592e6b6e90debb04
@@ -0,0 +1,7 @@
+require kde4.inc
+
+PV = "2.0.0"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/qca;module=2.0.0;proto=svn"
+
+S= "${WORKDIR}/2.0.0"
+
============================================================
--- packages/kde4/soprano_2.1.bb 8834522284fac6810714a134e2c660a6f7da0809
+++ packages/kde4/soprano_2.1.bb 8834522284fac6810714a134e2c660a6f7da0809
@@ -0,0 +1,9 @@
+require kde4.inc
+
+DEPENDS += "automoc-native clucene-core"
+
+PV = "2.1"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/soprano;module=${PV};proto=svn"
+
+S= "${WORKDIR}/${PV}"
+
============================================================
--- packages/kde4/strigi_0.5.10.bb be310a384240e28023da1b34432487efe8cbfaf8
+++ packages/kde4/strigi_0.5.10.bb be310a384240e28023da1b34432487efe8cbfaf8
@@ -0,0 +1,17 @@
+inherit qt4x11 cmake
+
+DEPENDS += "clucene-core pidgin expat gamin"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/strigi/strigi-${PV}.tar.bz2"
+
+EXTRA_OECMAKE = "-DENABLE_FAM:BOOL=ON \
+ -DENABLE_EXPAT:BOOL=ON \
+ -DENABLE_INOTIFY:BOOL=ON \
+ -DGAMIN_LIBARIES:STRING=${STAGING_LIBDIR} \
+ -DGAMIN_LIBRARIES:STRING=${STAGING_LIBDIR} \
+ "
+
+FILES_${PN} += "${datadir}/dbus-1 \
+ "
+
+
============================================================
--- conf/distro/include/fso-autorev.inc 598b7ea3ddecc3a43f0d1e4b1d47cf8f3cb38ee2
+++ conf/distro/include/fso-autorev.inc d62be855a73965d9e957103353793b910d68a183
@@ -1,15 +1,10 @@ SRCREV_pn-frameworkd = "${AUTOREV}"
SRCREV_pn-frameworkd = "${AUTOREV}"
+SRCREV_pn-fso-sounds = "${AUTOREV}"
SRCREV_pn-gsm0710muxd = "${AUTOREV}"
SRCREV_pn-gsmd2 = "${AUTOREV}"
+SRCREV_pn-illume = ${AUTOREV}"
SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
-SRCREV_pn-pygsm = "${AUTOREV}"
SRCREV_pn-mickeydbus = "${AUTOREV}"
SRCREV_pn-mickeyterm = "${AUTOREV}"
-SRCREV_pn-pyneod = "${AUTOREV}"
-SRCREV_pn-pynoeg = "${AUTOREV}"
-SRCREV_pn-python-odeviced = "${AUTOREV}"
-SRCREV_pn-python-oeventd = "${AUTOREV}"
-SRCREV_pn-python-ophoned = "${AUTOREV}"
-SRCREV_pn-python-ousaged = "${AUTOREV}"
SRCREV_pn-python-pytrc = "${AUTOREV}"
SRCREV_pn-zhone = "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 6093c706b26cd5f5224fe3815530fb8f7a237e41
+++ conf/distro/include/sane-srcrevs.inc f91aae6535b6f654b682188cd9b38d22eeb9ac9c
@@ -53,7 +53,6 @@ SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "35605"
SRCREV_pn-illume-theme-asu ?= "170"
SRCREV_pn-illume-theme-freesmartphone ?= "fcadedec08294c5eebd176483695828959a76e0b"
SRCREV_pn-kismet ?= "2285"
@@ -192,7 +191,7 @@ SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "35592"
+EFL_SRCREV ?= "35727"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
============================================================
--- packages/e17/e-wm_svn.bb 31e37ed1d926bba319e08d51364517f6a2733054
+++ packages/e17/e-wm_svn.bb 6a946a3dba1311a21cbf60f7c6610489b8311265
@@ -6,6 +6,8 @@ inherit e update-alternatives
inherit e update-alternatives
+RDEPENDS += "shared-mime-info mime-support"
+
SRC_URI = "\
svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
file://disable-e-cursor.patch;patch=1 \
@@ -16,6 +18,7 @@ EXTRA_OECONF = "\
EXTRA_OECONF = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+ --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
--enable-simple-x11 \
@@ -43,8 +46,6 @@ do_install_append() {
install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
}
-RDEPENDS += "shared-mime-info mime-support"
-
FILES_${PN} = "\
${bindir}/* \
${libdir}/enlightenment/modules/*/*.* \
============================================================
--- packages/e17/illume_svn.bb 2ab6738c659f003fae47e269585c37a5f62e8801
+++ packages/e17/illume_svn.bb 042e9033db9dc33830b308b01828e66474d92c30
@@ -20,8 +20,7 @@ RRECOMMENDS_${PN} = "\
"
RRECOMMENDS_${PN} = "\
- wamerican \
- ${PN}-config \
+ ${PN}-config-illume \
${PN}-theme \
${PN}-dicts-english-us \
${PN}-keyboards-default \
@@ -30,18 +29,22 @@ PACKAGES =+ "\
"
PACKAGES =+ "\
- ${PN}-config \
+ ${PN}-config-illume \
+ ${PN}-config-asu \
${PN}-dicts-english-us \
${PN}-keyboards-default \
${PN}-keyboards-numbers \
${PN}-keyboards-terminal \
"
-PACKAGE_ARCH_${PN}-config = "all"
+PACKAGE_ARCH_${PN}-config-illume = "all"
+PACKAGE_ARCH_${PN}-config-asu = "all"
PACKAGE_ARCH_${PN}-dicts-english-us = "all"
PACKAGE_ARCH_${PN}-keyboards-default = "all"
PACKAGE_ARCH_${PN}-keyboards-numbers = "all"
+PACKAGE_ARCH_${PN}-keyboards-terminal = "all"
-FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume"
+FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume/*"
+FILES_${PN}-config-asu = "${datadir}/enlightenment/data/config/asu/*"
FILES_${PN}-dicts-english-us = "${libdir}/enlightenment/modules/illume/dicts/English_*.dic"
FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd"
FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd"
============================================================
--- packages/images/fso-image.bb bb6fcd20d903b540d25167c4e360ed2fbbcc7db6
+++ packages/images/fso-image.bb 6bc4b8ec1a0b100e0b0ddf88f58b0bab5d2866e2
@@ -24,6 +24,11 @@ X_INSTALL = "\
X_INSTALL = "\
e-wm \
illume \
+ illume-config-illume \
+ illume-dicts-english-us \
+ illume-keyboards-default \
+ illume-keyboards-numbers \
+ illume-keyboards-terminal \
illume-theme-freesmartphone \
${XSERVER} \
xserver-kdrive-common \
@@ -113,6 +118,7 @@ IMAGE_INSTALL = "\
${TOOLS_INSTALL} \
${PYTHON_INSTALL} \
${ZHONE_INSTALL} \
+ tichy \
"
inherit image
@@ -140,6 +146,8 @@ fso_rootfs_postprocess() {
# minimal gtk theme foo
mkdir -p ./etc/gtk-2.0/
echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
+ # fix strange iconv/gconf bug
+ ln -s libc.so.6 ./lib/libc.so
cd $curdir
}
============================================================
--- packages/openmoko-projects/tichy_svn.bb 3db3dbc56b7c3213e909b48cf04cf2c90298886b
+++ packages/openmoko-projects/tichy_svn.bb 45cfa4ee87aa72478e4ccb6e09aa9350c0dd9898
@@ -11,3 +11,4 @@ FILES_${PN} += "${datadir}"
inherit distutils
FILES_${PN} += "${datadir}"
+RDEPENDS_${PN} += "python-pygame"
#
# mt diff -ra8b3738fe9d7578507efdb8edd971c36ca53b159 -ra4756265268a114b43a67457632e11ecf67f7b8a
#
#
#
# delete "files/device_table-collie.txt"
#
# add_dir "packages/kexecboot/linux-kexecboot-2.6.24"
#
# add_file "conf/machine/include/kexecboot.inc"
# content [7acdc760852b5120f1553c0b0c6902c689c52061]
#
# add_file "files/device_table-kexecboot.txt"
# content [0aa81ea1cfae99fe6444169126959812cdae023b]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/80-kexec-atags.patch"
# content [75e3fb1ccdbdc1050e581f817d74d2420d295de7]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/binutils-buildid-arm.patch"
# content [0a9c96315b18cb403f1014aec2038e9477c2db07]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/connectplus-prevent-oops-HACK.patch"
# content [e7f07c5193600ba480642fd62dcae173b6b62189]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/connectplus-remove-ide-HACK.patch"
# content [8ffef06194b29e2b22abed7edb6044a5ad4316d7]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/defconfig-akita"
# content [693da785b5b42f0897cedd88c0d1f89d11447415]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/defconfig-c7x0"
# content [aee4033d467eb23daa5883490b3469a0af98a1b6]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/defconfig-poodle"
# content [b0a3f94e84911c5cb26c1a17841addaa133a7681]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/defconfig-spitz"
# content [39baa0c5b9c90896c3c14f93bd1b08dd9fd8ff74]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/defconfig-tosa"
# content [c9f360de259fcde1a980c3447c544c83ca81fc5b]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/hostap-monitor-mode.patch"
# content [7b6d1b43c24eb7c1135e018aa8ef42f28f5ded00]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/hrw-hostapcard.patch"
# content [57f42102146c4908611f21d2fcf3342587c07066]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/htcuni-acx.patch"
# content [12ac6d8ef90c4bbd6b06a294889b80e6e53aa996]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/htcuni.patch"
# content [3734b428351aad5959f90bc473df40b7cfa27071]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/mtd-module.patch"
# content [3336d389463dfeab12804b8b425c9451ac9ba8ea]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/poodle-bootparams.patch"
# content [e6a88af161b43f5dd7cbbc5817deffe33fc265d1]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/poodle_buildfixes.patch"
# content [761fdb1b2dbefa39ea0aa0a0b768e81b6bd09238]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/poodle_serial_vcc.patch"
# content [0cfe4130478567a3bb1d0c3253fa32a6d43bf9e9]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/poodle_ts.patch"
# content [fea8e687817c208722ca4c0feacec75ceef38f44]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/pxa-resume.patch"
# content [9036ade93f35d52bfe3063cdc97a787221998fc7]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/pxa-serial-hack.patch"
# content [af916d2b2561b14a1e40383de584a3a60110b5e4]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/pxa27x-resume.patch"
# content [9165b53d2b07e5d3fed32ccf6061ab1e12856c29]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/pxa2xx_udc-clock.patch"
# content [4d1eaa5fd0823e232e423f4ec98563c53090a9d8]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/pxa_fb_overlay.patch"
# content [585b5ef26c37766ec384c810ab5bd055e44d1e8a]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/pxafb.patch"
# content [f885ab91c336e3345ebcc06ff37f90b630dca0d1]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# content [dd09cc9eb4d3abd338470eb2a61db0e8faf293cb]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/sharpsl-rc-r1.patch"
# content [c1ba9d58f22e96a7d5fd27cd59af335284d4de5c]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/sharpsl-rc-r2.patch"
# content [d64355f76f4983d49aa06c5c7f5b438debf72c22]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/spitz_h_rewrite.patch"
# content [74aa58d11861398f4b75b2fbd48a4705dc67ab74]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/squashfs3.3.patch"
# content [3c2c3d66d9c2e306b9af229c447163389280ca3f]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/versatile-armv6.patch"
# content [4741cf31febeef15c0b7646588b288c097a3d14c]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/wm8750-treble.patch"
# content [075d3018a7b6514bfd21550eb2cf93372b02ac02]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.24/zylonite-boot.patch"
# content [e47e2f442bc69d9679debc127d56ce0ad366ed6b]
#
# add_file "packages/kexecboot/linux-kexecboot_2.6.24.bb"
# content [aa79b83febcd48f2b8544b27be375ba3a580b3e3]
#
# patch "conf/machine/collie.conf"
# from [105a9e4ec629b862a8a7ad233a14e2449eb3976b]
# to [8cda630361532ba2b70242be5f8381f3d784ad6a]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [d5af9251eed68a286197deb3a5761113b02bbd2f]
# to [109b8aefb282d22fcc40de5e3b21e95933d87121]
#
# patch "conf/machine/poodle.conf"
# from [feea8a0731386d34ce3e6563f8af4005d3e3e908]
# to [a6cf8356f2ba4a99540f6357fa1c3d0dc5aedf01]
#
============================================================
--- conf/machine/include/kexecboot.inc 7acdc760852b5120f1553c0b0c6902c689c52061
+++ conf/machine/include/kexecboot.inc 7acdc760852b5120f1553c0b0c6902c689c52061
@@ -0,0 +1,15 @@
+# kexecboot specific config options
+
+# NOTE: include this file after zaurus-2.6.inc for zaurus machines
+
+MACHINE_FEATURES_append = "kexecboot"
+
+# Include Kernel image in kexecboot enabled images
+RDEPENDS_kernel-base = "kernel-image"
+
+# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
+DONT_CHECK_KERNELSIZE ?= "1"
+
+IMAGE_DEVICE_TABLES ?= "files/device_table-minimal.txt"
+#add some device nodes for kexecboot
+IMAGE_DEVICE_TABLES_append = " files/device_table-kexecboot.txt"
============================================================
--- files/device_table-kexecboot.txt 0aa81ea1cfae99fe6444169126959812cdae023b
+++ files/device_table-kexecboot.txt 0aa81ea1cfae99fe6444169126959812cdae023b
@@ -0,0 +1,14 @@
+# mmc numbers are assigned dynamicly so if you have other dynamic assigned block devices it may be wrong
+/dev/mmcblk0 b 660 0 6 179 0 - - -
+/dev/mmcblk0p1 b 660 0 6 179 1 - - -
+/dev/mmcblk0p2 b 660 0 6 179 2 - - -
+/dev/mmcblk0p3 b 660 0 6 179 3 - - -
+/dev/event0 c 660 0 0 13 64 - - -
+/dev/fb0 c 660 0 0 29 0 - - -
+# mmc numbers are assigned dynamicly so if you have other dynamic assigned block devices it may be wrong
+/dev/mmcblk0 b 660 0 6 179 0 - - -
+/dev/mmcblk0p1 b 660 0 6 179 1 - - -
+/dev/mmcblk0p2 b 660 0 6 179 2 - - -
+/dev/mmcblk0p3 b 660 0 6 179 3 - - -
+/dev/event0 c 660 0 0 13 64 - - -
+/dev/fb0 c 660 0 0 29 0 - - -
============================================================
--- packages/kexecboot/linux-kexecboot-2.6.24/80-kexec-atags.patch 75e3fb1ccdbdc1050e581f817d74d2420d295de7
+++ packages/kexecboot/linux-kexecboot-2.6.24/80-kexec-atags.patch 75e3fb1ccdbdc1050e581f817d74d2420d295de7
@@ -0,0 +1,111 @@
+--- linux-2.6.21.5/arch/arm/kernel/setup.c.orig 2007-06-30 16:39:38.000000000 -0500
++++ linux-2.6.21.5/arch/arm/kernel/setup.c 2007-06-30 19:02:51.000000000 -0500
+@@ -23,6 +23,7 @@
+ #include <linux/cpu.h>
+ #include <linux/interrupt.h>
+ #include <linux/smp.h>
++#include <linux/kexec.h>
+
+ #include <asm/cpu.h>
+ #include <asm/elf.h>
+@@ -767,6 +768,23 @@
+ }
+ arch_initcall(customize_machine);
+
++#ifdef CONFIG_KEXEC
++
++/* Physical addr of where the boot params should be for this machine */
++extern unsigned long kexec_boot_params_address;
++
++/* Physical addr of the buffer into which the boot params are copied */
++extern unsigned long kexec_boot_params_copy;
++
++/* Pointer to the boot params buffer, for manipulation and display */
++unsigned long kexec_boot_params;
++EXPORT_SYMBOL(kexec_boot_params);
++
++/* The buffer itself - make sure it is sized correctly */
++static unsigned long kexec_boot_params_buf[(KEXEC_BOOT_PARAMS_SIZE + 3) / 4];
++
++#endif
++
+ void __init setup_arch(char **cmdline_p)
+ {
+ struct tag *tags = (struct tag *)&init_tags;
+@@ -783,6 +801,13 @@
+ if (mdesc->boot_params)
+ tags = phys_to_virt(mdesc->boot_params);
+
++#ifdef CONFIG_KEXEC
++ kexec_boot_params_address = mdesc->boot_params;
++ kexec_boot_params_copy = virt_to_phys(kexec_boot_params_buf);
++ kexec_boot_params = (unsigned long)kexec_boot_params_buf;
++ if (mdesc->boot_params)
++ memcpy((void *)kexec_boot_params, tags, KEXEC_BOOT_PARAMS_SIZE);
++#endif
+ /*
+ * If we have the old style parameters, convert them to
+ * a tag list.
+--- linux-2.6.21.5/arch/arm/kernel/relocate_kernel.S.orig 2007-06-30 16:39:28.000000000 -0500
++++ linux-2.6.21.5/arch/arm/kernel/relocate_kernel.S 2007-06-30 19:10:32.000000000 -0500
+@@ -7,6 +7,23 @@
+ .globl relocate_new_kernel
+ relocate_new_kernel:
+
++ /* Move boot params back to where the kernel expects them */
++
++ ldr r0,kexec_boot_params_address
++ teq r0,#0
++ beq 8f
++
++ ldr r1,kexec_boot_params_copy
++ mov r6,#KEXEC_BOOT_PARAMS_SIZE/4
++7:
++ ldr r5,[r1],#4
++ str r5,[r0],#4
++ subs r6,r6,#1
++ bne 7b
++
++8:
++ /* Boot params moved, now go on with the kernel */
++
+ ldr r0,kexec_indirection_page
+ ldr r1,kexec_start_address
+
+@@ -50,7 +67,7 @@
+ mov lr,r1
+ mov r0,#0
+ ldr r1,kexec_mach_type
+- mov r2,#0
++ ldr r2,kexec_boot_params_address
+ mov pc,lr
+
+ .globl kexec_start_address
+@@ -65,6 +82,16 @@
+ kexec_mach_type:
+ .long 0x0
+
++ /* phy addr where new kernel will expect to find boot params */
++ .globl kexec_boot_params_address
++kexec_boot_params_address:
++ .long 0x0
++
++ /* phy addr where old kernel put a copy of orig boot params */
++ .globl kexec_boot_params_copy
++kexec_boot_params_copy:
++ .long 0x0
++
+ relocate_new_kernel_end:
+
+ .globl relocate_new_kernel_size
+--- linux-2.6.21.5/include/asm-arm/kexec.h.orig 2007-06-30 16:41:17.000000000 -0500
++++ linux-2.6.21.5/include/asm-arm/kexec.h 2007-06-30 19:11:22.000000000 -0500
+@@ -14,6 +14,8 @@
+
+ #define KEXEC_ARCH KEXEC_ARCH_ARM
+
++#define KEXEC_BOOT_PARAMS_SIZE 1536
++
+ #ifndef __ASSEMBLY__
+
+ #define MAX_NOTE_BYTES 1024
============================================================
--- packages/kexecboot/linux-kexecboot-2.6.24/binutils-buildid-arm.patch 0a9c96315b18cb403f1014aec2038e9477c2db07
+++ packages/kexecboot/linux-kexecboot-2.6.24/binutils-buildid-arm.patch 0a9c96315b18cb403f1014aec2038e9477c2db07
@@ -0,0 +1,16 @@
+---
+ arch/arm/kernel/vmlinux.lds.S | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: linux-2.6.22/arch/arm/kernel/vmlinux.lds.S
+===================================================================
+--- linux-2.6.22.orig/arch/arm/kernel/vmlinux.lds.S 2007-09-11 18:32:29.000000000 +0200
++++ linux-2.6.22/arch/arm/kernel/vmlinux.lds.S 2007-09-11 18:33:42.000000000 +0200
+@@ -94,6 +94,7 @@
+ TEXT_TEXT
+ SCHED_TEXT
+ LOCK_TEXT
++ *(.note.*)
+ #ifdef CONFIG_MMU
+ *(.fixup)
+ #endif
============================================================
--- packages/kexecboot/linux-kexecboot-2.6.24/connectplus-prevent-oops-HACK.patch e7f07c5193600ba480642fd62dcae173b6b62189
+++ packages/kexecboot/linux-kexecboot-2.6.24/connectplus-prevent-oops-HACK.patch e7f07c5193600ba480642fd62dcae173b6b62189
@@ -0,0 +1,17 @@
+Index: linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c
+===================================================================
+--- linux-2.6.21.orig/drivers/net/wireless/hostap/hostap_hw.c 2007-07-07 12:45:39.000000000 +0100
++++ linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c 2007-07-07 12:47:30.000000000 +0100
+@@ -2666,6 +2666,12 @@
+ iface = netdev_priv(dev);
+ local = iface->local;
+
++ if(dev->base_addr == 0)
++ {
++ printk(KERN_DEBUG "%s: IRQ before base_addr set\n", dev->name);
++ return IRQ_HANDLED;
++ }
++
+ prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
+
+ if (local->func->card_present && !local->func->card_present(local)) {
============================================================
--- packages/kexecboot/linux-kexecboot-2.6.24/connectplus-remove-ide-HACK.patch 8ffef06194b29e2b22abed7edb6044a5ad4316d7
+++ packages/kexecboot/linux-kexecboot-2.6.24/connectplus-remove-ide-HACK.patch 8ffef06194b29e2b22abed7edb6044a5ad4316d7
@@ -0,0 +1,12 @@
+Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c 2005-09-01 22:43:46.000000000 +0100
++++ linux-2.6.13/drivers/ide/legacy/ide-cs.c 2005-09-01 22:45:46.000000000 +0100
+@@ -488,7 +488,6 @@
+ PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card ", "KODAK ", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
+ PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
+ PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
+- PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
+ PCMCIA_DEVICE_NULL,
+ };
+ MODULE_DEVICE_TABLE(pcmcia, ide_ids);
============================================================
--- packages/kexecboot/linux-kexecboot-2.6.24/defconfig-akita 693da785b5b42f0897cedd88c0d1f89d11447415
+++ packages/kexecboot/linux-kexecboot-2.6.24/defconfig-akita 693da785b5b42f0897cedd88c0d1f89d11447415
@@ -0,0 +1,922 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.24
+# Tue Aug 26 17:05:18 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz"
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_UID16 is not set
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+# CONFIG_BUG is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_BASE_FULL=y
+# CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list