* [PATCH 2/3] kernel.bbclass: introduce UIMAGE_BASE_NAME
@ 2010-12-17 0:51 Kevin Tian
2010-12-20 3:21 ` Khem Raj
0 siblings, 1 reply; 4+ messages in thread
From: Kevin Tian @ 2010-12-17 0:51 UTC (permalink / raw)
To: poky, paul.eggleton, rpurdie
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---
meta/classes/kernel.bbclass | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b2f8132..4f7ceba 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -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
--
1.6.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/3] kernel.bbclass: introduce UIMAGE_BASE_NAME
2010-12-17 0:51 [PATCH 2/3] kernel.bbclass: introduce UIMAGE_BASE_NAME Kevin Tian
@ 2010-12-20 3:21 ` Khem Raj
2010-12-20 21:15 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2010-12-20 3:21 UTC (permalink / raw)
To: Kevin Tian; +Cc: paul.eggleton, poky
On (17/12/10 08:51), Kevin Tian wrote:
> Signed-off-by: Kevin Tian <kevin.tian@intel.com>
> ---
> meta/classes/kernel.bbclass | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index b2f8132..4f7ceba 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -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
why using KERNEL_IMAGE_BASE_NAME does not work here ?
> 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
> --
> 1.6.0.4
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2/3] kernel.bbclass: introduce UIMAGE_BASE_NAME
2010-12-20 3:21 ` Khem Raj
@ 2010-12-20 21:15 ` Richard Purdie
2010-12-21 0:35 ` Tian, Kevin
0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2010-12-20 21:15 UTC (permalink / raw)
To: Khem Raj; +Cc: paul.eggleton, poky
On Sun, 2010-12-19 at 19:21 -0800, Khem Raj wrote:
> On (17/12/10 08:51), Kevin Tian wrote:
> > 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
>
> why using KERNEL_IMAGE_BASE_NAME does 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2/3] kernel.bbclass: introduce UIMAGE_BASE_NAME
2010-12-20 21:15 ` Richard Purdie
@ 2010-12-21 0:35 ` Tian, Kevin
0 siblings, 0 replies; 4+ messages in thread
From: Tian, Kevin @ 2010-12-21 0:35 UTC (permalink / raw)
To: Richard Purdie, Khem Raj; +Cc: paul.eggleton, poky
>From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
>Sent: Tuesday, December 21, 2010 5:16 AM
>
>On Sun, 2010-12-19 at 19:21 -0800, Khem Raj wrote:
>> On (17/12/10 08:51), Kevin Tian wrote:
>> > 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
>>
>> why using KERNEL_IMAGE_BASE_NAME does not work here ?
>
>Agreed, this doesn't make sense. I've pushed:
>
>http://git.pokylinux.org/cgit.cgi/poky/commit/?id=2e94e9a4fed33b1c7c5b0ce1dbc566e24
>344280c
>
>since its clear that KERNEL_IMAGETYPE = "uImage".
>
thanks for catching it. I didn't check it carefully. :-)
Thanks
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-12-21 0:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-17 0:51 [PATCH 2/3] kernel.bbclass: introduce UIMAGE_BASE_NAME Kevin Tian
2010-12-20 3:21 ` Khem Raj
2010-12-20 21:15 ` Richard Purdie
2010-12-21 0:35 ` Tian, Kevin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.