[oe-commits] org.oe.dev om-gta0[1|2]: allow local.conf to override PREFERRED_PROVIDER_virtual/kernel

[mickeyl commit]

om-gta0[1|2]: allow local.conf to override PREFERRED_PROVIDER_virtual/kernel

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 2d0e7ded96559d4c71de1153762dd0879fa16697
ViewMTN: http://monotone.openembedded.org/revision/info/2d0e7ded96559d4c71de1153762dd0879fa16697
Files:
1
conf/machine/om-gta01.conf
conf/machine/om-gta02.conf
Diffs:

#
# mt diff -r9a3df725b1b42b65e9bcdb38d9f0d5ca08b173eb -r2d0e7ded96559d4c71de1153762dd0879fa16697
#
#
#
# patch "conf/machine/om-gta01.conf"
#  from [cc17dd2af3bf99c8765951f82b0c4e16e41b3d43]
#    to [8bb36def5ae31dc19a1eff1f14caf9bc51906d8f]
# 
# patch "conf/machine/om-gta02.conf"
#  from [11ccb7175df71581f7b6aa92b0065dcae04d5151]
#    to [1320182b35aa623d42f9cb99022c0533b54d5996]
#
============================================================
--- conf/machine/om-gta01.conf	cc17dd2af3bf99c8765951f82b0c4e16e41b3d43
+++ conf/machine/om-gta01.conf	8bb36def5ae31dc19a1eff1f14caf9bc51906d8f
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 
 MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
============================================================
--- conf/machine/om-gta02.conf	11ccb7175df71581f7b6aa92b0065dcae04d5151
+++ conf/machine/om-gta02.conf	1320182b35aa623d42f9cb99022c0533b54d5996
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 
 MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
 UBOOT_ENTRYPOINT = "30008000"