Patchwork [PATCHv2,1/2,for-danny] linux-dtb: Add simple DTB symlinks for devicetree

login
register
mail settings
Submitter chase maupin
Date April 4, 2013, 1:25 p.m.
Message ID <1365081955-19381-1-git-send-email-Chase.Maupin@ti.com>
Download mbox | patch
Permalink /patch/47419/
State New
Headers show

Comments

chase maupin - April 4, 2013, 1:25 p.m.
* This is similar to the symlinks provided for the kernel image
  in the /boot directory of a file system.  The goal is to have
  simply named symlinks in /boot that mirror the device tree
  name in the kernel sources.  This is so that programs like
  U-Boot can easily find the default device tree binary in the
  /boot directory and use that when booting the kernel.
* Use update-alternatives to handle proper creation and removal
  of the symlinks.
* This patch has already been accepted into the master branch
  http://cgit.openembedded.org/openembedded-core/commit/?id=750a9554e1b85d9bd23d18e0630723c3c193c604

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
* Updated in version 2
    * Changed the variable names to use variables that match the
      do_install and do_deploy more closely for consistency.  i.e.
      using DTB_SYMLINK_NAME instead of DTB_NAME.
    * The above changes were based on input from:
        * Darren Hart <dvhart@linux.intel.com>
        * Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-dtb.inc |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
chase maupin - April 8, 2013, 11:35 a.m.
Ping on this set


> -----Original Message-----
> From: Maupin, Chase
> Sent: Thursday, April 04, 2013 8:26 AM
> To: openembedded-core@lists.openembedded.org
> Cc: Maupin, Chase
> Subject: [PATCHv2 1/2][for-danny] linux-dtb: Add simple DTB
> symlinks for devicetree
> 
> * This is similar to the symlinks provided for the kernel image
>   in the /boot directory of a file system.  The goal is to have
>   simply named symlinks in /boot that mirror the device tree
>   name in the kernel sources.  This is so that programs like
>   U-Boot can easily find the default device tree binary in the
>   /boot directory and use that when booting the kernel.
> * Use update-alternatives to handle proper creation and removal
>   of the symlinks.
> * This patch has already been accepted into the master branch
>   http://cgit.openembedded.org/openembedded-
> core/commit/?id=750a9554e1b85d9bd23d18e0630723c3c193c604
> 
> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> ---
> * Updated in version 2
>     * Changed the variable names to use variables that match the
>       do_install and do_deploy more closely for consistency.
> i.e.
>       using DTB_SYMLINK_NAME instead of DTB_NAME.
>     * The above changes were based on input from:
>         * Darren Hart <dvhart@linux.intel.com>
>         * Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta/recipes-kernel/linux/linux-dtb.inc |   20
> ++++++++++++++++++++
>  1 files changed, 20 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux/linux-dtb.inc
> b/meta/recipes-kernel/linux/linux-dtb.inc
> index d39f49d..36852b5 100644
> --- a/meta/recipes-kernel/linux/linux-dtb.inc
> +++ b/meta/recipes-kernel/linux/linux-dtb.inc
> @@ -45,3 +45,23 @@ do_deploy_append() {
>          done
>      fi
>  }
> +
> +pkg_postinst_kernel-devicetree () {
> +    cd /${KERNEL_IMAGEDEST}
> +    for DTS_FILE in ${KERNEL_DEVICETREE}
> +    do
> +        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print
> $1}'`
> +        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} |
> sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> +        update-alternatives --install
> /${KERNEL_IMAGEDEST}/${DTS_BASE_NAME}.dtb ${DTS_BASE_NAME}.dtb
> devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> +    done
> +}
> +
> +pkg_postrm_kernel-devicetree () {
> +    cd /${KERNEL_IMAGEDEST}
> +    for DTS_FILE in ${KERNEL_DEVICETREE}
> +    do
> +        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print
> $1}'`
> +        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} |
> sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> +        update-alternatives --remove ${DTS_BASE_NAME}.dtb
> devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> +    done
> +}
> --
> 1.7.0.4
chase maupin - April 10, 2013, 3:15 p.m.
Probably would have helped if I submitted it to the right list.  Please ignore 

> From: Maupin, Chase
> Sent: Monday, April 08, 2013 6:35 AM
> To: Maupin, Chase; openembedded-core@lists.openembedded.org
> Subject: RE: [PATCHv2 1/2][for-danny] linux-dtb: Add simple DTB
> symlinks for devicetree
> 
> Ping on this set
> 
> 
> > -----Original Message-----
> > From: Maupin, Chase
> > Sent: Thursday, April 04, 2013 8:26 AM
> > To: openembedded-core@lists.openembedded.org
> > Cc: Maupin, Chase
> > Subject: [PATCHv2 1/2][for-danny] linux-dtb: Add simple DTB
> > symlinks for devicetree
> >
> > * This is similar to the symlinks provided for the kernel image
> >   in the /boot directory of a file system.  The goal is to have
> >   simply named symlinks in /boot that mirror the device tree
> >   name in the kernel sources.  This is so that programs like
> >   U-Boot can easily find the default device tree binary in the
> >   /boot directory and use that when booting the kernel.
> > * Use update-alternatives to handle proper creation and removal
> >   of the symlinks.
> > * This patch has already been accepted into the master branch
> >   http://cgit.openembedded.org/openembedded-
> > core/commit/?id=750a9554e1b85d9bd23d18e0630723c3c193c604
> >
> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > ---
> > * Updated in version 2
> >     * Changed the variable names to use variables that match
> the
> >       do_install and do_deploy more closely for consistency.
> > i.e.
> >       using DTB_SYMLINK_NAME instead of DTB_NAME.
> >     * The above changes were based on input from:
> >         * Darren Hart <dvhart@linux.intel.com>
> >         * Bruce Ashfield <bruce.ashfield@windriver.com>
> > ---
> >  meta/recipes-kernel/linux/linux-dtb.inc |   20
> > ++++++++++++++++++++
> >  1 files changed, 20 insertions(+), 0 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/linux/linux-dtb.inc
> > b/meta/recipes-kernel/linux/linux-dtb.inc
> > index d39f49d..36852b5 100644
> > --- a/meta/recipes-kernel/linux/linux-dtb.inc
> > +++ b/meta/recipes-kernel/linux/linux-dtb.inc
> > @@ -45,3 +45,23 @@ do_deploy_append() {
> >          done
> >      fi
> >  }
> > +
> > +pkg_postinst_kernel-devicetree () {
> > +    cd /${KERNEL_IMAGEDEST}
> > +    for DTS_FILE in ${KERNEL_DEVICETREE}
> > +    do
> > +        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "."
> '{print
> > $1}'`
> > +        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} |
> > sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> > +        update-alternatives --install
> > /${KERNEL_IMAGEDEST}/${DTS_BASE_NAME}.dtb ${DTS_BASE_NAME}.dtb
> > devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> > +    done
> > +}
> > +
> > +pkg_postrm_kernel-devicetree () {
> > +    cd /${KERNEL_IMAGEDEST}
> > +    for DTS_FILE in ${KERNEL_DEVICETREE}
> > +    do
> > +        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "."
> '{print
> > $1}'`
> > +        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} |
> > sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> > +        update-alternatives --remove ${DTS_BASE_NAME}.dtb
> > devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> > +    done
> > +}
> > --
> > 1.7.0.4
chase maupin - April 10, 2013, 3:16 p.m.
> -----Original Message-----
> From: Maupin, Chase
> Sent: Wednesday, April 10, 2013 10:15 AM
> To: Maupin, Chase; openembedded-core@lists.openembedded.org
> Subject: RE: [PATCHv2 1/2][for-danny] linux-dtb: Add simple DTB
> symlinks for devicetree
> 
> Probably would have helped if I submitted it to the right list.
> Please ignore

OK, now I know I'm not thinking straight, this is the right list.

In that case ping on this.

> 
> > From: Maupin, Chase
> > Sent: Monday, April 08, 2013 6:35 AM
> > To: Maupin, Chase; openembedded-core@lists.openembedded.org
> > Subject: RE: [PATCHv2 1/2][for-danny] linux-dtb: Add simple DTB
> > symlinks for devicetree
> >
> > Ping on this set
> >
> >
> > > -----Original Message-----
> > > From: Maupin, Chase
> > > Sent: Thursday, April 04, 2013 8:26 AM
> > > To: openembedded-core@lists.openembedded.org
> > > Cc: Maupin, Chase
> > > Subject: [PATCHv2 1/2][for-danny] linux-dtb: Add simple DTB
> > > symlinks for devicetree
> > >
> > > * This is similar to the symlinks provided for the kernel
> image
> > >   in the /boot directory of a file system.  The goal is to
> have
> > >   simply named symlinks in /boot that mirror the device tree
> > >   name in the kernel sources.  This is so that programs like
> > >   U-Boot can easily find the default device tree binary in
> the
> > >   /boot directory and use that when booting the kernel.
> > > * Use update-alternatives to handle proper creation and
> removal
> > >   of the symlinks.
> > > * This patch has already been accepted into the master branch
> > >   http://cgit.openembedded.org/openembedded-
> > > core/commit/?id=750a9554e1b85d9bd23d18e0630723c3c193c604
> > >
> > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > > ---
> > > * Updated in version 2
> > >     * Changed the variable names to use variables that match
> > the
> > >       do_install and do_deploy more closely for consistency.
> > > i.e.
> > >       using DTB_SYMLINK_NAME instead of DTB_NAME.
> > >     * The above changes were based on input from:
> > >         * Darren Hart <dvhart@linux.intel.com>
> > >         * Bruce Ashfield <bruce.ashfield@windriver.com>
> > > ---
> > >  meta/recipes-kernel/linux/linux-dtb.inc |   20
> > > ++++++++++++++++++++
> > >  1 files changed, 20 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/meta/recipes-kernel/linux/linux-dtb.inc
> > > b/meta/recipes-kernel/linux/linux-dtb.inc
> > > index d39f49d..36852b5 100644
> > > --- a/meta/recipes-kernel/linux/linux-dtb.inc
> > > +++ b/meta/recipes-kernel/linux/linux-dtb.inc
> > > @@ -45,3 +45,23 @@ do_deploy_append() {
> > >          done
> > >      fi
> > >  }
> > > +
> > > +pkg_postinst_kernel-devicetree () {
> > > +    cd /${KERNEL_IMAGEDEST}
> > > +    for DTS_FILE in ${KERNEL_DEVICETREE}
> > > +    do
> > > +        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "."
> > '{print
> > > $1}'`
> > > +        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME}
> |
> > > sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> > > +        update-alternatives --install
> > > /${KERNEL_IMAGEDEST}/${DTS_BASE_NAME}.dtb
> ${DTS_BASE_NAME}.dtb
> > > devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> > > +    done
> > > +}
> > > +
> > > +pkg_postrm_kernel-devicetree () {
> > > +    cd /${KERNEL_IMAGEDEST}
> > > +    for DTS_FILE in ${KERNEL_DEVICETREE}
> > > +    do
> > > +        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "."
> > '{print
> > > $1}'`
> > > +        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME}
> |
> > > sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
> > > +        update-alternatives --remove ${DTS_BASE_NAME}.dtb
> > > devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> > > +    done
> > > +}
> > > --
> > > 1.7.0.4
Ross Burton - April 10, 2013, 3:26 p.m.
On 10 April 2013 16:16, Maupin, Chase <chase.maupin@ti.com> wrote:
> In that case ping on this.

It's in my pending list, but the 1.4 release freeze has been taking my
time.  I'll merge it tomorrow.

Ross
chase maupin - April 10, 2013, 8:52 p.m.
> -----Original Message-----
> From: Burton, Ross [mailto:ross.burton@intel.com]
> Sent: Wednesday, April 10, 2013 10:27 AM
> To: Maupin, Chase
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCHv2 1/2][for-danny] linux-dtb: Add
> simple DTB symlinks for devicetree
> 
> On 10 April 2013 16:16, Maupin, Chase <chase.maupin@ti.com>
> wrote:
> > In that case ping on this.
> 
> It's in my pending list, but the 1.4 release freeze has been
> taking my
> time.  I'll merge it tomorrow.

Thanks.

> 
> Ross
chase maupin - April 12, 2013, 9:04 p.m.
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On
> Behalf Of Maupin, Chase
> Sent: Wednesday, April 10, 2013 3:53 PM
> To: Burton, Ross
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCHv2 1/2][for-danny] linux-dtb: Add
> simple DTB symlinks for devicetree
> 
> > -----Original Message-----
> > From: Burton, Ross [mailto:ross.burton@intel.com]
> > Sent: Wednesday, April 10, 2013 10:27 AM
> > To: Maupin, Chase
> > Cc: openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCHv2 1/2][for-danny] linux-dtb: Add
> > simple DTB symlinks for devicetree
> >
> > On 10 April 2013 16:16, Maupin, Chase <chase.maupin@ti.com>
> > wrote:
> > > In that case ping on this.
> >
> > It's in my pending list, but the 1.4 release freeze has been
> > taking my
> > time.  I'll merge it tomorrow.
> 

Ross.  Ping on this.  I know your busy, just wanted to keep this on the list :)

> Thanks.
> 
> >
> > Ross
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-
> core

Patch

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index d39f49d..36852b5 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -45,3 +45,23 @@  do_deploy_append() {
         done
     fi
 }
+
+pkg_postinst_kernel-devicetree () {
+    cd /${KERNEL_IMAGEDEST}
+    for DTS_FILE in ${KERNEL_DEVICETREE}
+    do
+        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
+        update-alternatives --install /${KERNEL_IMAGEDEST}/${DTS_BASE_NAME}.dtb ${DTS_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
+    done
+}
+
+pkg_postrm_kernel-devicetree () {
+    cd /${KERNEL_IMAGEDEST}
+    for DTS_FILE in ${KERNEL_DEVICETREE}
+    do
+        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
+        update-alternatives --remove ${DTS_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
+    done
+}