[oe-commits] org.oe.dev merge of '7ecf249aa01227cf559b984727eddf32c13c84a5'

[john_lee commit]

merge of '7ecf249aa01227cf559b984727eddf32c13c84a5'
     and 'ef249adf427bcb2b167f2fde790ed1627e901111'

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: 646ea6ae5f1dc2ff240dd7489ccf04bf34659fd0
ViewMTN: http://monotone.openembedded.org/revision/info/646ea6ae5f1dc2ff240dd7489ccf04bf34659fd0
Files:
1
packages/gnash/gnash_0.8.2.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/tasks/task-openmoko-feed.bb
classes/package_deb.bbclass
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
Diffs:

#
# mt diff -r7ecf249aa01227cf559b984727eddf32c13c84a5 -r646ea6ae5f1dc2ff240dd7489ccf04bf34659fd0
#
#
#
# add_file "packages/gnash/gnash_0.8.2.bb"
#  content [50014de2c3904a6950c775be0eda4815399cb573]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [e862f6042ce71dd536cb1abf60132cdda2d229ea]
#    to [45c4fabe80b7601dd86c45ad8f64a6773594d4e7]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [1d446b5d0ff09d916f1a0edd5acc3f1b3fbd6d21]
#    to [e5d503f24f4dc2f152faa954b5f08c8fe0538f9e]
#
============================================================
--- packages/gnash/gnash_0.8.2.bb	50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.2.bb	50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	e862f6042ce71dd536cb1abf60132cdda2d229ea
+++ conf/distro/include/preferred-om-2008-versions.inc	45c4fabe80b7601dd86c45ad8f64a6773594d4e7
@@ -2,7 +2,7 @@ PREFERRED_VERSION_dbus-glib = "0.74"
 PREFERRED_VERSION_busybox = "1.9.1"
 PREFERRED_VERSION_dbus = "1.1.20"
 PREFERRED_VERSION_dbus-glib = "0.74"
-PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_gnash = "0.8.2"
 PREFERRED_VERSION_gpsdrive = "2.10pre4"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_intltool = "0.35.5"
============================================================
--- packages/tasks/task-openmoko-feed.bb	1d446b5d0ff09d916f1a0edd5acc3f1b3fbd6d21
+++ packages/tasks/task-openmoko-feed.bb	e5d503f24f4dc2f152faa954b5f08c8fe0538f9e
@@ -24,7 +24,8 @@ RDEPENDS_task-openmoko-feed = "\
   nano \
   ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
-  python python-pygtk python-pyserial python-efl \
+  python python-pygtk python-pyserial \
+#  python-efl \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   settingsgui \


#
# mt diff -ref249adf427bcb2b167f2fde790ed1627e901111 -r646ea6ae5f1dc2ff240dd7489ccf04bf34659fd0
#
#
#
# patch "classes/package_deb.bbclass"
#  from [29ec1e6d134d74483c5c26043872a32cdc95bdc9]
#    to [a780e6f7dff8c1d720645d2b4f66b6f8e05d576d]
# 
# patch "packages/linux/linux-handhelds-2.6.inc"
#  from [70d018f15aa5f5a88cbad6314c69d71719eb911f]
#    to [98a6f0f9f040fedbfaf3ba13c0c39685da9f4c34]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [1fe13d52ca457feb5a103d0b1ccbce114ec04797]
#    to [77d66be7e651da29ca286c2f28474b976270f746]
#
============================================================
--- classes/package_deb.bbclass	29ec1e6d134d74483c5c26043872a32cdc95bdc9
+++ classes/package_deb.bbclass	a780e6f7dff8c1d720645d2b4f66b6f8e05d576d
@@ -94,10 +94,6 @@ python do_package_deb () {
     if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
         os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"))
 
-    if packages == []:
-        bb.debug(1, "No packages; nothing to do")
-        return
-
     packages = bb.data.getVar('PACKAGES', d, 1)
     for pkg in packages.split():
         localdata = bb.data.createCopy(d)
============================================================
--- packages/linux/linux-handhelds-2.6.inc	70d018f15aa5f5a88cbad6314c69d71719eb911f
+++ packages/linux/linux-handhelds-2.6.inc	98a6f0f9f040fedbfaf3ba13c0c39685da9f4c34
@@ -37,6 +37,11 @@ do_configure() {
 		die "No default configuration for ${MACHINE} available."
 	fi
 
+	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
+		# Kernel expects non-compressed cpio
+		gzip -d -c ${KERNEL_INITRAMFS_PATH} >${WORKDIR}/initramfs.cpio
+		echo "CONFIG_INITRAMFS_SOURCE=\"${WORKDIR}/initramfs.cpio\"" >> ${S}/.config
+	fi
 
 	if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
@@ -48,26 +53,13 @@ do_configure() {
 
 	sed 	-e '/CONFIG_AEABI/d' \
 		-e '/CONFIG_OABI_COMPAT=/d' \
+		-e '/CONFIG_INITRAMFS_SOURCE=/d' \
 		'${WORKDIR}/defconfig' >>'${S}/.config'
 
 	yes '' | oe_runmake oldconfig
 
 }
 
-do_compile_prepend() {
-	# Clean up any stale initramfs archive
-	rm -f usr/initramfs_data.cpio.gz
-	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
-	    if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then
-		echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately"
-		exit 1
-	    fi
-	    cp ${KERNEL_INITRAMFS_PATH} usr/initramfs_data.cpio.gz
-	    # touch is for broken Koen's cp
-	    touch usr/initramfs_data.cpio.gz
-	fi
-}
-
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME}
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	1fe13d52ca457feb5a103d0b1ccbce114ec04797
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	77d66be7e651da29ca286c2f28474b976270f746
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r18"
+PR = "r19"
 
 DEFAULT_PREFERENCE = "-1"