[oe-commits] org.oe.dev merge of '6257d463f8bb66aa3012de1dace0e36e69fc91a3'

[thesing commit]

merge of '6257d463f8bb66aa3012de1dace0e36e69fc91a3'
     and '8d3c7f116675cb37e5e2e8c85c699a0c793dd6bb'

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 16e7273619da7bea4d284044f57797283793b5c0
ViewMTN: http://monotone.openembedded.org/revision/info/16e7273619da7bea4d284044f57797283793b5c0
Files:
1
conf/machine/mpc8313e-rdb.conf
conf/machine/mpc8323e-rdb.conf
packages/udev/files/network.sh
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc_1.5.bb
Diffs:

#
# mt diff -r6257d463f8bb66aa3012de1dace0e36e69fc91a3 -r16e7273619da7bea4d284044f57797283793b5c0
#
# 
# 
# patch "conf/machine/mpc8313e-rdb.conf"
#  from [ab8c53a3e3d1cc19ba638ce007d8bb544e084fe6]
#    to [d5214f50084711f3545cb37ff6f25d89d668e9d2]
# 
# patch "conf/machine/mpc8323e-rdb.conf"
#  from [54b0a85f3b2b21b088ba2cc07834fa16318a72d8]
#    to [f1ed28974f29d5651bc260db595e3e745871a671]
# 
# patch "packages/udev/files/network.sh"
#  from [a083d5cd7833b8ff451f248b0dbcd1587b7a13bc]
#    to [7caaec3edf7207bf5e4af707b1612fe7708d596a]
# 
============================================================
--- conf/machine/mpc8313e-rdb.conf	ab8c53a3e3d1cc19ba638ce007d8bb544e084fe6
+++ conf/machine/mpc8313e-rdb.conf	d5214f50084711f3545cb37ff6f25d89d668e9d2
@@ -5,8 +5,8 @@ PACKAGE_EXTRA_ARCHS = "all ${MACHINE} pp
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c3"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_u-boot = "git"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+PREFERRED_VERSION_u-boot ?= "git"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
============================================================
--- conf/machine/mpc8323e-rdb.conf	54b0a85f3b2b21b088ba2cc07834fa16318a72d8
+++ conf/machine/mpc8323e-rdb.conf	f1ed28974f29d5651bc260db595e3e745871a671
@@ -6,7 +6,7 @@ PACKAGE_EXTRA_ARCHS = "all ${MACHINE} pp
 TARGET_FPU ?= "soft"
 PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 
 MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
 
============================================================
--- packages/udev/files/network.sh	a083d5cd7833b8ff451f248b0dbcd1587b7a13bc
+++ packages/udev/files/network.sh	7caaec3edf7207bf5e4af707b1612fe7708d596a
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# udevd does clearenv(). Export shell PATH to children.
+export PATH
+
 # Do not run when pcmcia-cs is installed
 test -x /sbin/cardctl && exit 0
 


#
# mt diff -r8d3c7f116675cb37e5e2e8c85c699a0c793dd6bb -r16e7273619da7bea4d284044f57797283793b5c0
#
# 
# 
# patch "packages/klibc/klibc-common.inc"
#  from [e31a6c551a6ead6e8029e2b0f4cb5117dcf1677f]
#    to [d9cdde96fbe760ebc175aebd4671ee242e8abda3]
# 
# patch "packages/klibc/klibc-utils-static_1.5.bb"
#  from [b5447c8999eb05a38a9dc43898f7b18b130f8f28]
#    to [916360409c4a5217a7e3e90b9db1cd0c130af357]
# 
# patch "packages/klibc/klibc_1.5.bb"
#  from [643abab68d99c185d9d7b361de44cd819352e425]
#    to [db997233fef8b6147bfeef57ccb19e974a588240]
# 
============================================================
--- packages/klibc/klibc-common.inc	e31a6c551a6ead6e8029e2b0f4cb5117dcf1677f
+++ packages/klibc/klibc-common.inc	d9cdde96fbe760ebc175aebd4671ee242e8abda3
@@ -16,8 +16,8 @@ ARM_INSTRUCTION_SET = "arm"
 # could be fixed, but for the moment:
 ARM_INSTRUCTION_SET = "arm"
 
-SRC_URI_append_linux-gnueabi = "\
-			       	file://klibc-config-eabi.patch;patch=1"
+SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1"
+SRC_URI_append_linux-uclibcgnueabi = "file://klibc-config-eabi.patch;patch=1"
 
 EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
                 'CROSS_COMPILE=${TARGET_PREFIX}' \
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb	b5447c8999eb05a38a9dc43898f7b18b130f8f28
+++ packages/klibc/klibc-utils-static_1.5.bb	916360409c4a5217a7e3e90b9db1cd0c130af357
@@ -1,6 +1,6 @@ require klibc-common.inc
 require klibc-common.inc
 
-PR = "r5"
+PR = "r6"
 
 
 # We only want the static utils. klibc build both. So we install only what we want.				
============================================================
--- packages/klibc/klibc_1.5.bb	643abab68d99c185d9d7b361de44cd819352e425
+++ packages/klibc/klibc_1.5.bb	db997233fef8b6147bfeef57ccb19e974a588240
@@ -1,2 +1,2 @@ require klibc.inc
 require klibc.inc
+PR = "r4"
-PR = "r3"