aboutsummaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2010-03-17 19:23:11 -0400
committerKoen Kooi <koen@openembedded.org>2010-04-12 19:43:27 +0200
commitc5633303a913da1085d7b6956faea933d845719b (patch)
treea3508607b29b61a52e0661778f766c198e27a8b9 /recipes
parent977ca9920cafb73c20ee7f4ffcfa7d499f5bcbdc (diff)
downloadopenembedded-c5633303a913da1085d7b6956faea933d845719b.tar.gz
openembedded-c5633303a913da1085d7b6956faea933d845719b.tar.bz2
openembedded-c5633303a913da1085d7b6956faea933d845719b.zip
multi-kernel.inc: introduce MULTI_CONFIG_BASE_SUFFIX variable
Signed-off-by: Denys Dmytriyenko <denis@denix.org> Signed-off-by: Koen Kooi <k-kooi@ti.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/linux/multi-kernel.inc20
1 files changed, 11 insertions, 9 deletions
diff --git a/recipes/linux/multi-kernel.inc b/recipes/linux/multi-kernel.inc
index 790e49aa8c..1516a42f12 100644
--- a/recipes/linux/multi-kernel.inc
+++ b/recipes/linux/multi-kernel.inc
@@ -15,6 +15,8 @@ require linux.inc
SRC_URI_append = " \
file://configs/ "
+MULTI_CONFIG_BASE_SUFFIX = "multi-config-"
+
do_compileconfigs () {
# Compile and Install additional kernel configs if found
@@ -43,23 +45,23 @@ do_compileconfigs () {
# Drop the resulting images in the deploy dir
install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.multi-config-$(basename $config).bin
+ install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin
if [ -d "${D}/lib" ]; then
- fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.multi-config-$(basename $config).tgz -C ${D} lib
+ fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz -C ${D} lib
fi
# Install the final config alongside the images
- cp .config ${DEPLOY_DIR_IMAGE}/config-${PV}-${PR}-${MACHINE}.multi-config-$(basename $config).config
+ cp .config ${DEPLOY_DIR_IMAGE}/config-${PV}-${PR}-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).config
# Create symlinks
cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.multi-config-$(basename $config).bin
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.multi-config-$(basename $config).bin ${KERNEL_IMAGE_SYMLINK_NAME}.multi-config-$(basename $config).bin
- rm -f modules-${MACHINE}.multi-config-$(basename $config).tgz
- ln -sf ${MODULES_IMAGE_BASE_NAME}.multi-config-$(basename $config).tgz modules-${MACHINE}.multi-config-$(basename $config).tgz
- rm -f config-${MACHINE}.multi-config-$(basename $config).config
- ln -sf config-${PV}-${PR}-${MACHINE}.multi-config-$(basename $config).config config-${MACHINE}.multi-config-$(basename $config).config
+ 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
+ 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
done