diff options
author | Denys Dmytriyenko <denys@ti.com> | 2015-02-12 10:12:44 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2015-02-12 11:02:28 -0500 |
commit | 43a0f57eb9f6522d6bdc31d1be886faf7a3ccee6 (patch) | |
tree | aa556ba9fa7b41ac2ca894dbed2819d7a9dd4932 /recipes-kernel | |
parent | 665779f5d7aeafe7f8033c62d92393434b6b218d (diff) | |
download | meta-ti-43a0f57eb9f6522d6bdc31d1be886faf7a3ccee6.tar.gz |
multi-kernel: improve deploying additional files and sstate handling
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/multi-kernel.inc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/recipes-kernel/linux/multi-kernel.inc b/recipes-kernel/linux/multi-kernel.inc index 93cf064b..b3358f95 100644 --- a/recipes-kernel/linux/multi-kernel.inc +++ b/recipes-kernel/linux/multi-kernel.inc | |||
@@ -16,6 +16,8 @@ | |||
16 | # and breaks in several places. Introduce a task do_preparekernel that calls | 16 | # and breaks in several places. Introduce a task do_preparekernel that calls |
17 | # "make prepare" in the kernel tree to generate all the necessary files. | 17 | # "make prepare" in the kernel tree to generate all the necessary files. |
18 | 18 | ||
19 | inherit deploy | ||
20 | |||
19 | SRC_URI += " \ | 21 | SRC_URI += " \ |
20 | file://configs " | 22 | file://configs " |
21 | 23 | ||
@@ -72,18 +74,18 @@ do_compileconfigs () { | |||
72 | rmdir --ignore-fail-on-non-empty "${D}/lib/modules/${KERNEL_VERSION}" | 74 | rmdir --ignore-fail-on-non-empty "${D}/lib/modules/${KERNEL_VERSION}" |
73 | 75 | ||
74 | # Drop the resulting images in the deploy dir | 76 | # Drop the resulting images in the deploy dir |
75 | install -d ${DEPLOY_DIR_IMAGE} | 77 | install -d ${DEPLOYDIR} |
76 | install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).bin | 78 | install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).bin |
77 | 79 | ||
78 | if [ -d "${D}/lib" ]; then | 80 | if [ -d "${D}/lib" ]; then |
79 | tar --owner=root --group=root -cvzf ${DEPLOY_DIR_IMAGE}/${MODULE_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).tgz -C ${D} lib | 81 | tar --owner=root --group=root -cvzf ${DEPLOYDIR}/${MODULE_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).tgz -C ${D} lib |
80 | fi | 82 | fi |
81 | 83 | ||
82 | # Install the final config alongside the images | 84 | # Install the final config alongside the images |
83 | cp .config ${DEPLOY_DIR_IMAGE}/config-${PV}-${PR}-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).config | 85 | cp .config ${DEPLOYDIR}/config-${PV}-${PR}-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).config |
84 | 86 | ||
85 | # Create symlinks | 87 | # Create symlinks |
86 | cd ${DEPLOY_DIR_IMAGE} | 88 | cd ${DEPLOYDIR} |
87 | rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).bin | 89 | rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).bin |
88 | ln -sf ${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).bin ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).bin | 90 | ln -sf ${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).bin ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).bin |
89 | rm -f modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).tgz | 91 | rm -f modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $configname).tgz |
@@ -101,14 +103,14 @@ do_compileconfigs () { | |||
101 | 103 | ||
102 | # For reference, copy .config to deploy image | 104 | # For reference, copy .config to deploy image |
103 | do_deploy_append () { | 105 | do_deploy_append () { |
104 | install -d ${DEPLOY_DIR_IMAGE} | 106 | install -d ${DEPLOYDIR} |
105 | 107 | ||
106 | # Drop the regular defconfig along side the others for consistency | 108 | # Drop the regular defconfig along side the others for consistency |
107 | cd ${S} | 109 | cd ${S} |
108 | cp .config ${DEPLOY_DIR_IMAGE}/config-${PV}-${PR}-${MACHINE}.config | 110 | cp .config ${DEPLOYDIR}/config-${PV}-${PR}-${MACHINE}.config |
109 | 111 | ||
110 | # add symlink | 112 | # add symlink |
111 | cd ${DEPLOY_DIR_IMAGE} | 113 | cd ${DEPLOYDIR} |
112 | rm -f config-${MACHINE}.config | 114 | rm -f config-${MACHINE}.config |
113 | ln -s config-${PV}-${PR}-${MACHINE}.config config-${MACHINE}.config | 115 | ln -s config-${PV}-${PR}-${MACHINE}.config config-${MACHINE}.config |
114 | 116 | ||