[oe-commits] org.oe.dev merge of '8e15d4e806ea459070da1867571a1c81f6748e33'

[oe commit]

merge of '8e15d4e806ea459070da1867571a1c81f6748e33'
     and 'c720c1f0f144601f43a22e4c9d8312e8df0db716'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f556aff842b708ecab5dc00394070482ee1570d5
ViewMTN: http://monotone.openembedded.org/revision/info/f556aff842b708ecab5dc00394070482ee1570d5
Files:
1
packages/kexec/kexec-tools-static_1.101.bb
conf/machine/mpc8313e-rdb.conf
conf/machine/mpc8323e-rdb.conf
Diffs:

#
# mt diff -r8e15d4e806ea459070da1867571a1c81f6748e33 -rf556aff842b708ecab5dc00394070482ee1570d5
#
# 
# 
# patch "packages/kexec/kexec-tools-static_1.101.bb"
#  from [5c7677ba0e8d8e43af7045696503b09ba7f8aab6]
#    to [631b2a5ebad7343ec05c584ae17b033dec44c0f7]
# 
============================================================
--- packages/kexec/kexec-tools-static_1.101.bb	5c7677ba0e8d8e43af7045696503b09ba7f8aab6
+++ packages/kexec/kexec-tools-static_1.101.bb	631b2a5ebad7343ec05c584ae17b033dec44c0f7
@@ -1,7 +1,7 @@ require kexec-tools.inc
 # the binaries are statical linked against klibc
 require kexec-tools.inc
 
-PR = "r2"
+PR = "r3"
 DEPENDS = "klibc"
 
 SRC_URI += "file://kexec-klibc.patch;patch=1"
@@ -18,6 +18,6 @@ PACKAGES =+ "kexec-static kdump-static"
 
 PACKAGES =+ "kexec-static kdump-static"
 
-FILES_kexec-klibc = "${sbindir}/kexec"
-FILES_kdump-klibc = "${sbindir}/kdump"
+FILES_kexec-static = "${sbindir}/kexec"
+FILES_kdump-static = "${sbindir}/kdump"
 


#
# mt diff -rc720c1f0f144601f43a22e4c9d8312e8df0db716 -rf556aff842b708ecab5dc00394070482ee1570d5
#
# 
# 
# patch "conf/machine/mpc8313e-rdb.conf"
#  from [ab8c53a3e3d1cc19ba638ce007d8bb544e084fe6]
#    to [d5214f50084711f3545cb37ff6f25d89d668e9d2]
# 
# patch "conf/machine/mpc8323e-rdb.conf"
#  from [54b0a85f3b2b21b088ba2cc07834fa16318a72d8]
#    to [f1ed28974f29d5651bc260db595e3e745871a671]
# 
============================================================
--- 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"