[oe-commits] org.oe.dev merge of '65908f491852a7129b196ced660449bcc1933f90'

Mon Sep 1 18:26:06 UTC 2008

merge of '65908f491852a7129b196ced660449bcc1933f90'
     and 'a7b7d4700cc3ecf7ecb70b8c6056d4e2dd721550'

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: ac1784612908005401efde55a082dc8fa374bd2e
ViewMTN: http://monotone.openembedded.org/revision/info/ac1784612908005401efde55a082dc8fa374bd2e
Files:
1
packages/slugos-init/files/boot/disk
packages/slugos-init/files/boot/kexec
packages/slugos-init/files/boot/network
packages/slugos-init/files/functions
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_5.0.bb
packages/meta/meta-gpe-extras.bb
Diffs:

#
# mt diff -r65908f491852a7129b196ced660449bcc1933f90 -rac1784612908005401efde55a082dc8fa374bd2e
#
#
#
# patch "packages/slugos-init/files/boot/disk"
#  from [0853a98ec96963dcaf9f81f162c4bf2900366c46]
#    to [2812a8e183761c88f764ab143d6e65cf1bfc8290]
# 
# patch "packages/slugos-init/files/boot/kexec"
#  from [c24e253fa7a0417e61f46145915f5a38d088dc42]
#    to [6b3c4cc871eb7111261969670e39d147f3f80400]
# 
# patch "packages/slugos-init/files/boot/network"
#  from [24a86887b19822c0276b0b4206959bddae2cd3c3]
#    to [024d9620d5f3fde3cd9a2305b0d0d86bb6409081]
# 
# patch "packages/slugos-init/files/functions"
#  from [68db6b5c8036845c4660e107be5b5c6a9a1c0cad]
#    to [3a8a43e4f47ba0bc13a780d41ba39abc0a55d2e5]
# 
# patch "packages/slugos-init/files/turnup"
#  from [8eb7efd8fbaf4a131d1e25e012806db17e21eb37]
#    to [d94a8247eae67fe247bce151f90da0b92e8c9617]
# 
# patch "packages/slugos-init/slugos-init_5.0.bb"
#  from [77db73d4a4c178a7a01dd6a1bfafc30334a7c0dd]
#    to [9a455a4cc8bd81f72ac4bedd0d75467081204750]
#
============================================================

--- packages/slugos-init/files/boot/disk	0853a98ec96963dcaf9f81f162c4bf2900366c46
+++ packages/slugos-init/files/boot/disk	2812a8e183761c88f764ab143d6e65cf1bfc8290
@@ -38,12 +38,13 @@ then
 	# is attempted.
 	if	test -n "$UUID" &&
 		mount "$@" UUID="$UUID" /mnt ||
-		mount "$@" -U "$UUID" /mnt ||
 		mount "$@" "$device" /mnt
 	then
-		# checkmount checks for sh, chroot, init
-		# and /mnt (i.e. /mnt/mnt in this case)
-		if checkmount /mnt
+		# checkmount checks for sh, chroot, init, /dev
+		# and /mnt (i.e. /mnt/mnt in this case).
+		# minimaldevnodes checks (and creates if required)
+		# a few mandatory /dev nodes we may need.
+		if checkmount /mnt && minimaldevnodes /mnt
 		then
 			# pivot to /initrd if available, else /mnt
 			cd /
============================================================
--- packages/slugos-init/files/boot/kexec	c24e253fa7a0417e61f46145915f5a38d088dc42
+++ packages/slugos-init/files/boot/kexec	6b3c4cc871eb7111261969670e39d147f3f80400
@@ -91,7 +91,6 @@ if [ -n "$1" -a -n "$2" ] ; then
 			t=`basename "$kpath"`
 			kexec_image="/mnt/$t"
 		    fi
-		    umount /sys
 		fi
 		;;
 
@@ -105,7 +104,6 @@ if [ -n "$1" -a -n "$2" ] ; then
 			t=`basename "$kpath"`
 			kexec_image="/mnt/$t"
 		    fi
-		    umount /sys
 		fi
 		;;
 
@@ -143,7 +141,6 @@ if [ -n "$1" -a -n "$2" ] ; then
 			echo "Loading kexec kernel using tftp \"$kpath\"..."
 			tftp -g -l "$kexec_image" -r "${kpath#*:}" "${kpath%%:*}"
 		    fi
-		    umount /sys
 		fi
 		;;
 
============================================================
--- packages/slugos-init/files/boot/network	24a86887b19822c0276b0b4206959bddae2cd3c3
+++ packages/slugos-init/files/boot/network	024d9620d5f3fde3cd9a2305b0d0d86bb6409081
@@ -24,8 +24,12 @@ test -z "$iface" && exit 1 
 iface="$(config iface)"
 test -z "$iface" && exit 1 
 #
-# Fire up a process in the background to load the firmware if necessary
-sysf="/sys/class/firmware/firmware-$iface"
+# Fire up a process in the background to load the firmware if necessary.
+# If this system doesn't require the NPE-B firmware, no problem, the
+# background process will simply go away in two seconds.  If it requires
+# some other firmware, then modification will be required.  We probably
+# should replace this with mdev or some other hotplug-based technique...
+sysf="/sys/class/firmware/$iface"
 (
 	# Wait for the firware to be requested, if required
 	[ -f $sysf/loading ] || sleep 1
@@ -39,5 +43,9 @@ ifconfig "$iface" up
 # Trigger the firmware load proactively
 ifconfig "$iface" up
 #
+# Unmount /sys and /proc before we leave
+umount /sys
+umount /proc
+#
 ifup "$iface"
 # exit code is true only if the interface config has succeeded
============================================================
--- packages/slugos-init/files/functions	68db6b5c8036845c4660e107be5b5c6a9a1c0cad
+++ packages/slugos-init/files/functions	3a8a43e4f47ba0bc13a780d41ba39abc0a55d2e5
@@ -173,6 +173,7 @@ checkmount(){
 	# basic test for init (the kernel will try to load this)
 	# but require a shell in bin/sh too
 	test	\( -d "$1/mnt" \) -a \
+		\( -d "$1/dev" \) -a \
 		\( -x "$1/bin/sh" -o -h "$1/bin/sh" \) -a \
 		\( -x "$1/usr/sbin/chroot" -o -h "$1/usr/sbin/chroot" -o \
 		   -x "$1/sbin/chroot" -o -h "$1/sbin/chroot" \) -a \
@@ -181,6 +182,18 @@ checkmount(){
 		   -x "$1/bin/init" -o -h "$1/bin/init" \)
 }
 #
+# minimaldevnodes "mountpoint"
+#  tests an already mounted mountpoint to see if a very minimal
+#  set of devices exists or can be created in dev, and returns
+#  failure if not.  This is required for booting to an nfsroot
+#  with an empty dev directory, as commonly occurs when the rootfs
+#  is created from a tar.gz image.  This is also required for mdev.
+minimaldevnodes(){
+	[ -c "$1/dev/console" ] || mknod -m 600 "$1/dev/console" c 5 1 || return 1
+	[ -c "$1/dev/null"    ] || mknod -m 666 "$1/dev/null"    c 1 3 || return 1
+	return 0
+}
+#
 # swivel "new root" "old root"
 #  NOTE: the arguments must be paths relative to /, bad things
 #  will happen if the arguments themselves start with /
============================================================
--- packages/slugos-init/files/turnup	8eb7efd8fbaf4a131d1e25e012806db17e21eb37
+++ packages/slugos-init/files/turnup	d94a8247eae67fe247bce151f90da0b92e8c9617
@@ -578,7 +578,7 @@ disk() {
 	fso="$(fsoptions "$@")"
 	if	if test -n "$uuid"
 		then
-			mount "$@" UUID="$uuid" "$new" || mount "$@" -U "$uuid" "$new"
+			mount "$@" UUID="$uuid" "$new"
 		else
 			mount "$@" "$device" "$new"
 		fi
@@ -591,7 +591,7 @@ disk() {
 	if test -n "$fst" &&
 		if test -n "$uuid"
 		then
-			mount -t "$fst" -o "$fso" UUID="$uuid" "$new" || mount -t "$fst" -o "$fso" -U "$uuid" "$new"
+			mount -t "$fst" -o "$fso" UUID="$uuid" "$new"
 		else
 			mount -t "$fst" -o "$fso" "$device" "$new"
 		fi
@@ -633,7 +633,7 @@ disk() {
 		then
 			echo "  options used: -t $fst -o $fso [error in this script]" >&2
 			test -n "$uuid" &&
-				echo "  uuid: $uuid (passed with UUID= or -U)" >&2
+				echo "  uuid: $uuid (passed with UUID=<uuid>)" >&2
 		fi
 	fi
 
============================================================
--- packages/slugos-init/slugos-init_5.0.bb	77db73d4a4c178a7a01dd6a1bfafc30334a7c0dd
+++ packages/slugos-init/slugos-init_5.0.bb	9a455a4cc8bd81f72ac4bedd0d75467081204750
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r0"
+PR = "r1.2"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \


#
# mt diff -ra7b7d4700cc3ecf7ecb70b8c6056d4e2dd721550 -rac1784612908005401efde55a082dc8fa374bd2e
#
#
#
# patch "packages/meta/meta-gpe-extras.bb"
#  from [51bb5d3c20d623b55cf3e00b3ed4f1c9a52c7a48]
#    to [8319673d756d4801a7585e960989b78c8b5757ed]
#
============================================================
--- packages/meta/meta-gpe-extras.bb	51bb5d3c20d623b55cf3e00b3ed4f1c9a52c7a48
+++ packages/meta/meta-gpe-extras.bb	8319673d756d4801a7585e960989b78c8b5757ed
@@ -1,11 +1,11 @@ LICENSE = "MIT"
 DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
 LICENSE = "MIT"
-PR="r2"
+PR="r3"
 
 RDEPENDS = "\
-    gpe-task-apps-extra \
-    gpe-task-games \
-    gpe-task-web \
-    gpe-task-desktopapps"
+    task-gpe-apps \
+    task-gpe-games \
+    task-gpe-web \
+    task-gpe-desktopapps"
 
 inherit meta




