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

[ifaistos commit]

merge of 'ac1784612908005401efde55a082dc8fa374bd2e'
     and 'b5d747a62fcad9a8d4c7d2f3c250f3e614028a15'

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: de0691be4bd0c7952055dca203143d40092de043
ViewMTN: http://monotone.openembedded.org/revision/info/de0691be4bd0c7952055dca203143d40092de043
Files:
1
packages/perl/perl_5.8.8.bb
packages/spandsp/spandsp.inc
packages/spandsp/spandsp_0.0.3.bb
packages/spandsp/spandsp_0.0.4-pre16.bb
packages/slugos-init/files/boot/kexec
packages/slugos-init/files/boot/network
packages/slugos-init/slugos-init_5.0.bb
Diffs:

#
# mt diff -rac1784612908005401efde55a082dc8fa374bd2e -rde0691be4bd0c7952055dca203143d40092de043
#
#
#
# patch "packages/perl/perl_5.8.8.bb"
#  from [3aca32440feddd983fff24ef6e8448cc34d35493]
#    to [3e99caafea88daab44023dba20ebdd71e5533067]
# 
# patch "packages/spandsp/spandsp.inc"
#  from [7a5c5ca2cf5ff4a844e530c565b7d883200eba67]
#    to [caa7fd87f5ce220574eb1923670c97e781110c0b]
# 
# patch "packages/spandsp/spandsp_0.0.3.bb"
#  from [3299ad935f81769ffe792924086078142e52f310]
#    to [eb2f1db53d144dd7db0d9e848b982e54f92ffc90]
# 
# patch "packages/spandsp/spandsp_0.0.4-pre16.bb"
#  from [c407c189154e9ff32b8c3ce3c0f698ea193fc8b2]
#    to [3bbd7941a12f2e8f2c905fb64528cdbc7c5f0ea1]
#
============================================================
--- packages/perl/perl_5.8.8.bb	3aca32440feddd983fff24ef6e8448cc34d35493
+++ packages/perl/perl_5.8.8.bb	3e99caafea88daab44023dba20ebdd71e5533067
@@ -1,11 +1,11 @@ HOMEPAGE = "http://www.perl.org/"
 DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
-SECTION = "devel"
+SECTION = "devel/perl"
 LICENSE = "Artistic|GPL"
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-PR = "r25"
+PR = "r26"
 
 # Major part of version
 PVM = "5.8"
============================================================
--- packages/spandsp/spandsp.inc	7a5c5ca2cf5ff4a844e530c565b7d883200eba67
+++ packages/spandsp/spandsp.inc	caa7fd87f5ce220574eb1923670c97e781110c0b
@@ -1,6 +1,6 @@ HOMEPAGE = "http://www.soft-switch.org"
 DESCRIPTION = "A library of many DSP functions for telephony."
 HOMEPAGE = "http://www.soft-switch.org"
-SECTION = "voip"
+SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "tiff libxml2"
 
============================================================
--- packages/spandsp/spandsp_0.0.3.bb	3299ad935f81769ffe792924086078142e52f310
+++ packages/spandsp/spandsp_0.0.3.bb	eb2f1db53d144dd7db0d9e848b982e54f92ffc90
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz"
 
============================================================
--- packages/spandsp/spandsp_0.0.4-pre16.bb	c407c189154e9ff32b8c3ce3c0f698ea193fc8b2
+++ packages/spandsp/spandsp_0.0.4-pre16.bb	3bbd7941a12f2e8f2c905fb64528cdbc7c5f0ea1
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.soft-switch.org/downloads/spandsp/${PN}-0.0.4pre16.tgz"
 


#
# mt diff -rb5d747a62fcad9a8d4c7d2f3c250f3e614028a15 -rde0691be4bd0c7952055dca203143d40092de043
#
#
#
# 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/slugos-init_5.0.bb"
#  from [5c3b2fe18a30d3510095f7868b4e32f248080492]
#    to [9a455a4cc8bd81f72ac4bedd0d75467081204750]
#
============================================================
--- 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/slugos-init_5.0.bb	5c3b2fe18a30d3510095f7868b4e32f248080492
+++ 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 = "r1"
+PR = "r1.2"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \