From dc1499bd78947524647fa5d6eb9319e639d0032a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 13 Sep 2013 18:32:35 +0200 Subject: [PATCH] meta-digi: add IS_KERNEL_2X variable to be used in recipes Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccardimx28js.conf | 3 +-- meta-digi-arm/conf/machine/include/digi-defaults.inc | 2 ++ meta-digi-arm/recipes-bsp/kobs-ng/kobs-ng_10.12.01.bb | 8 ++++---- .../packagegroups/packagegroup-dey-examples.bb | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf index c0ef8484a..529c682a5 100644 --- a/meta-digi-arm/conf/machine/ccardimx28js.conf +++ b/meta-digi-arm/conf/machine/ccardimx28js.conf @@ -5,6 +5,5 @@ include conf/machine/include/ccardimx28.inc DTSNAME = "imx28-${MACHINE}" -SERIAL_CONSOLE_DEVICE = '${@base_version_less_or_equal("PREFERRED_VERSION_linux-dey", "2.6.35.14", "ttyAM0", "ttyAMA0", d)}' +SERIAL_CONSOLE_DEVICE = "${@base_conditional('IS_KERNEL_2X', '1' , 'ttyAM0', 'ttyAMA0', d)}" SERIAL_CONSOLE = "115200 ${SERIAL_CONSOLE_DEVICE}" - diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 5b4b6c842..59fd83bd2 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -9,6 +9,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}" PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" +IS_KERNEL_2X ?= "${@base_version_less_or_equal('PREFERRED_VERSION_linux-dey', '2.6.35.14', '1', '', d)}" + # Digi BSP default settings IMAGE_CLASSES = "image_types_digi" diff --git a/meta-digi-arm/recipes-bsp/kobs-ng/kobs-ng_10.12.01.bb b/meta-digi-arm/recipes-bsp/kobs-ng/kobs-ng_10.12.01.bb index 3286ada1d..4de0eb892 100644 --- a/meta-digi-arm/recipes-bsp/kobs-ng/kobs-ng_10.12.01.bb +++ b/meta-digi-arm/recipes-bsp/kobs-ng/kobs-ng_10.12.01.bb @@ -17,10 +17,10 @@ SRC_URI = " \ SRC_URI_append_ccardimx28js = " \ file://0005-version-parse-MX-arch-to-select-rom-version.patch \ " -SRC_URI_append = '${@base_version_less_or_equal("PREFERRED_VERSION_linux-dey", "2.6.35.14", "", " \ - file://0006-Remove-MEMSETOOBSEL-ioctl-call.patch \ - file://0007-Rename-MTD_MODE_-to-MTD_FILE_MODE_.patch \ - ", d)}' +SRC_URI_append = " \ + ${@base_conditional('IS_KERNEL_2X', '1' , '', 'file://0006-Remove-MEMSETOOBSEL-ioctl-call.patch', d)} \ + ${@base_conditional('IS_KERNEL_2X', '1' , '', 'file://0007-Rename-MTD_MODE_-to-MTD_FILE_MODE_.patch', d)} \ +" SRC_URI[md5sum] = "9fce401b6c90e851f0335b9ca3a649a9" SRC_URI[sha256sum] = "ef25f5c9033500c236b1894436bddc4e20b90bc17585fbcdf9fe3bbbd9f15781" diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb index 977022af9..62d7e7e86 100644 --- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb +++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb @@ -10,9 +10,9 @@ PR = "r0" inherit packagegroup RDEPENDS_${PN} = "\ - ${@base_version_less_or_equal("PREFERRED_VERSION_linux-dey", "2.6.35.14", "dey-examples-adc", "", d)} \ + ${@base_conditional('IS_KERNEL_2X', '1' , 'dey-examples-adc', '', d)} \ ${@base_contains("MACHINE_FEATURES", "alsa", "dey-examples-alsa", "", d)} \ - ${@base_version_less_or_equal("PREFERRED_VERSION_linux-dey", "2.6.35.14", "dey-examples-gpio", "", d)} \ + ${@base_conditional('IS_KERNEL_2X', '1' , 'dey-examples-gpio', '', d)} \ dey-examples-gpio-sysfs \ ${@base_contains("MACHINE_FEATURES", "rtc", "dey-examples-rtc", "", d)} \ dey-examples-spidev \