kernel.bbclass: introduce UIMAGE_BASE_NAME
PATCH 2/3 kernel.bbclass: introduce UIMAGE_BASE_NAME
--- meta/classes/kernel.bbclass | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +4 -3
@@ -472,6 +472,7 @@ do_sizecheck() { addtask sizecheck before do_install after do_compile KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}" +UIMAGE_BASE_NAME ?= "uImage-${PV}-${PR}-${MACHINE}-${DATETIME}" # Don't include the DATETIME variable in the sstate package signatures KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
@@ -484,16 +485,16 @@ kernel_do_deploy() { if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/uImage ; then - cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${UIMAGE_BASE_NAME}.bin elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${UIMAGE_BASE_NAME}.bin rm -f linux.bin else ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin rm -f linux.bin.gz gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${UIMAGE_BASE_NAME}.bin rm -f linux.bin.gz fi fi
Signature · 1 line
1.6.0.4
Quoted 18 lines · Kevin Tian
Signed-off-by Kevin Tian <[email protected]>--- meta/classes/kernel.bbclass | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)meta/classes/kernel.bbclass +1
-0@@ -472,6 +472,7 @@ do_sizecheck() { addtask sizecheck before do_install after do_compile KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}" +UIMAGE_BASE_NAME ?= "uImage-${PV}-${PR}-${MACHINE}-${DATETIME}" # Don't include the DATETIME variable in the sstate package signatures KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
meta/classes/kernel.bbclass kernel_do_deploy() { · line 488
Quoted 5 lines
meta/classes/kernel.bbclass +1
-1@@ -484,16 +485,16 @@ kernel_do_deploy() { if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/uImage ; then - cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${UIMAGE_BASE_NAME}.bin
why using KERNEL_IMAGE_BASE_NAME does not work here ?
Quoted 21 lines
meta/classes/kernel.bbclass +2
-2elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${UIMAGE_BASE_NAME}.bin rm -f linux.bin else ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin rm -f linux.bin.gz gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${UIMAGE_BASE_NAME}.bin rm -f linux.bin.gz fi fiSignature · 6 lines
1.6.0.4 _______________________________________________ poky mailing list [email protected] https://lists.yoctoproject.org/listinfo/poky
Quoted 10 lines · Khem Raj
Quoted 9 lines · Kevin Tian
addtask sizecheck before
do_installafterdo_compile
KERNEL_IMAGE_BASE_NAME?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"meta/classes/kernel.bbclass +1
-0+UIMAGE_BASE_NAME ?= "uImage-${PV}-${PR}-${MACHINE}-${DATETIME}" # Don't include the DATETIME variable in the sstate package signatures KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"@@ -484,16 +485,16 @@ kernel_do_deploy() {
Quoted 6 lines
meta/classes/kernel.bbclass kernel_do_deploy() { · line 488
Quoted 4 lines
meta/classes/kernel.bbclass +1
-1if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/uImage ; then - cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${UIMAGE_BASE_NAME}.binwhy using
KERNEL_IMAGE_BASE_NAMEdoes not work here ?
Agreed, this doesn't make sense. I've pushed:
http://git.pokylinux.org/cgit.cgi/poky/commit/?id=2e94e9a4fed33b1c7c5b0ce1dbc566e24344280c
since its clear that KERNEL_IMAGETYPE = "uImage".
Cheers,
Richard
Quoted 22 lines
From: Richard Purdie [mailto:[email protected]]
Sent: Tuesday, December 21, 2010 5:16 AMQuoted 4 lines · Khem Raj
Quoted 3 lines · Kevin Tian
addtask sizecheck before
do_installafterdo_compile
KERNEL_IMAGE_BASE_NAME?="${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
Quoted 9 lines
meta/classes/kernel.bbclass kernel_do_deploy() { · line 487
Quoted 9 lines
meta/classes/kernel.bbclass +1
-1+UIMAGE_BASE_NAME ?= "uImage-${PV}-${PR}-${MACHINE}-${DATETIME}" # Don't include the DATETIME variable in the sstate package signatures KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"@@ -484,16 +485,16 @@ kernel_do_deploy() { if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/uImage ; then - cp arch/${ARCH}/boot/uImage${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
Quoted 1 line
Review kernel_do_deploy() { · line 488
Quoted 1 line
(quoted diff) +1
-0+ cp arch/${ARCH}/boot/uImage${DEPLOYDIR}/${UIMAGE_BASE_NAME}.bin
Quoted 1 line
Quoted 9 lines
Quoted 1 line
why using
KERNEL_IMAGE_BASE_NAMEdoes not work here ?Agreed, this doesn't make sense. I've pushed:
http://git.pokylinux.org/cgit.cgi/poky/commit/?id=2e94e9a4fed33b1c7c5b0ce1dbc566e24
344280csince its clear that
KERNEL_IMAGETYPE= "uImage".
thanks for catching it. I didn't check it carefully. :-)
Thanks
Kevin