[oe-commits] org.oe.dev merge of 'a534fd1530fba63215db0ae44dbdd6e877c589b4'

pfalcon commit openembedded-commits at lists.openembedded.org
Sun Feb 17 03:35:52 UTC 2008 

merge of 'a534fd1530fba63215db0ae44dbdd6e877c589b4'
     and 'f6ab5be390e4400fb993f0e449049b62daece68e'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 9125a7fc883765cf996f50cc6e2ffa98a2c08e40
ViewMTN: http://monotone.openembedded.org/revision/info/9125a7fc883765cf996f50cc6e2ffa98a2c08e40
Files:
1
packages/initrdscripts/devimage_0.1.bb
packages/initrdscripts/files/10-initfs.sh
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/files/85-blockboot.sh
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-module-block_1.0.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-initfs_1.0.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/python/python-efl-examples.bb
packages/tasks/task-python-efl-examples.bb
packages/python/python-efl.bb
packages/tasks/task-python-efl.bb
classes/image.bbclass
conf/distro/include/sane-srcdates.inc
packages/gcc/gcc_4.2.2.bb
packages/lighttpd/lighttpd/src-server.c.patch
packages/python/python-ecore_cvs.bb
packages/python/python-edbus_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-evas_cvs.bb
packages/tasks/task-openmoko-python-devel.bb
Diffs:

#
# mt diff -ra534fd1530fba63215db0ae44dbdd6e877c589b4 -r9125a7fc883765cf996f50cc6e2ffa98a2c08e40
#
# 
# 
# patch "packages/initrdscripts/devimage_0.1.bb"
#  from [955c0d0e038ef20daa3fd5247047bf341c3f5116]
#    to [88d34c65381db0061c854a2000edef77b08e3a06]
# 
# patch "packages/initrdscripts/files/10-initfs.sh"
#  from [31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9]
#    to [5f0d6f2403263afd21f7a7a0b34c979666f7a4ef]
# 
# patch "packages/initrdscripts/files/30-bootmenu.sh"
#  from [fa8ea4dd925ccbd5bbc48f509c2c02ba47bc73e8]
#    to [8bb8113fc468d470541b576af88eb4a02493531e]
# 
# patch "packages/initrdscripts/files/85-blockboot.sh"
#  from [e1e0ab71a19561305b6a02ff169c7e789c5359ae]
#    to [fcd4bc3bceb922994a440019282e5e4eeb71dd62]
# 
# patch "packages/initrdscripts/files/init.sh"
#  from [d6057201f9ee2a9e2d44ed71124d43142bc1a05f]
#    to [7c88f09222ae4b7179e97a10ef8cba495154ad9d]
# 
# patch "packages/initrdscripts/initramfs-module-block_1.0.bb"
#  from [1d63081f1074144e693737bd6ca954bd64c1b1a2]
#    to [c517f5068701b22da3aaea6340522743f8d05d9e]
# 
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  from [f13252f06b1023c948e8295f3ee95c0eda773899]
#    to [29437c7f767ebb2d1a52b0acf24d71da5b298909]
# 
# patch "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
#  from [e8b2ca5b6f8808155c08371d32e7b42f94caa7bb]
#    to [71d1fee98407e78577c2537c60488436d5a31c88]
# 
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
#  from [716f3127ca0421f8c9920adbb82ec03ace9a4717]
#    to [64119766d866f062d27d767f5897b9e1388e7d7e]
# 
============================================================
--- packages/initrdscripts/devimage_0.1.bb	955c0d0e038ef20daa3fd5247047bf341c3f5116
+++ packages/initrdscripts/devimage_0.1.bb	88d34c65381db0061c854a2000edef77b08e3a06
@@ -1,12 +1,14 @@ SRC_URI = "file://devimage.sh file://pas
 DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing."
 SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key"
-PR = "r3"
+PR = "r4"
 
 do_install() {
-        install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
 	install -d ${D}/etc/dropbear
+	install -d ${D}/sbin
+	install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
         install -m 0600 ${WORKDIR}/dropbear_rsa_host_key ${D}/etc/dropbear/
         install -m 0644 ${WORKDIR}/passwd ${D}/etc/
+	ln -s /init ${D}/sbin/init
 }
 
+FILES_${PN} += " /init /etc/* /sbin/*"
-FILES_${PN} += " /init /etc/*"
============================================================
--- packages/initrdscripts/files/10-initfs.sh	31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9
+++ packages/initrdscripts/files/10-initfs.sh	5f0d6f2403263afd21f7a7a0b34c979666f7a4ef
@@ -1,5 +1,6 @@ modprobe -q ext3 >/dev/null 2>&1
 #!/bin/sh
 
 modprobe -q vfat >/dev/null 2>&1
 modprobe -q ext2 >/dev/null 2>&1
 modprobe -q ext3 >/dev/null 2>&1
+modprobe -q jffs2 >/dev/null 2>&1
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh	fa8ea4dd925ccbd5bbc48f509c2c02ba47bc73e8
+++ packages/initrdscripts/files/30-bootmenu.sh	8bb8113fc468d470541b576af88eb4a02493531e
@@ -95,6 +95,7 @@ add_menu_item "NFS (nfsroot=192.168.2.20
 done < /proc/partitions
 
 add_menu_item "NFS (nfsroot=192.168.2.200:/srv/nfs/oe/image)"
+add_menu_item "Shell"
 
 total=`echo -e $list | wc -l`
 num=0
@@ -142,8 +143,11 @@ path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
 
 dev=`expr "$sel" : '\([^ /]*\)'`
 path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
+fstype=`expr "$sel" : '[^ ]* *\(.*\)'`
 
-if [ "$dev" == "NFS" ]; then
+if [ "$dev" == "Shell" ]; then
+    exec /bin/sh
+elif [ "$dev" == "NFS" ]; then
     ROOT_DEVICE="/dev/nfs"
     CMDLINE="$CMDLINE root=/dev/nfs nfsroot=192.168.2.200:/srv/nfs/oe/image"
 elif [ -n "$path" ]; then
@@ -151,6 +155,10 @@ else
     CMDLINE="$CMDLINE root=/dev/loop looproot=/dev/$dev:$path"
 else
     ROOT_DEVICE="/dev/$dev"
+    # jffs2 is not recognized by mount automagically
+    if [ "$fstype" == "(jffs2)" ]; then
+	FSTYPE="jffs2"
+    fi
     CMDLINE="$CMDLINE root=$ROOT_DEVICE"
 fi
 
============================================================
--- packages/initrdscripts/files/85-blockboot.sh	e1e0ab71a19561305b6a02ff169c7e789c5359ae
+++ packages/initrdscripts/files/85-blockboot.sh	fcd4bc3bceb922994a440019282e5e4eeb71dd62
@@ -1,8 +1,12 @@ if [ -e "$ROOT_DEVICE" ]; then
 #!/bin/sh
 # Allow booting from a normal block device.
 
 if [ -e "$ROOT_DEVICE" ]; then
     echo "booting from: $ROOT_DEVICE"
-    mount "$ROOT_DEVICE" /mnt
+    type=""
+    if [ -n "$FSTYPE" ]; then
+	type="-t $FSTYPE"
+    fi
+    mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device"
     BOOT_ROOT=/mnt
 fi
============================================================
--- packages/initrdscripts/files/init.sh	d6057201f9ee2a9e2d44ed71124d43142bc1a05f
+++ packages/initrdscripts/files/init.sh	7c88f09222ae4b7179e97a10ef8cba495154ad9d
@@ -8,6 +8,7 @@ early_setup() {
     mkdir /proc
     mount -t proc proc /proc
     mkdir /mnt
+    modprobe -q mtdblock
 }
 
 dev_setup()
@@ -48,13 +49,13 @@ boot_root() {
     exec switch_root -c /dev/console $BOOT_ROOT /sbin/init
 }
 
-boot_failed() {
-    echo "No valid root device was specified.  Please add root=/dev/something to"
-    echo "the kernel command-line and try again."
+fatal() {
+    echo $1
     echo
     exec sh
 }
 
+
 echo "Starting initramfs boot..."
 early_setup
 read_args
@@ -68,4 +69,5 @@ load_modules
 
 load_modules
 [ -n "$BOOT_ROOT" ] && boot_root
+
+fatal "No valid root device was specified.  Please add root=/dev/something to the kernel command-line and try again."
-boot_failed
============================================================
--- packages/initrdscripts/initramfs-module-block_1.0.bb	1d63081f1074144e693737bd6ca954bd64c1b1a2
+++ packages/initrdscripts/initramfs-module-block_1.0.bb	c517f5068701b22da3aaea6340522743f8d05d9e
@@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh"
 SRC_URI = "file://85-blockboot.sh"
-PR = "r1"
+PR = "r2"
 RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."
 
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	f13252f06b1023c948e8295f3ee95c0eda773899
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	29437c7f767ebb2d1a52b0acf24d71da5b298909
@@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh"
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r9"
+PR = "r10"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
============================================================
--- packages/initrdscripts/initramfs-module-initfs_1.0.bb	e8b2ca5b6f8808155c08371d32e7b42f94caa7bb
+++ packages/initrdscripts/initramfs-module-initfs_1.0.bb	71d1fee98407e78577c2537c60488436d5a31c88
@@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh"
 SRC_URI = "file://10-initfs.sh"
-PR = "r2"
+PR = "r4"
 DESCRIPTION = "An initramfs module for initializing filesystems."
 RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb	716f3127ca0421f8c9920adbb82ec03ace9a4717
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb	64119766d866f062d27d767f5897b9e1388e7d7e
@@ -1,6 +1,7 @@ SRC_URI = "file://init.sh"
 SRC_URI = "file://init.sh"
-PR = "r2"
+PR = "r3"
 DESCRIPTON = "A modular initramfs init script system."
+RRECOMMENDS = "kernel-module-mtdblock"
 
 do_install() {
         install -m 0755 ${WORKDIR}/init.sh ${D}/init


#
# mt diff -rf6ab5be390e4400fb993f0e449049b62daece68e -r9125a7fc883765cf996f50cc6e2ffa98a2c08e40
#
# 
# 
# rename "packages/python/python-efl-examples.bb"
#     to "packages/tasks/task-python-efl-examples.bb"
# 
# rename "packages/python/python-efl.bb"
#     to "packages/tasks/task-python-efl.bb"
# 
# patch "classes/image.bbclass"
#  from [73120c465f8175c72d4001b3985cab785ee72ced]
#    to [3ee271e04e5f55aafbefcc98d3e2d4a69568301f]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
#    to [e417185fe87a77364d7d662829af7d8b658df96e]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [b649640ada6aa7b3be9155792213ea7689d6e6ac]
#    to [e3cc18f11ea8954870f79c7a095814c2a298871d]
# 
# patch "packages/lighttpd/lighttpd/src-server.c.patch"
#  from [ff0cc797c5884c967e00ae132428f5aa6f206750]
#    to [8b4f719a20587a5a8efb400bdb383aeb6cd6166f]
# 
# patch "packages/python/python-ecore_cvs.bb"
#  from [295246b44c66e0eec08f9eaa1d8d53026cfaaf09]
#    to [b6e5ba00d6b809a3e441d6dc27d125164f78dacb]
# 
# patch "packages/python/python-edbus_cvs.bb"
#  from [b9e9b38cb16c01ec8101aa260e4284de97c19c1e]
#    to [d5e8bad1f13826a22bcd975f9899d3048049d345]
# 
# patch "packages/python/python-edje_cvs.bb"
#  from [18a2503cde02ed33e4f15943318b8dfc8cfcfca3]
#    to [46da9e504d792e8cd17a35cec8ebeea2f9a49c58]
# 
# patch "packages/python/python-efl.inc"
#  from [c89446d67552d9bb92644bcef06879c238785740]
#    to [7a1e1c981a4d514c24d0cf695b0c335614b36bbb]
# 
# patch "packages/python/python-emotion_cvs.bb"
#  from [45709d87daaee3ee043e8c8536f35bb73b68f5ca]
#    to [9fc029007ba460e19b900588f14fada95732512a]
# 
# patch "packages/python/python-epsilon_cvs.bb"
#  from [3aa59441db25ec4ff0a8fae0e15f87935ad266f7]
#    to [ba4915bb31b83045d2be815f9b219c081c2701e1]
# 
# patch "packages/python/python-evas_cvs.bb"
#  from [8d47b306dcfe4ce206dd3e6188ebc30c94c155b7]
#    to [004f170367e06ca113e955f686f51ce112ce9368]
# 
# patch "packages/tasks/task-openmoko-python-devel.bb"
#  from [cb71bae786a4c3afdb8e584ce30ec3ae8ebabdc3]
#    to [561fb2c52bfab563c0929cbc0c48393897743b6b]
# 
============================================================
--- classes/image.bbclass	73120c465f8175c72d4001b3985cab785ee72ced
+++ classes/image.bbclass	3ee271e04e5f55aafbefcc98d3e2d4a69568301f
@@ -35,9 +35,9 @@ python () {
 }
 
 #
-# Get a list of files containing device tables to create.
+# Get a list of files containing tables of devices to be created.
 # * IMAGE_DEVICE_TABLE is the old name to an absolute path to a device table file
-# * IMAGE_DEVICE_TABLES is a new name for a file, or list of files, seached
+# * IMAGE_DEVICE_TABLES is a new name for a file, or list of files, searched
 #   for in the BBPATH
 # If neither are specified then the default name of files/device_table-minimal.txt
 # is searched for in the BBPATH (same as the old version.)
============================================================
--- conf/distro/include/sane-srcdates.inc	458c1cdc7fdad7be3787a02fe3c5ab93a2b03733
+++ conf/distro/include/sane-srcdates.inc	e417185fe87a77364d7d662829af7d8b658df96e
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080129"
+EFL_SRCDATE = "20080216"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/gcc/gcc_4.2.2.bb	b649640ada6aa7b3be9155792213ea7689d6e6ac
+++ packages/gcc/gcc_4.2.2.bb	e3cc18f11ea8954870f79c7a095814c2a298871d
@@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
         file://602-sdk-libstdc++-includes.patch;patch=1 \
 	file://740-sh-pr24836.patch;patch=1 \
 	file://800-arm-bigendian.patch;patch=1 \
+	file://801-arm-bigendian-eabi.patch;patch=1 \
 	file://904-flatten-switch-stmt-00.patch;patch=1 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
============================================================
--- packages/lighttpd/lighttpd/src-server.c.patch	ff0cc797c5884c967e00ae132428f5aa6f206750
+++ packages/lighttpd/lighttpd/src-server.c.patch	8b4f719a20587a5a8efb400bdb383aeb6cd6166f
@@ -1,3 +1,6 @@
+upstream: http://trac.lighttpd.net/trac/ticket/1402
+status: pending
+
 --- lighttpd/src/server.c.orig	2006-03-04 09:12:17.000000000 -0800
 +++ lighttpd/src/server.c	2006-07-11 09:16:28.000000000 -0700
 @@ -1174,8 +1174,8 @@
============================================================
--- packages/python/python-ecore_cvs.bb	295246b44c66e0eec08f9eaa1d8d53026cfaaf09
+++ packages/python/python-ecore_cvs.bb	b6e5ba00d6b809a3e441d6dc27d125164f78dacb
@@ -1,6 +1,7 @@ require python-efl.inc
 require python-efl.inc
-DEPENDS += "ecore"
-PR = "r5"
+DEPENDS += "python-evas ecore"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
 
 do_stage() {
     distutils_stage_all
============================================================
--- packages/python/python-edbus_cvs.bb	b9e9b38cb16c01ec8101aa260e4284de97c19c1e
+++ packages/python/python-edbus_cvs.bb	d5e8bad1f13826a22bcd975f9899d3048049d345
@@ -1,8 +1,8 @@ DEPENDS += "edbus python-dbus"
 require python-efl.inc
 DEPENDS += "edbus python-dbus"
+PV = "0.1.1+cvs${SRCDATE}"
+PR = "r0"
 
-PR = "r3"
-
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
 
============================================================
--- packages/python/python-edje_cvs.bb	18a2503cde02ed33e4f15943318b8dfc8cfcfca3
+++ packages/python/python-edje_cvs.bb	46da9e504d792e8cd17a35cec8ebeea2f9a49c58
@@ -1,4 +1,5 @@ DEPENDS += "edje python-evas"
 require python-efl.inc
 DEPENDS += "edje python-evas"
-PR = "r5"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
 
============================================================
--- packages/python/python-efl.inc	c89446d67552d9bb92644bcef06879c238785740
+++ packages/python/python-efl.inc	7a1e1c981a4d514c24d0cf695b0c335614b36bbb
@@ -6,7 +6,6 @@ RDEPENDS += "python-lang"
 # does not compile unless pyrex has been built
 DEPENDS = "python-cython-native python-pyrex-native python-numeric"
 RDEPENDS += "python-lang"
-PV = "0.1.1+cvs${SRCDATE}"
 
 inherit setuptools
 
============================================================
--- packages/python/python-emotion_cvs.bb	45709d87daaee3ee043e8c8536f35bb73b68f5ca
+++ packages/python/python-emotion_cvs.bb	9fc029007ba460e19b900588f14fada95732512a
@@ -1,3 +1,4 @@ DEPENDS += "emotion python-evas"
 require python-efl.inc
 DEPENDS += "emotion python-evas"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
-PR = "r4"
============================================================
--- packages/python/python-epsilon_cvs.bb	3aa59441db25ec4ff0a8fae0e15f87935ad266f7
+++ packages/python/python-epsilon_cvs.bb	ba4915bb31b83045d2be815f9b219c081c2701e1
@@ -1,3 +1,4 @@ DEPENDS += "epsilon python-ecore"
 require python-efl.inc
 DEPENDS += "epsilon python-ecore"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
-PR = "r4"
============================================================
--- packages/python/python-evas_cvs.bb	8d47b306dcfe4ce206dd3e6188ebc30c94c155b7
+++ packages/python/python-evas_cvs.bb	004f170367e06ca113e955f686f51ce112ce9368
@@ -1,6 +1,7 @@ DEPENDS += "evas"
 require python-efl.inc
 DEPENDS += "evas"
-PR = "r4"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
 
 do_stage() {
 	distutils_stage_all
============================================================
--- packages/tasks/task-openmoko-python-devel.bb	cb71bae786a4c3afdb8e584ce30ec3ae8ebabdc3
+++ packages/tasks/task-openmoko-python-devel.bb	561fb2c52bfab563c0929cbc0c48393897743b6b
@@ -1,12 +1,12 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Python Development Tools"
 SECTION = "openmoko/devel"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
 inherit task
 
 RDEPENDS_task-openmoko-python-devel = "\
-  python-efl \
+  task-python-efl \
   python-pygtk \
   python-lightmediascanner \
 "

More information about the Openembedded-commits mailing list