Skip to contentSkip to conversation

Robert P. J. Day : kernel.bbclass: Define MODULE_IMAGE_BASE_NAME for layer convenience.

oe-commits New Martin Jansa 2 participants 3 messages Jan 17, 2013 1 message not in the archive

lore
Share & tools
lore

Martin Jansa

author
#1 lore raw
In reply to a message not in the archive
Quoted 28 lines · On Thu, Jan 10, 2013 at 11:52:38PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 67e77cd948c69798695d5d5f34163ef89339b35a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=67e77cd948c69798695d5d5f34163ef89339b35a
Author: Robert P. J. Day <[email protected]>
Date:   Wed Jan  9 12:01:23 2013 -0500

kernel.bbclass: Define MODULE_IMAGE_BASE_NAME for layer convenience.

Define the additional variable MODULE_IMAGE_BASE_NAME since some layers (like meta-ti) would find it handy for multi-kernel definitions in that they wouldn't have to define their own variable representing exactly the same thing.

Signed-off-by Robert P. J. Day <[email protected]>
Signed-off-by Saul Wold <[email protected]>

---

 meta/classes/kernel.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/classes/kernel.bbclass +0 -0
index aff8842..46ba55f 100644

meta/classes/kernel.bbclass KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PE}-${PV}-${PR}-${MACHINE}-${DA · line 507

Quoted 9 lines
meta/classes/kernel.bbclass +2 -1
@@ -500,7 +500,8 @@ KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PE}-${PV}-${PR}-${MACHINE}-${DA
 # Don't include the DATETIME variable in the sstate package signatures
 KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
-MODULE_TARBALL_BASE_NAME ?= "modules-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}.tgz"
+MODULE_IMAGE_BASE_NAME ?= "modules-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
 # Don't include the DATETIME variable in the sstate package signatures
 MODULE_TARBALL_BASE_NAME[vardepsexclude] = "DATETIME"
 MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz"

This makes sstate checksums to depend on DATETIME variable.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=3299

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#2 lore raw

PATCH 1/1 kernel.bbclass: don't depend on DATETIME

* http://cgit.openembedded.org/openembedded-core/commit/?id=67e77cd948c69798695d5d5f34163ef89339b35a
moved DATETIME dependency from MODULE_TARBALL_BASE_NAME to MODULE_IMAGE_BASE_NAME but without copying that vardepsexclude

Signed-off-by Martin Jansa <[email protected]>
---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernel.bbclass +1 -1
index 46ba55f..ce4c01a 100644
@@ -501,9 +501,9 @@ KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PE}-${PV}-${PR}-${MACHINE}-${DA
 KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 MODULE_IMAGE_BASE_NAME ?= "modules-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
 # Don't include the DATETIME variable in the sstate package signatures
-MODULE_TARBALL_BASE_NAME[vardepsexclude] = "DATETIME"
 MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz"
 MODULE_TARBALL_DEPLOY ?= "1"
Signature · 1 line
1.8.1.1
#3 lore raw
In reply to Martin Jansa
Quoted 33 lines · Martin Jansa
Quoted 32 lines · On Thu, Jan 10, 2013 at 11:52:38PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 67e77cd948c69798695d5d5f34163ef89339b35a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=67e77cd948c69798695d5d5f34163ef89339b35a
Author: Robert P. J. Day <[email protected]>
Date:   Wed Jan  9 12:01:23 2013 -0500

kernel.bbclass: Define MODULE_IMAGE_BASE_NAME for layer convenience.

Define the additional variable MODULE_IMAGE_BASE_NAME since some layers (like meta-ti) would find it handy for multi-kernel definitions in that they wouldn't have to define their own variable representing exactly the same thing.

Signed-off-by Robert P. J. Day <[email protected]>
Signed-off-by Saul Wold <[email protected]>

---

 meta/classes/kernel.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/classes/kernel.bbclass +0 -1
index aff8842..46ba55f 100644
@@ -500,7 +500,8 @@ KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PE}-${PV}-${PR}-${MACHINE}-${DA
 # Don't include the DATETIME variable in the sstate package signatures
 KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
-MODULE_TARBALL_BASE_NAME ?= "modules-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}.tgz"
Quoted 8 lines

meta/classes/kernel.bbclass KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PE}-${PV}-${PR}-${MACHINE}-${DA · line 507

Quoted 5 lines
meta/classes/kernel.bbclass +2 -0
+MODULE_IMAGE_BASE_NAME ?= "modules-${PE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
 # Don't include the DATETIME variable in the sstate package signatures
 MODULE_TARBALL_BASE_NAME[vardepsexclude] = "DATETIME"
 MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz"

This makes sstate checksums to depend on DATETIME variable.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=3299

yes, i see your point, my mistake in not noticing that when i
submitted that patch. would someone else like to handle this just to make sure it's fixed correctly?

rday

Signature · 7 lines
========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================