| Message ID | 20230626134336.1169017-1-a-limaye@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-arago,master/kirkstone] classes: tisdk-bundle: Move the licenses directory out of docs/ | expand |
This patch fails to build. Was it tested? On 6/26/2023 8:43 AM, Aniket Limaye wrote: > We plan on not having docs populated in the intaller, to allow for > easier doc updates on the release pages without having to update the > installer. > So move the licenses directory out of the docs directory > > Signed-off-by: Aniket Limaye <a-limaye@ti.com> > --- > meta-arago-distro/classes/tisdk-bundle.bbclass | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass > index b92ca0c0..4e613c6f 100644 > --- a/meta-arago-distro/classes/tisdk-bundle.bbclass > +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass > @@ -240,7 +240,7 @@ echo " > <h2>Credits</h2> > > <h2>Licenses</h2> > -<p>Licenses can be found in the \"docs/licenses\" directory of the SDK install directory</p> > +<p>Licenses can be found in the \"licenses\" directory of the SDK install directory</p> > > <h2><u><b>GCC RUNTIME LIBRARY EXCEPTION</b></u></h2> > <p>Version 3.1, 31 March 2009</p> > @@ -287,7 +287,7 @@ cat >> ${SW_MANIFEST_TEXT} << 'EOF' > > <Licenses> > > -Licenses can be found in the "docs/licenses" directory of the SDK install directory > +Licenses can be found in the "licenses/" directory of the SDK install directory > GCC RUNTIME LIBRARY EXCEPTION > > Version 3.1, 31 March 2009 > @@ -876,11 +876,7 @@ tisdk_image_build () { > # the licenses that were used in the build. > if [ -d ${DEPLOY_DIR}/licenses ] > then > - if [ ! -d ${IMAGE_ROOTFS}/docs ] > - then > - mkdir -p ${IMAGE_ROOTFS}/docs > - fi > - cp -rf ${DEPLOY_DIR}/licenses ${IMAGE_ROOTFS}/docs/ > + cp -rf ${DEPLOY_DIR}/licenses ${IMAGE_ROOTFS}/ > fi > > # Create the TI software manifest
Ooops my bad. Sent the wrong patch after squashing 2 commits... Sent rectified v2 patch at https://lists.yoctoproject.org/g/meta-arago/message/14691 -----Original Message----- From: Eatmon, Ryan <reatmon@ti.com> Sent: Tuesday, June 27, 2023 2:54 AM To: Limaye, Aniket <a-limaye@ti.com>; meta-arago@lists.yoctoproject.org Cc: Weaver, Lucas <l-weaver@ti.com>; Shilwant, Chirag <c-shilwant@ti.com> Subject: Re: [meta-arago][master/kirkstone][PATCH] classes: tisdk-bundle: Move the licenses directory out of docs/ This patch fails to build. Was it tested? On 6/26/2023 8:43 AM, Aniket Limaye wrote: > We plan on not having docs populated in the intaller, to allow for > easier doc updates on the release pages without having to update the > installer. > So move the licenses directory out of the docs directory > > Signed-off-by: Aniket Limaye <a-limaye@ti.com> > --- > meta-arago-distro/classes/tisdk-bundle.bbclass | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass > b/meta-arago-distro/classes/tisdk-bundle.bbclass > index b92ca0c0..4e613c6f 100644 > --- a/meta-arago-distro/classes/tisdk-bundle.bbclass > +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass > @@ -240,7 +240,7 @@ echo " > <h2>Credits</h2> > > <h2>Licenses</h2> > -<p>Licenses can be found in the \"docs/licenses\" directory of the > SDK install directory</p> > +<p>Licenses can be found in the \"licenses\" directory of the SDK > +install directory</p> > > <h2><u><b>GCC RUNTIME LIBRARY EXCEPTION</b></u></h2> > <p>Version 3.1, 31 March 2009</p> > @@ -287,7 +287,7 @@ cat >> ${SW_MANIFEST_TEXT} << 'EOF' > > <Licenses> > > -Licenses can be found in the "docs/licenses" directory of the SDK > install directory > +Licenses can be found in the "licenses/" directory of the SDK install > +directory > GCC RUNTIME LIBRARY EXCEPTION > > Version 3.1, 31 March 2009 > @@ -876,11 +876,7 @@ tisdk_image_build () { > # the licenses that were used in the build. > if [ -d ${DEPLOY_DIR}/licenses ] > then > - if [ ! -d ${IMAGE_ROOTFS}/docs ] > - then > - mkdir -p ${IMAGE_ROOTFS}/docs > - fi > - cp -rf ${DEPLOY_DIR}/licenses ${IMAGE_ROOTFS}/docs/ > + cp -rf ${DEPLOY_DIR}/licenses ${IMAGE_ROOTFS}/ > fi > > # Create the TI software manifest -- Ryan Eatmon reatmon@ti.com ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass index b92ca0c0..4e613c6f 100644 --- a/meta-arago-distro/classes/tisdk-bundle.bbclass +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass @@ -240,7 +240,7 @@ echo " <h2>Credits</h2> <h2>Licenses</h2> -<p>Licenses can be found in the \"docs/licenses\" directory of the SDK install directory</p> +<p>Licenses can be found in the \"licenses\" directory of the SDK install directory</p> <h2><u><b>GCC RUNTIME LIBRARY EXCEPTION</b></u></h2> <p>Version 3.1, 31 March 2009</p> @@ -287,7 +287,7 @@ cat >> ${SW_MANIFEST_TEXT} << 'EOF' <Licenses> -Licenses can be found in the "docs/licenses" directory of the SDK install directory +Licenses can be found in the "licenses/" directory of the SDK install directory GCC RUNTIME LIBRARY EXCEPTION Version 3.1, 31 March 2009 @@ -876,11 +876,7 @@ tisdk_image_build () { # the licenses that were used in the build. if [ -d ${DEPLOY_DIR}/licenses ] then - if [ ! -d ${IMAGE_ROOTFS}/docs ] - then - mkdir -p ${IMAGE_ROOTFS}/docs - fi - cp -rf ${DEPLOY_DIR}/licenses ${IMAGE_ROOTFS}/docs/ + cp -rf ${DEPLOY_DIR}/licenses ${IMAGE_ROOTFS}/ fi # Create the TI software manifest
We plan on not having docs populated in the intaller, to allow for easier doc updates on the release pages without having to update the installer. So move the licenses directory out of the docs directory Signed-off-by: Aniket Limaye <a-limaye@ti.com> --- meta-arago-distro/classes/tisdk-bundle.bbclass | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)