diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-07-16 18:48:13 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-08-22 22:03:11 +0200 |
commit | d0d016e11765c7923c2bfbfeefdfc65ff39e34d5 (patch) | |
tree | 2a460891b74e6d9efc14d4a4ccbec353a6ec96c7 /meta-oe/classes | |
parent | 408b046b592cdfa0b5ef84c0bf42ddaa43334fda (diff) | |
download | meta-openembedded-d0d016e11765c7923c2bfbfeefdfc65ff39e34d5.tar.gz |
kernel.bbclass: fix spacing to reduce delta between oe-core and meta-oe
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta-oe/classes')
-rw-r--r-- | meta-oe/classes/kernel.bbclass | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass index 862913370..f67503a3b 100644 --- a/meta-oe/classes/kernel.bbclass +++ b/meta-oe/classes/kernel.bbclass | |||
@@ -19,12 +19,12 @@ python __anonymous () { | |||
19 | 19 | ||
20 | image = bb.data.getVar('INITRAMFS_IMAGE', d, True) | 20 | image = bb.data.getVar('INITRAMFS_IMAGE', d, True) |
21 | if image: | 21 | if image: |
22 | bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) | 22 | bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) |
23 | 23 | ||
24 | machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) | 24 | machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) |
25 | 25 | ||
26 | if machine_kernel_pr: | 26 | if machine_kernel_pr: |
27 | bb.data.setVar('PR', machine_kernel_pr, d) | 27 | bb.data.setVar('PR', machine_kernel_pr, d) |
28 | } | 28 | } |
29 | 29 | ||
30 | inherit kernel-arch deploy | 30 | inherit kernel-arch deploy |
@@ -189,11 +189,10 @@ kernel_do_configure() { | |||
189 | if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then | 189 | if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then |
190 | cp "${WORKDIR}/defconfig" "${B}/.config" | 190 | cp "${WORKDIR}/defconfig" "${B}/.config" |
191 | fi | 191 | fi |
192 | 192 | yes '' | oe_runmake oldconfig | |
193 | yes '' | oe_runmake oldconfig | ||
194 | 193 | ||
195 | if [ ! -z "${INITRAMFS_IMAGE}" ]; then | 194 | if [ ! -z "${INITRAMFS_IMAGE}" ]; then |
196 | for img in cpio.gz cpio.lzo cpio.lzma cpio.xz ; do | 195 | for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do |
197 | if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then | 196 | if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then |
198 | cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img | 197 | cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img |
199 | fi | 198 | fi |