diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2016-04-07 06:27:37 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-09 23:00:45 +0100 |
| commit | 04e1978a74b4022ce22f63de2d4a988d3a3ec575 (patch) | |
| tree | 017fc9e20efa48f1588e4242cc87e97428769d94 /meta | |
| parent | 513ea496573f2dae4905551807e93f6730408f97 (diff) | |
| download | poky-04e1978a74b4022ce22f63de2d4a988d3a3ec575.tar.gz | |
image_types.bbclass: fix elf
Fixed:
| DEBUG: Executing shell function do_image_elf
| Cannot open `/path/to/tmp/sysroots/qemux86-64/usr/src/kernel/bzImage': (null)
| WARNING: exit code 1 from a shell command.
The bzImage is in DEPLOY_DIR_IMAGE
(From OE-Core rev: 24536aa578e483fc2a8594628befa4c78a05681c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image_types.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 3f97ddd448..98b74fd5e5 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
| @@ -111,13 +111,14 @@ IMAGE_CMD_cpio () { | |||
| 111 | fi | 111 | fi |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | ELF_KERNEL ?= "${STAGING_DIR_HOST}/usr/src/kernel/${KERNEL_IMAGETYPE}" | 114 | ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}" |
| 115 | ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" | 115 | ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" |
| 116 | 116 | ||
| 117 | IMAGE_CMD_elf () { | 117 | IMAGE_CMD_elf () { |
| 118 | test -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf && rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf | 118 | test -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf && rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf |
| 119 | mkelfImage --kernel=${ELF_KERNEL} --initrd=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio.gz --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD} | 119 | mkelfImage --kernel=${ELF_KERNEL} --initrd=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio.gz --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD} |
| 120 | } | 120 | } |
| 121 | |||
| 121 | IMAGE_TYPEDEP_elf = "cpio.gz" | 122 | IMAGE_TYPEDEP_elf = "cpio.gz" |
| 122 | 123 | ||
| 123 | UBI_VOLNAME ?= "${MACHINE}-rootfs" | 124 | UBI_VOLNAME ?= "${MACHINE}-rootfs" |
