From 79e90aebdbe897f5686cf86e874cf702cea5f027 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 4 Mar 2013 12:26:10 -0500 Subject: multi-kernel: match oe-core for MODULE_IMAGE_BASE_NAME, set it conditionally Thanks to Robert P. J. Day, MODULE_IMAGE_BASE_NAME was added to oe-core - only ~3.5 years after it got into Classic-OE and with a typo of MODULE_*, not plural MODULES_*, so match it here and set conditionally. Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/multi-kernel.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/multi-kernel.inc b/recipes-kernel/linux/multi-kernel.inc index 9a0c090b..e696c8be 100644 --- a/recipes-kernel/linux/multi-kernel.inc +++ b/recipes-kernel/linux/multi-kernel.inc @@ -26,7 +26,7 @@ SRC_URI += " \ file://configs " MULTI_CONFIG_BASE_SUFFIX = "multi-config-" -MODULES_IMAGE_BASE_NAME = "modules-${PV}-${PR}-${MACHINE}" +MODULE_IMAGE_BASE_NAME ?= "modules-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}" do_preparekernel () { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE @@ -76,7 +76,7 @@ do_compileconfigs () { install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin if [ -d "${D}/lib" ]; then - tar --owner=root --group=root -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz -C ${D} lib + tar --owner=root --group=root -cvzf ${DEPLOY_DIR_IMAGE}/${MODULE_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz -C ${D} lib fi # Install the final config alongside the images @@ -87,7 +87,7 @@ do_compileconfigs () { rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin ln -sf ${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin rm -f modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz - ln -sf ${MODULES_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz + ln -sf ${MODULE_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz rm -f config-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).config ln -sf config-${PV}-${PR}-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).config config-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).config @@ -115,7 +115,7 @@ do_deploy_append () { ln -s config-${PV}-${PR}-${MACHINE}.config config-${MACHINE}.config rm -f modules-${MACHINE}.tgz - ln -sf ${MODULES_IMAGE_BASE_NAME}.tgz modules-${MACHINE}.tgz + ln -sf ${MODULE_IMAGE_BASE_NAME}.tgz modules-${MACHINE}.tgz } -- cgit v1.2.3-54-g00ecf