| Submitter | Ting Liu |
|---|---|
| Date | July 12, 2012, 9:17 a.m. |
| Message ID | <1342084646-23822-2-git-send-email-b28495@freescale.com> |
| Download | mbox | patch |
| Permalink | /patch/31793/ |
| State | New |
| Headers | show |
Comments
On Thu, 2012-07-12 at 04:17 -0500, b28495@freescale.com wrote: > From: Ting Liu <b28495@freescale.com> > > Device tree binary is named as "devicetree-*" in ${D}, > "${KERNEL_IMAGETYPE}-*" in ${DEPLOYDIR}. Keep them the same. > > Signed-off-by: Ting Liu <b28495@freescale.com> > --- > meta/recipes-kernel/linux/linux-dtb.inc | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc > index 8aa1458..3dd4d41 100644 > --- a/meta/recipes-kernel/linux/linux-dtb.inc > +++ b/meta/recipes-kernel/linux/linux-dtb.inc > @@ -1,5 +1,5 @@ > # Support for device tree generation > -FILES_kernel-devicetree = "/boot/devicetree*" > +FILES_kernel-devicetree = "/boot/*.dtb" > KERNEL_DEVICETREE_FLAGS = "-R 8 -p 0x3000" > > python __anonymous () { > @@ -10,7 +10,7 @@ python __anonymous () { > depends = d.getVar("DEPENDS", True) > d.setVar("DEPENDS", "%s dtc-native" % depends) > packages = d.getVar("PACKAGES", True) > - d.setVar("PACKAGES", "%s kernel-devicetree" % packages) > + d.setVar("PACKAGES", "kernel-devicetree %s" % packages) > } Why did you need to change PACKAGES? There is no mention of this in the patch description. Cheers, Richard
-----Original Message----- From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Richard Purdie Sent: Thursday, July 12, 2012 7:04 PM To: Patches and discussions about the oe-core layer Cc: McClintock Matthew-B29882 Subject: Re: [OE-core] [PATCH] linux-dtb.inc: update dtb name to keep it same in D and DEPLOYDIR On Thu, 2012-07-12 at 04:17 -0500, b28495@freescale.com wrote: > From: Ting Liu <b28495@freescale.com> > > Device tree binary is named as "devicetree-*" in ${D}, > "${KERNEL_IMAGETYPE}-*" in ${DEPLOYDIR}. Keep them the same. > > Signed-off-by: Ting Liu <b28495@freescale.com> > --- > meta/recipes-kernel/linux/linux-dtb.inc | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-dtb.inc > b/meta/recipes-kernel/linux/linux-dtb.inc > index 8aa1458..3dd4d41 100644 > --- a/meta/recipes-kernel/linux/linux-dtb.inc > +++ b/meta/recipes-kernel/linux/linux-dtb.inc > @@ -1,5 +1,5 @@ > # Support for device tree generation > -FILES_kernel-devicetree = "/boot/devicetree*" > +FILES_kernel-devicetree = "/boot/*.dtb" > KERNEL_DEVICETREE_FLAGS = "-R 8 -p 0x3000" > > python __anonymous () { > @@ -10,7 +10,7 @@ python __anonymous () { > depends = d.getVar("DEPENDS", True) > d.setVar("DEPENDS", "%s dtc-native" % depends) > packages = d.getVar("PACKAGES", True) > - d.setVar("PACKAGES", "%s kernel-devicetree" % packages) > + d.setVar("PACKAGES", "kernel-devicetree %s" % packages) > } Why did you need to change PACKAGES? There is no mention of this in the patch description. Cheers, Richard [Liu Ting-B28495] Sorry for missing that. Because device tree binary is renamed with prefix "${KERNEL_IMAGETYPE}, it will be packaged to kernel-image if not modifying the variable PACKAGES.
On Sun, Jul 15, 2012 at 6:07 AM, Liu Ting-B28495 <B28495@freescale.com> wrote: > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Richard Purdie > Sent: Thursday, July 12, 2012 7:04 PM > To: Patches and discussions about the oe-core layer > Cc: McClintock Matthew-B29882 > Subject: Re: [OE-core] [PATCH] linux-dtb.inc: update dtb name to keep it same in D and DEPLOYDIR > > On Thu, 2012-07-12 at 04:17 -0500, b28495@freescale.com wrote: >> From: Ting Liu <b28495@freescale.com> >> >> Device tree binary is named as "devicetree-*" in ${D}, >> "${KERNEL_IMAGETYPE}-*" in ${DEPLOYDIR}. Keep them the same. >> >> Signed-off-by: Ting Liu <b28495@freescale.com> >> --- >> meta/recipes-kernel/linux/linux-dtb.inc | 9 ++++++--- >> 1 files changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-kernel/linux/linux-dtb.inc >> b/meta/recipes-kernel/linux/linux-dtb.inc >> index 8aa1458..3dd4d41 100644 >> --- a/meta/recipes-kernel/linux/linux-dtb.inc >> +++ b/meta/recipes-kernel/linux/linux-dtb.inc >> @@ -1,5 +1,5 @@ >> # Support for device tree generation >> -FILES_kernel-devicetree = "/boot/devicetree*" >> +FILES_kernel-devicetree = "/boot/*.dtb" >> KERNEL_DEVICETREE_FLAGS = "-R 8 -p 0x3000" >> >> python __anonymous () { >> @@ -10,7 +10,7 @@ python __anonymous () { >> depends = d.getVar("DEPENDS", True) >> d.setVar("DEPENDS", "%s dtc-native" % depends) >> packages = d.getVar("PACKAGES", True) >> - d.setVar("PACKAGES", "%s kernel-devicetree" % packages) >> + d.setVar("PACKAGES", "kernel-devicetree %s" % packages) >> } > > Why did you need to change PACKAGES? There is no mention of this in the patch description. > > Cheers, > > Richard > > [Liu Ting-B28495] Sorry for missing that. Because device tree binary is renamed with prefix "${KERNEL_IMAGETYPE}, it will be packaged to kernel-image if not modifying the variable PACKAGES. Ok, so you reordered the packages so your device tree package get's to grab the file first. Did you consider making the other package less greedy and excluding these dtb files? Why is any of this in an anonymous python function? Should it just be DEPENDS_append PACKAGES_append ? -M
Patch
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc index 8aa1458..3dd4d41 100644 --- a/meta/recipes-kernel/linux/linux-dtb.inc +++ b/meta/recipes-kernel/linux/linux-dtb.inc @@ -1,5 +1,5 @@ # Support for device tree generation -FILES_kernel-devicetree = "/boot/devicetree*" +FILES_kernel-devicetree = "/boot/*.dtb" KERNEL_DEVICETREE_FLAGS = "-R 8 -p 0x3000" python __anonymous () { @@ -10,7 +10,7 @@ python __anonymous () { depends = d.getVar("DEPENDS", True) d.setVar("DEPENDS", "%s dtc-native" % depends) packages = d.getVar("PACKAGES", True) - d.setVar("PACKAGES", "%s kernel-devicetree" % packages) + d.setVar("PACKAGES", "kernel-devicetree %s" % packages) } do_install_append() { @@ -24,7 +24,10 @@ do_install_append() { DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE} - install -m 0644 ${DTS_BASE_NAME} ${D}/boot/devicetree-${DTB_SYMLINK_NAME}.dtb + install -m 0644 ${DTS_BASE_NAME} ${D}/boot/${DTB_NAME}.dtb + cd ${D}/boot/ + ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb + cd - done fi }