[oe-commits] org.oe.dev linux-rp.inc: Use ?= instead of extra variables as overrides

[rpurdie commit]

linux-rp.inc: Use ?= instead of extra variables as overrides

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 1ff8e9f2a56cabec8ce416cede18b3dbedd1994e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1ff8e9f2a56cabec8ce416cede18b3dbedd1994e
Files:
1
packages/linux/linux-rp.inc
Diffs:

#
# mt diff -r228cf437bfab50a82cfc32c5e43c9adf7e206143 -r1ff8e9f2a56cabec8ce416cede18b3dbedd1994e
#
# 
# 
# patch "packages/linux/linux-rp.inc"
#  from [1c25123c193c3cb5946c408a2ddf1cb156ab9e84]
#    to [7bd10f44a5092489444734c3cf45639d61b18b11]
# 
============================================================
--- packages/linux/linux-rp.inc	1c25123c193c3cb5946c408a2ddf1cb156ab9e84
+++ packages/linux/linux-rp.inc	7bd10f44a5092489444734c3cf45639d61b18b11
@@ -21,18 +21,19 @@ COMPATIBLE_HOST = "(arm|i.86).*-linux"
 
 EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
 COMPATIBLE_HOST = "(arm|i.86).*-linux"
-COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86)'
+COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86)'
 KERNEL_IMAGETYPE_qemux86 = "bzImage"
+KERNEL_IMAGETYPE_bootcdx86 = "bzImage"
 
-KERNEL_CUSTOM_NAME = '${@bb.data.getVar("KERNEL_CUSTOM_NAME_OVERRIDE",d,1) or ""}'
-KERNEL_DEPLOY_NAME = '${@bb.data.getVar("KERNEL_DEPLOY_NAME_OVERRIDE",d,1) or "${KERNEL_IMAGETYPE}-${PV}-${KERNEL_CUSTOM_NAME}${MACHINE}-${DATETIME}.bin"}'
-KERNEL_SYMLINK_NAME =  '${@bb.data.getVar("KERNEL_SYMLINK_NAME_OVERRIDE",d,1) or "${KERNEL_IMAGETYPE}-${KERNEL_CUSTOM_NAME}${MACHINE}.bin"}'
-KERNEL_DEFCONFIG = '${@bb.data.getVar("KERNEL_DEFCONFIG_OVERRIDE",d,1) or "defconfig-${MACHINE}"}' 
+KERNEL_CUSTOM_NAME ?= ""
+KERNEL_DEPLOY_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${KERNEL_CUSTOM_NAME}${MACHINE}-${DATETIME}.bin"
+KERNEL_SYMLINK_NAME ?=  "${KERNEL_IMAGETYPE}-${KERNEL_CUSTOM_NAME}${MACHINE}.bin"
+KERNEL_DEFCONFIG ?= "defconfig-${MACHINE}"
 
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
 CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd"
-CMDLINE_ROOT = '${@bb.data.getVar("CMDLINE_ROOT_OVERRIDE",d,1) or "root=/dev/mtdblock2 rootfstype=jffs2"}'
-CMDLINE_ROOT_spitz = '${@bb.data.getVar("CMDLINE_ROOT_OVERRIDE",d,1) or "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"}'
+CMDLINE_ROOT ?= "root=/dev/mtdblock2 rootfstype=jffs2"
+CMDLINE_ROOT_spitz ?= "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"
 CMDLINE_OTHER = "dyntick=enable"
 CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'