* [PATCH 2/3] kernel.bbclass: rename do_deploy and add vardepsexclusive accordingly
@ 2010-12-16 8:56 Kevin Tian
2010-12-16 15:29 ` Richard Purdie
2010-12-16 15:39 ` Richard Purdie
0 siblings, 2 replies; 5+ messages in thread
From: Kevin Tian @ 2010-12-16 8:56 UTC (permalink / raw)
To: poky, paul.eggleton, rpurdie
rename do_deploy to kernel_do_deploy and export it. Then add exclusive
list for two variables it refers to:
+kernel_do_deploy[vardepsexclude] = "DATETIME"
+KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
This avoids the last road block linux-yocto for sstate.
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---
meta/classes/kernel.bbclass | 4 +++-
meta/conf/distro/poky.conf | 2 ++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index bb76285..341809a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -474,7 +474,7 @@ addtask sizecheck before do_install after do_compile
KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
-do_deploy() {
+kernel_do_deploy() {
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
@@ -504,6 +504,8 @@ do_deploy[dirs] = "${DEPLOYDIR} ${B}"
addtask deploy before do_package after do_install
+EXPORT_FUNCTIONS do_deploy
+
# perf must be enabled in individual kernel recipes
PACKAGES =+ "perf"
FILES_perf = "${bindir}/* \
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 95ca097..735e0c0 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -145,3 +145,5 @@ BB_SIGNATURE_HANDLER = "basic"
BB_HASHTASK_WHITELIST = "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)"
BB_HASHBASE_WHITELIST = "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER"
patch_do_patch[vardepsexclude] = "DATE SRCDATE"
+kernel_do_deploy[vardepsexclude] = "DATETIME"
+KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
--
1.6.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] kernel.bbclass: rename do_deploy and add vardepsexclusive accordingly
2010-12-16 8:56 [PATCH 2/3] kernel.bbclass: rename do_deploy and add vardepsexclusive accordingly Kevin Tian
@ 2010-12-16 15:29 ` Richard Purdie
2010-12-17 1:01 ` Tian, Kevin
2010-12-16 15:39 ` Richard Purdie
1 sibling, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2010-12-16 15:29 UTC (permalink / raw)
To: Kevin Tian; +Cc: paul.eggleton, poky
On Thu, 2010-12-16 at 16:56 +0800, Kevin Tian wrote:
> rename do_deploy to kernel_do_deploy and export it. Then add exclusive
> list for two variables it refers to:
>
> +kernel_do_deploy[vardepsexclude] = "DATETIME"
> +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
>
> This avoids the last road block linux-yocto for sstate.
Shouldn't this just need only the
KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
change?
Cheers,
Richard
> Signed-off-by: Kevin Tian <kevin.tian@intel.com>
> ---
> meta/classes/kernel.bbclass | 4 +++-
> meta/conf/distro/poky.conf | 2 ++
> 2 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index bb76285..341809a 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -474,7 +474,7 @@ addtask sizecheck before do_install after do_compile
> KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
>
> -do_deploy() {
> +kernel_do_deploy() {
> install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
> @@ -504,6 +504,8 @@ do_deploy[dirs] = "${DEPLOYDIR} ${B}"
>
> addtask deploy before do_package after do_install
>
> +EXPORT_FUNCTIONS do_deploy
> +
> # perf must be enabled in individual kernel recipes
> PACKAGES =+ "perf"
> FILES_perf = "${bindir}/* \
> diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
> index 95ca097..735e0c0 100644
> --- a/meta/conf/distro/poky.conf
> +++ b/meta/conf/distro/poky.conf
> @@ -145,3 +145,5 @@ BB_SIGNATURE_HANDLER = "basic"
> BB_HASHTASK_WHITELIST = "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)"
> BB_HASHBASE_WHITELIST = "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER"
> patch_do_patch[vardepsexclude] = "DATE SRCDATE"
> +kernel_do_deploy[vardepsexclude] = "DATETIME"
> +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] kernel.bbclass: rename do_deploy and add vardepsexclusive accordingly
2010-12-16 15:29 ` Richard Purdie
@ 2010-12-17 1:01 ` Tian, Kevin
0 siblings, 0 replies; 5+ messages in thread
From: Tian, Kevin @ 2010-12-17 1:01 UTC (permalink / raw)
To: Richard Purdie; +Cc: paul.eggleton@linux.intel.com, poky@pokylinux.org
>From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
>Sent: Thursday, December 16, 2010 11:29 PM
>
>On Thu, 2010-12-16 at 16:56 +0800, Kevin Tian wrote:
>> rename do_deploy to kernel_do_deploy and export it. Then add exclusive
>> list for two variables it refers to:
>>
>> +kernel_do_deploy[vardepsexclude] = "DATETIME"
>> +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
>>
>> This avoids the last road block linux-yocto for sstate.
>
>Shouldn't this just need only the
>
>KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
>
>change?
>
The reason is that kernel_do_deploy itself also refers to DATETIME:
cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
I'll send out a separate fix for this.
Thanks
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] kernel.bbclass: rename do_deploy and add vardepsexclusive accordingly
2010-12-16 8:56 [PATCH 2/3] kernel.bbclass: rename do_deploy and add vardepsexclusive accordingly Kevin Tian
2010-12-16 15:29 ` Richard Purdie
@ 2010-12-16 15:39 ` Richard Purdie
2010-12-17 1:02 ` Tian, Kevin
1 sibling, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2010-12-16 15:39 UTC (permalink / raw)
To: Kevin Tian; +Cc: paul.eggleton, poky
On Thu, 2010-12-16 at 16:56 +0800, Kevin Tian wrote:
> rename do_deploy to kernel_do_deploy and export it. Then add exclusive
> list for two variables it refers to:
>
> +kernel_do_deploy[vardepsexclude] = "DATETIME"
> +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
>
> This avoids the last road block linux-yocto for sstate.
>
> Signed-off-by: Kevin Tian <kevin.tian@intel.com>
In the interests of getting this resolved, I've split this commit into
two and pushed the pieces I think are needed, I'm hoping you don't mind.
If we need any further changes, please let me know.
Cheers,
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] kernel.bbclass: rename do_deploy and add vardepsexclusive accordingly
2010-12-16 15:39 ` Richard Purdie
@ 2010-12-17 1:02 ` Tian, Kevin
0 siblings, 0 replies; 5+ messages in thread
From: Tian, Kevin @ 2010-12-17 1:02 UTC (permalink / raw)
To: Richard Purdie; +Cc: paul.eggleton@linux.intel.com, poky@pokylinux.org
>From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
>Sent: Thursday, December 16, 2010 11:40 PM
>
>On Thu, 2010-12-16 at 16:56 +0800, Kevin Tian wrote:
>> rename do_deploy to kernel_do_deploy and export it. Then add exclusive
>> list for two variables it refers to:
>>
>> +kernel_do_deploy[vardepsexclude] = "DATETIME"
>> +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
>>
>> This avoids the last road block linux-yocto for sstate.
>>
>> Signed-off-by: Kevin Tian <kevin.tian@intel.com>
>
>In the interests of getting this resolved, I've split this commit into
>two and pushed the pieces I think are needed, I'm hoping you don't mind.
no problem. the split is clearer.
>
>If we need any further changes, please let me know.
>
I'll send one for that.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-17 1:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-16 8:56 [PATCH 2/3] kernel.bbclass: rename do_deploy and add vardepsexclusive accordingly Kevin Tian
2010-12-16 15:29 ` Richard Purdie
2010-12-17 1:01 ` Tian, Kevin
2010-12-16 15:39 ` Richard Purdie
2010-12-17 1:02 ` 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.