[oe-commits] org.oe.dev merge of '35d00516005b1f33ef42cecb0350a20a51723706'
thesing commit
oe at amethyst.openembedded.net
Sun Jul 27 17:29:38 UTC 2008
merge of '35d00516005b1f33ef42cecb0350a20a51723706'
and 'c167fd3cbb5184fbfe56dff8fbb57e988ce58f51'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 6ee0dff6c561c5d9ad21138f2fc8a037a98fa6d0
ViewMTN: http://monotone.openembedded.org/revision/info/6ee0dff6c561c5d9ad21138f2fc8a037a98fa6d0
Files:
1
packages/ecj/ecj-bootstrap-native_3.3.bb
packages/ecj/ecj-bootstrap-native_3.4.bb
packages/ecj/ecj-initial_3.3.bb
packages/ecj/ecj-initial_3.4.bb
packages/openmoko-projects/illume
packages/util-linux-ng/util-linux-ng-2.14
packages/xorg-font/font-misc-misc
packages/ecj/ecj-bootstrap-native_3.3.2.bb
packages/ecj/ecj-initial_3.3.2.bb
packages/mesa/files/mklib-cross.patch
packages/mesa/mesa-dri_7.0.3.bb
packages/openchrome/openchrome.inc
packages/openchrome/xf86-video-openchrome_0.2.902.bb
packages/openmoko-projects/illume/configure-keyboard.patch
packages/snes9x/64bit.patch
packages/util-linux-ng/util-linux-ng-2.14/util-linux-ng-uclibc-versionsort.patch
packages/xorg-font/font-misc-misc/configure-mapdir.patch
packages/xorg-font/font-misc-misc_1.0.0.bb
conf/distro/include/angstrom-2007-for-openmoko.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/classpath/classpath-initial_0.93.bb
packages/classpath/classpath-native.inc
packages/efl1/ecore_cvs.bb
packages/eglibc/eglibc.inc
packages/eglibc/eglibc_svn.bb
packages/gcc/gcc-cross-kernel.inc
packages/images/fso-image.bb
packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
packages/mesa/mesa-dri_6.5.2.bb
packages/openchrome/openchrome_svn.bb
packages/openmoko-projects/illume_svn.bb
packages/snes9x/snes9x_1.43-WIP1.bb
packages/tasks/task-mythfront.bb
packages/util-linux-ng/util-linux-ng_2.14.bb
packages/xorg-lib/libx11-native_1.0.1.bb
packages/linux/linux-rp-2.6.26/initramfs-config-collie
packages/linux/linux-kexecboot-2.6.26
files/device_table_add-mmc.txt
packages/linux/linux-kexecboot.inc
packages/linux/linux-kexecboot_2.6.26.bb
classes/kernel.bbclass
conf/machine/collie.conf
conf/machine/include/zaurus-2.6.inc
packages/images/initramfs-kexec-image.bb
packages/linux/linux-rp-2.6.26/collie.patch
packages/linux/linux-rp-2.6.26/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.26.bb
Diffs:
#
# mt diff -r35d00516005b1f33ef42cecb0350a20a51723706 -r6ee0dff6c561c5d9ad21138f2fc8a037a98fa6d0
#
#
#
# rename "packages/ecj/ecj-bootstrap-native_3.3.bb"
# to "packages/ecj/ecj-bootstrap-native_3.4.bb"
#
# rename "packages/ecj/ecj-initial_3.3.bb"
# to "packages/ecj/ecj-initial_3.4.bb"
#
# add_dir "packages/openmoko-projects/illume"
#
# add_dir "packages/util-linux-ng/util-linux-ng-2.14"
#
# add_dir "packages/xorg-font/font-misc-misc"
#
# add_file "packages/ecj/ecj-bootstrap-native_3.3.2.bb"
# content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
#
# add_file "packages/ecj/ecj-bootstrap-native_3.3.bb"
# content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
#
# add_file "packages/ecj/ecj-initial_3.3.2.bb"
# content [b62ca6b6be5ba0eb2884b571d54eec89895f48a5]
#
# add_file "packages/ecj/ecj-initial_3.3.bb"
# content [b410a403c3f29b5239ebde0751e23e02f0d3409a]
#
# add_file "packages/mesa/files/mklib-cross.patch"
# content [5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457]
#
# add_file "packages/mesa/mesa-dri_7.0.3.bb"
# content [5d4a0c4a70a84c4f229000a50d59787d2df46405]
#
# add_file "packages/openchrome/openchrome.inc"
# content [9289056713085ea3b218f5a8361f128dfdcbd4b4]
#
# add_file "packages/openchrome/xf86-video-openchrome_0.2.902.bb"
# content [aa063269846ae6af14936f70f285fc3e2fa39659]
#
# add_file "packages/openmoko-projects/illume/configure-keyboard.patch"
# content [7d8bf7ac9d5970f6624d67804676e55a5f781bd0]
#
# add_file "packages/snes9x/64bit.patch"
# content [892094c30481d08f67b597846d74b773713ee387]
#
# add_file "packages/util-linux-ng/util-linux-ng-2.14/util-linux-ng-uclibc-versionsort.patch"
# content [54e479ad338ff587544d556bfa464d1faadaa87c]
#
# add_file "packages/xorg-font/font-misc-misc/configure-mapdir.patch"
# content [b0b2748dc694aa702123cdda29e0fc58955d3509]
#
# add_file "packages/xorg-font/font-misc-misc_1.0.0.bb"
# content [b48bf951fff089de82beb7849571026e5551d5eb]
#
# patch "conf/distro/include/angstrom-2007-for-openmoko.inc"
# from [85b9d88526b7e40205f13f547c01c721f42fa32f]
# to [628f04b4b86a64fdc89bf6da6312cb3ddd89b323]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [7b7cd7bd8e5afa2e2ac65b301bc728c150eeec6a]
# to [94e55ff2e17a2b6a78e02b39d7246a1ee7dbe9b0]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [2fd13fc744e766175938eb267aa49d99d9f5c39e]
# to [2bfeeb7d101578d2eb6340c6d44b4de3c211d7bd]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [f978a9c4326f1feb4b7e6b23a94f6b9ce18b90d1]
# to [dc8efa6d25c6a10758cfbd9adac7dfb39da53d9e]
#
# patch "conf/distro/openmoko.conf"
# from [56485e49938379e78da05fc595ef5d2edef9dd28]
# to [ee68bedb7c293916d63371c4a1679786be088e72]
#
# patch "packages/classpath/classpath-initial_0.93.bb"
# from [dcbd137250c9fd6e2ca0ca88afc7404e9ede289c]
# to [e8d4723f96ff6828015eafcabc845d6122cf304f]
#
# patch "packages/classpath/classpath-native.inc"
# from [ce05671105e08fb6217f1907cf4202d41ebfd512]
# to [1ac43332aef0a8c639c3aca49bc3319d0ced8273]
#
# patch "packages/ecj/ecj-initial_3.4.bb"
# from [b410a403c3f29b5239ebde0751e23e02f0d3409a]
# to [e4737a57975f1f5295f3ba5362f3903d1e4b715b]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [db9ceefb6209514dcc2b22c3b7d8e0816820f762]
# to [2585aee85a18623ca3ef7c268f21be835fffc097]
#
# patch "packages/eglibc/eglibc.inc"
# from [eef22ba34145bef9522d66a4eb30da587ba3e6a2]
# to [08b9b1f3b71d0ea992ad8a5b349c51348b11f917]
#
# patch "packages/eglibc/eglibc_svn.bb"
# from [40ee7830b471a23f6a2b24acfbde31a644e4883e]
# to [17bc96153f4c89522834fb62626b509064db5c9f]
#
# patch "packages/gcc/gcc-cross-kernel.inc"
# from [20867aba06eab9b6f8398e481391ea9109b3b80e]
# to [3c5f4ada32dfb18f511b21b25bee2d337693cce0]
#
# patch "packages/images/fso-image.bb"
# from [8e985d24c20f5264b0ec523fc3b8f7f1d938f8b2]
# to [5c8597f6d160a644126f564543e5c4e542223e4b]
#
# patch "packages/lirc/lirc-modules_0.8.3+cvs20080713.bb"
# from [89ce1aeca5d8a6d9596df1bc0ead0b411a4d8cec]
# to [2501f84812bd4886c523ca926fa3ba6f73412213]
#
# patch "packages/mesa/mesa-dri_6.5.2.bb"
# from [52f888551f42e13c2bbb0e72aacb6e76e146ab4b]
# to [9ad52ef52dce72a10eeb8817bc6da38ccd9f3ec8]
#
# patch "packages/openchrome/openchrome_svn.bb"
# from [7eebdeee0fc8144c09e311f8487f162295b0dd20]
# to [620d7da746e80389843521b8fa4261bccf240ced]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [39270f48f788723273ee3a1246361321db6608d4]
# to [7ee2770bdff03d604f1482288b0b7c00f05481ce]
#
# patch "packages/snes9x/snes9x_1.43-WIP1.bb"
# from [af3bab5a92cdc8d31e61a1bd22b151b3d6760256]
# to [ff6c690e4975f1e3e41aaeea8034f1fbce1e5c5b]
#
# patch "packages/tasks/task-mythfront.bb"
# from [9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9]
# to [57152c79e113714f749f454369eb70e26b0853d2]
#
# patch "packages/util-linux-ng/util-linux-ng_2.14.bb"
# from [5661ee890f7e557f934a1d336b7ab7ee3f8a410e]
# to [47c0e31e56605d3874318e61419d054a55efd35c]
#
# patch "packages/xorg-lib/libx11-native_1.0.1.bb"
# from [7c117d26c8901c44e5cebd665e12dfc191784a6d]
# to [7f8ffc178891c54f10966ce194ca30c7439f2019]
#
============================================================
--- packages/ecj/ecj-bootstrap-native_3.3.2.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
+++ packages/ecj/ecj-bootstrap-native_3.3.2.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+ # Create the start script
+ echo "#!/bin/sh" > ecj-bootstrap
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+ echo "RUNTIME=java" >> ecj-bootstrap
+ cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
============================================================
--- packages/ecj/ecj-bootstrap-native_3.3.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
+++ packages/ecj/ecj-bootstrap-native_3.3.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+ # Create the start script
+ echo "#!/bin/sh" > ecj-bootstrap
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+ echo "RUNTIME=java" >> ecj-bootstrap
+ cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
============================================================
--- packages/ecj/ecj-initial_3.3.2.bb b62ca6b6be5ba0eb2884b571d54eec89895f48a5
+++ packages/ecj/ecj-initial_3.3.2.bb b62ca6b6be5ba0eb2884b571d54eec89895f48a5
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip \
+ file://ecj.in \
+ "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+ if [ ! -d source ]; then
+ mkdir source
+ fi
+
+ if [ ! -d build ]; then
+ mkdir build
+ fi
+
+ # Remove crap.
+ rm about.html build.xml
+ rm -rf META-INF
+
+ # Move source into separate subdir.
+ mv org source/
+
+ # Remove stuff unneeded for the bootstrap compiler.
+ rm -rf source/org/eclipse/jdt/internal/compiler/apt
+ rm -rf source/org/eclipse/jdt/internal/compiler/tool
+ rm -rf source/org/eclipse/jdt/internal/antadapter
+ rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+ # Make a copy of the remaining source to get the embedded
+ # resources.
+ cp -r source/org build/
+
+ # Remove source code and other stuff.
+ find build -name '*.java' -exec rm -f {} \;
+ find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+ find source -name '*.java' > sourcefiles
+ split -l 25 sourcefiles ecj-sources.
+
+ # Compiling in place is done because the sources contain
+ # property files which need to be available at runtime.
+ for list in `find . -name 'ecj-sources.*'`; do
+ echo "building files in $list ...";
+ echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+ jikes-initial \
+ -d build -source 1.4 -sourcepath source `cat $list`;
+ done
+
+ fastjar -c -C build . -f ${JAR}
+
+ # Create the start script
+ echo "#!/bin/sh" > ecj-initial
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+ echo "RUNTIME=java-initial" >> ecj-initial
+ cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
============================================================
--- packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
+++ packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \
+ file://ecj.in \
+ "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+ if [ ! -d source ]; then
+ mkdir source
+ fi
+
+ if [ ! -d build ]; then
+ mkdir build
+ fi
+
+ # Remove crap.
+ rm about.html build.xml
+ rm -rf META-INF
+
+ # Move source into separate subdir.
+ mv org source/
+
+ # Remove stuff unneeded for the bootstrap compiler.
+ rm -rf source/org/eclipse/jdt/internal/compiler/apt
+ rm -rf source/org/eclipse/jdt/internal/compiler/tool
+ rm -rf source/org/eclipse/jdt/internal/antadapter
+ rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+ # Make a copy of the remaining source to get the embedded
+ # resources.
+ cp -r source/org build/
+
+ # Remove source code and other stuff.
+ find build -name '*.java' -exec rm -f {} \;
+ find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+ find source -name '*.java' > sourcefiles
+ split -l 25 sourcefiles ecj-sources.
+
+ # Compiling in place is done because the sources contain
+ # property files which need to be available at runtime.
+ for list in `find . -name 'ecj-sources.*'`; do
+ echo "building files in $list ...";
+ echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+ jikes-initial \
+ -d build -source 1.4 -sourcepath source `cat $list`;
+ done
+
+ fastjar -c -C build . -f ${JAR}
+
+ # Create the start script
+ echo "#!/bin/sh" > ecj-initial
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+ echo "RUNTIME=java-initial" >> ecj-initial
+ cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
============================================================
--- packages/mesa/files/mklib-cross.patch 5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457
+++ packages/mesa/files/mklib-cross.patch 5706f03d88d0fe94f1ea04a6a8dbce2e46f4b457
@@ -0,0 +1,14 @@
+--- s/bin/mklib~ 2008-02-19 15:30:18.000000000 +0000
++++ s/bin/mklib 2008-07-27 11:15:25.000000000 +0100
+@@ -204,9 +204,9 @@
+ if [ "x$LINK" = "x" ] ; then
+ # -linker was not specified so set default link command now
+ if [ $CPLUSPLUS = 1 ] ; then
+- LINK=g++
++ LINK=$CXX
+ else
+- LINK=gcc
++ LINK=$CC
+ fi
+ fi
+
============================================================
--- packages/mesa/mesa-dri_7.0.3.bb 5d4a0c4a70a84c4f229000a50d59787d2df46405
+++ packages/mesa/mesa-dri_7.0.3.bb 5d4a0c4a70a84c4f229000a50d59787d2df46405
@@ -0,0 +1,42 @@
+include mesa-common.inc
+
+# suppress mklib-rpath-link patch from mesa-common
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch;patch=1"
+
+FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+PR = "r0"
+
+DEPENDS += "libdrm"
+# DRI is useless without the kernel drivers
+RRECOMMENDS += " kernel-module-drm kernel-module-radeon "
+
+do_configure() {
+ cd configs
+
+ ln -sf linux-dri current
+ sed -e "s%CC *= *.*%CC = ${CC}%" -i current
+ sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
+ sed -e "s%LD *= *.*%LD = ${LD}%" -i current
+ sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
+ sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
+ sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+ sed -i s:\$\(CC\):gcc:g ../src/mesa/x86/Makefile
+ echo "SRC_DIRS = mesa" >> current
+ echo "DRI_DRIVER_INSTALL_DIR = ${D}${libdir}/dri" >> current
+}
+
+do_install() {
+ oe_runmake -C src/mesa/drivers/dri install
+}
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug"
+
+python populate_packages_prepend () {
+ import re, os.path
+
+ do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver')
+}
+
============================================================
--- packages/openchrome/openchrome.inc 9289056713085ea3b218f5a8361f128dfdcbd4b4
+++ packages/openchrome/openchrome.inc 9289056713085ea3b218f5a8361f128dfdcbd4b4
@@ -0,0 +1,16 @@
+PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc"
+
+FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*"
+FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*"
+FILES_libviaXvMC-dev = "${libdir}/libviaXvMC.so ${libdir}/libviaXvMC.la"
+FILES_libviaXvMCPro-dev = "${libdir}/libviaXvMCPro.so ${libdir}/libviaXvMCPro.la"
+FILES_libviaXvMC-dbg += "${libdir}/.debug/libviaXvMC.so.*"
+FILES_libviaXvMCPro-dbg += "${libdir}/.debug/libviaXvMCPro.so.*"
+
+DEPENDS = "xserver-xorg libxvmc"
+
+inherit autotools xorg-module
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/openchrome/xf86-video-openchrome_0.2.902.bb aa063269846ae6af14936f70f285fc3e2fa39659
+++ packages/openchrome/xf86-video-openchrome_0.2.902.bb aa063269846ae6af14936f70f285fc3e2fa39659
@@ -0,0 +1,4 @@
+SRC_URI = "http://www.openchrome.org/releases/xf86-video-openchrome-${PV}.tar.gz file://configure.patch;patch=1 file://configure-dri.patch;patch=1"
+PACKAGES_DYNAMIC = "xorg-driver-openchrome"
+
+%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc167fd3cbb5184fbfe56dff8fbb57e988ce58f51 -r6ee0dff6c561c5d9ad21138f2fc8a037a98fa6d0
#
#
#
# delete "packages/linux/linux-rp-2.6.26/initramfs-config-collie"
#
# add_dir "packages/linux/linux-kexecboot-2.6.26"
#
# add_file "files/device_table_add-mmc.txt"
# content [fcb6f461f63fe3444ef486405ff97906d7c7fb9a]
#
# add_file "packages/linux/linux-kexecboot.inc"
# content [1a5dde189f3eed29477082972af6e8298f55c4a6]
#
# add_file "packages/linux/linux-kexecboot_2.6.26.bb"
# content [287d3bbbebb212c90ad5294bbd7bf094aa17bed4]
#
# patch "classes/kernel.bbclass"
# from [7cbc09d4f4fd3e7051928da4ba4f8a6034393be9]
# to [3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b]
#
# patch "conf/machine/collie.conf"
# from [c23a85835bc13ac978f36742cfc8ccf5880e0ec8]
# to [334ab4b53eea3f3be4a7b39b8fac9412b650aef2]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [f56c5d7f00ad90430d1cfa3e9ff6283245f5e5c6]
# to [8294b7a8b586a8481132e82ee1e468c413001cb9]
#
# patch "packages/images/initramfs-kexec-image.bb"
# from [4e2703a70b61d827efd410dd7cd1627f0fd071d2]
# to [5d39e3585a4b60bb1a3abbb4cb5182e5a43b2e7b]
#
# patch "packages/linux/linux-rp-2.6.26/collie.patch"
# from [8a5d0916b37087cb7db9e5343a30aeba767cab10]
# to [98c325a4a359d1c1486ffc16439210f5f5adb9b6]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-collie"
# from [c605cec73bcfbadfc27203a557ee8ae481f7370f]
# to [1e9b95a0d88a54777e7f56273ef6fdb091b59ba4]
#
# patch "packages/linux/linux-rp.inc"
# from [8c503982eb0f04c622745f3b357ce507a502d408]
# to [2c46a07cacd6773da1465135b93706ce46d94b79]
#
# patch "packages/linux/linux-rp_2.6.26.bb"
# from [85f16a25da2b1ef154850e283cc2acbc720956f1]
# to [ff9b4547b7210312365df450c44cf68b21e2987a]
#
============================================================
--- files/device_table_add-mmc.txt fcb6f461f63fe3444ef486405ff97906d7c7fb9a
+++ files/device_table_add-mmc.txt fcb6f461f63fe3444ef486405ff97906d7c7fb9a
@@ -0,0 +1,2 @@
+# mmc numbers are assigned dynamicly so if you have other dynamic assigned block devices it may be wrong
+/dev/mmcblk0p1 b 660 0 6 179 1 - - -
============================================================
--- packages/linux/linux-kexecboot.inc 1a5dde189f3eed29477082972af6e8298f55c4a6
+++ packages/linux/linux-kexecboot.inc 1a5dde189f3eed29477082972af6e8298f55c4a6
@@ -0,0 +1,39 @@
+DESCRIPTION = "2.6 Linux kexec bootloader for Zaurus devices and iPAQ hx2750."
+SECTION = "kernel"
+LICENSE = "GPL"
+
+INITRAMFS_IMAGE = "initramfs-kexec-image"
+inherit kernel
+PACKAGES = ""
+PROVIDES = ""
+
+DOSRC = "http://www.do13.de/openzaurus/patches"
+RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
+JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
+BASRC = "http://www.orca.cx/zaurus/patches"
+CHSRC = "http://oz.drigon.com/patches"
+TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
+
+COMPATIBLE_HOST = "(arm|i.86).*-linux"
+COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal|zylonite)'
+
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}"
+
+KERNEL_DEFCONFIG ?= "defconfig-${MACHINE}"
+
+do_compile[depends] += "${INITRAMFS_IMAGE}:do_rootfs"
+
+do_configure() {
+ cp '${WORKDIR}/${KERNEL_DEFCONFIG}' '${S}/.config'
+ yes '' | oe_runmake oldconfig
+}
+
+do_stage() {
+}
+
+do_install() {
+}
+
+python do_package() {
+}
============================================================
--- packages/linux/linux-kexecboot_2.6.26.bb 287d3bbbebb212c90ad5294bbd7bf094aa17bed4
+++ packages/linux/linux-kexecboot_2.6.26.bb 287d3bbbebb212c90ad5294bbd7bf094aa17bed4
@@ -0,0 +1,175 @@
+require linux-kexecboot.inc
+
+PR = "r1"
+FILESDIR = "linux-rp_${PV}"
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_qemuarm = "-1"
+DEFAULT_PREFERENCE_qemux86 = "-1"
+DEFAULT_PREFERENCE_spitz = "1"
+DEFAULT_PREFERENCE_collie = "1"
+
+# Handy URLs
+# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
+# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
+# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
+# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
+# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
+# ${KERNELORG_MIRROR}pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
+# ${KERNELORG_MIRROR}pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
+
+# Patches submitted upstream are towards top of this list
+# Hacks should clearly named and at the bottom
+SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
+ ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1 \
+ ${RPSRC}/hx2750_base-r34.patch;patch=1 \
+ ${RPSRC}/hx2750_bl-r9.patch;patch=1 \
+ ${RPSRC}/hx2750_pcmcia-r3.patch;patch=1 \
+ ${RPSRC}/pxa_keys-r9.patch;patch=1 \
+ ${RPSRC}/tsc2101-r19.patch;patch=1 \
+ ${RPSRC}/hx2750_test1-r8.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
+ ${RPSRC}/pm_changes-r1.patch;patch=1 \
+ ${RPSRC}/locomo_kbd_tweak-r2.patch;patch=1 \
+# ${RPSRC}/pxa27x_overlay-r8.patch;patch=1 \
+ ${RPSRC}/w100_extaccel-r2.patch;patch=1 \
+ ${RPSRC}/w100_extmem-r1.patch;patch=1 \
+ ${RPSRC}/poodle_pm-r6.patch;patch=1 \
+ ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
+ ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \
+ file://zaurus-i2c-init.patch;patch=1;status=upstream \
+ ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \
+ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
+ file://hostap-monitor-mode.patch;patch=1;status=unmergable \
+ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
+ ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \
+ ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack \
+ ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
+ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
+ file://sharpsl-rc-r1.patch;patch=1 \
+ file://spitz_h_rewrite.patch;patch=1 \
+ file://pxa-serial-hack.patch;patch=1;status=hack \
+ file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
+ file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
+ file://htcuni.patch;patch=1 \
+ file://versatile-armv6.patch;patch=1 \
+ file://defconfig-c7x0 \
+ file://defconfig-hx2000 \
+ file://defconfig-akita \
+ file://defconfig-spitz \
+ file://defconfig-qemuarm \
+ file://defconfig-qemux86 \
+ file://defconfig-bootcdx86 \
+ file://defconfig-htcuniversal \
+ file://defconfig-collie \
+ file://defconfig-zylonite"
+# Disabled until the patchset is updated:
+# file://defconfig-tosa
+# file://defconfig-poodle
+
+
+# FIXMEs before made default
+# ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack
+
+
+# Add this to enable pm debug code (useful with a serial lead)
+# ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1
+
+# Disabled until I find the reason this gives issues with cdc_subset
+# ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \
+
+
+SRC_URI_append_collie = "\
+ file://collie.patch;patch=1 \
+ file://collie_keymap.patch;patch=1 \
+"
+
+SRC_URI_append_poodle = "\
+ ${RPSRC}/poodle_serial_vcc-r0.patch;patch=1 \
+ file://poodle_ts.patch;patch=1 \
+ file://pxafb.patch;patch=1 \
+"
+
+SRC_URI_append_tosa = "\
+ file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch;patch=1 \
+ file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;patch=1 \
+ file://tosa/0003-Core-MFD-support.patch;patch=1 \
+ file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;patch=1 \
+ file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;patch=1 \
+ file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;patch=1 \
+ file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;patch=1 \
+ file://tosa/0008-Nand-driver-for-TMIO-devices.patch;patch=1 \
+ file://tosa/0009-FB-driver-for-TMIO-devices.patch;patch=1 \
+ file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;patch=1 \
+ file://tosa/0011-MMC-driver-for-TMIO-devices.patch;patch=1 \
+ file://tosa/0012-Tosa-keyboard-support.patch;patch=1 \
+ file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;patch=1 \
+ file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;patch=1 \
+ file://tosa/0015-sharpsl-export-params.patch;patch=1 \
+ file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;patch=1 \
+ file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch;patch=1 \
+ file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;patch=1 \
+ file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;patch=1 \
+ file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;patch=1 \
+ file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;patch=1 \
+ file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;patch=1 \
+ file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;patch=1 \
+ file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;patch=1 \
+ file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;patch=1 \
+ file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;patch=1 \
+ file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;patch=1 \
+ file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;patch=1 \
+ file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;patch=1 \
+ file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
+ file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
+ file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;patch=1 \
+ file://tosa/0045-Update-tmio_ohci.patch;patch=1 \
+ file://tosa/0046-patch-tc6393xb-cleanup.patch;patch=1 \
+ file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;patch=1 \
+ file://tosa/0048-tc6393xb-GPIO-support.patch;patch=1 \
+ file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;patch=1 \
+ file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;patch=1 \
+ file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;patch=1 \
+ file://tosa/0052-tosa-platform-backlight-support.patch;patch=1 \
+ file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;patch=1 \
+ file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;patch=1 \
+ file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;patch=1 \
+ file://tosa/0058-Fix-tosakbd-suspend.patch;patch=1 \
+ file://tosa/0059-patch-tosa-wakeup-test.patch;patch=1 \
+ file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;patch=1 \
+ file://tosa/0061-tosa-bat-unify.patch;patch=1 \
+ file://tosa/0062-tosa-bat-fix-charging.patch;patch=1 \
+ file://tosa/0063-patch-tosa-bat-jacket-detect.patch;patch=1 \
+ file://tosa/0064-Export-modes-via-sysfs.patch;patch=1 \
+ file://tosa/0065-wm97xx-core-fixes.patch;patch=1 \
+ file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;patch=1 \
+ file://tosa/0067-modeswitching.patch;patch=1 \
+ file://tosa/0068-Preliminary-tosa-denoiser.patch;patch=1 \
+ file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;patch=1 \
+ file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;patch=1 \
+ file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;patch=1 \
+ file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;patch=1 \
+ file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;patch=1 \
+ file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;patch=1 \
+ file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;patch=1 \
+ file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;patch=1 \
+ file://tosa/0040-Clocklib-debugfs-support.patch;patch=1 \
+ file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;patch=1 \
+ file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;patch=1 \
+ file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;patch=1 \
+ file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;patch=1 \
+ file://tosa/0057-Clean-up-tosa-resetting.patch;patch=1 \
+ "
+
+SRC_URI_append_htcuniversal ="\
+ file://htcuni-acx.patch;patch=1;status=external \
+ "
+
+SRC_URI_append_zylonite ="\
+ file://pxa_fb_overlay.patch;patch=1 \
+ file://zylonite-boot.patch;patch=1 \
+ file://zylonite_mtd-r0.patch;patch=1 \
+ file://zylonite_touch-r0.patch;patch=1 \
+ file://zylonite_keypad-r0.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/linux-2.6.26"
============================================================
--- classes/kernel.bbclass 7cbc09d4f4fd3e7051928da4ba4f8a6034393be9
+++ classes/kernel.bbclass 3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b
@@ -73,6 +73,9 @@ kernel_do_compile() {
UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
kernel_do_compile() {
+ if [ ! -z "${INITRAMFS_IMAGE}" ]; then
+ cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" initramfs.cpio.gz
+ fi
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
@@ -85,30 +88,9 @@ kernel_do_compile() {
oenote "no modules to compile"
fi
}
+kernel_do_compile[depends] = "${INITRAMFS_TASK}"
-do_builtin_initramfs() {
- if [ ! -z "${INITRAMFS_IMAGE}" ]; then
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" usr/initramfs_data.cpio.gz
- oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin
- package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin
-
- # Make sure to kill injected initramfs, in case someone will do "-c compile -f"
- rm usr/initramfs_data.cpio.gz
-
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
- ln -sf ${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin ${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
- package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
- fi
-}
-addtask builtin_initramfs before do_build after do_package_write
-do_builtin_initramfs[depends] = '${INITRAMFS_TASK}'
-
kernel_do_stage() {
ASMDIR=`readlink include/asm`
@@ -468,7 +450,7 @@ do_sizecheck() {
# Support checking the kernel size since some kernels need to reside in partitions
# with a fixed length or there is a limit in transferring the kernel to memory
do_sizecheck() {
- if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
+ if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then
size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
============================================================
--- conf/machine/collie.conf c23a85835bc13ac978f36742cfc8ccf5880e0ec8
+++ conf/machine/collie.conf 334ab4b53eea3f3be4a7b39b8fac9412b650aef2
@@ -8,11 +8,19 @@ %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list