[oe-commits] org.oe.dev merge of '5eb9119dd09c221e6e2fefd02b9fae130166b0c8'

[oe commit]

merge of '5eb9119dd09c221e6e2fefd02b9fae130166b0c8'
     and 'e4b7edf3b374a0483106a3cb0cb0f20b01315107'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 81573dd917e787ff0527122d0ee7ba9ada2f67ec
ViewMTN: http://monotone.openembedded.org/revision/info/81573dd917e787ff0527122d0ee7ba9ada2f67ec
Files:
1
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/mpfr/mpfr-native_2.3.0.bb
packages/mpfr/mpfr-native_2.3.1.bb
packages/mpfr/mpfr_2.3.0.bb
packages/mpfr/mpfr_2.3.1.bb
Diffs:

#
# mt diff -r5eb9119dd09c221e6e2fefd02b9fae130166b0c8 -r81573dd917e787ff0527122d0ee7ba9ada2f67ec
#
#
#
# patch "packages/initrdscripts/files/init.sh"
#  from [f01a2b1d615165dd1f22c6ce448caad76fe2bc21]
#    to [28d18ffa609edec8052c315345c34e219a03fa7e]
# 
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
#  from [78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06]
#    to [36899b0b286458882b6c7dc82f858b7e130a026e]
#
============================================================
--- packages/initrdscripts/files/init.sh	f01a2b1d615165dd1f22c6ce448caad76fe2bc21
+++ packages/initrdscripts/files/init.sh	28d18ffa609edec8052c315345c34e219a03fa7e
@@ -41,9 +41,11 @@ load_modules() {
 
 load_modules() {
     for module in $MODULE_DIR/$1; do
-	# Cannot redir to $CONSOLE here easily - may not be set yet
-        echo "initramfs: Loading $module module"
-        source $module
+	if [ -e "$module"  ]; then
+	    # Cannot redir to $CONSOLE here easily - may not be set yet
+            echo "initramfs: Loading $module module"
+            source $module
+	fi
     done
 }
 
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb	78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb	36899b0b286458882b6c7dc82f858b7e130a026e
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh"
 SRC_URI = "file://init.sh"
-PR = "r8"
+PR = "r9"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"
 


#
# mt diff -re4b7edf3b374a0483106a3cb0cb0f20b01315107 -r81573dd917e787ff0527122d0ee7ba9ada2f67ec
#
#
#
# rename "packages/mpfr/mpfr-native_2.3.0.bb"
#     to "packages/mpfr/mpfr-native_2.3.1.bb"
# 
# rename "packages/mpfr/mpfr_2.3.0.bb"
#     to "packages/mpfr/mpfr_2.3.1.bb"
# 
# patch "packages/mpfr/mpfr_2.3.1.bb"
#  from [b20fb238456f28535fb57b617caa5604cb87c127]
#    to [5cddf656cfc181d1b6c96d93b3c84c10bbb47f34]
#
============================================================
--- packages/mpfr/mpfr_2.3.0.bb	b20fb238456f28535fb57b617caa5604cb87c127
+++ packages/mpfr/mpfr_2.3.1.bb	5cddf656cfc181d1b6c96d93b3c84c10bbb47f34
@@ -1,7 +1,7 @@ DEPENDS = "gmp"
 require mpfr.inc
 
 DEPENDS = "gmp"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"