> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Friday, October 04, 2013 3:49 PM
> To: Cooper Jr., Franklin
> Cc: Maupin, Chase; [email protected]
> Subject: Re: [meta-arago] [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE
> variable
>
> On Fri, Oct 04, 2013 at 03:01:27PM +0000, Cooper Jr., Franklin wrote:
> > Denys,
> >
> > Are you ok with this patch?
>
> I'm Ok with this change in general, but can you extend it to also handle
> zImage
> in addition to uImage?
[Franklin] I would prefer to push this patch as is but I do have a follow up
patch that will make your above requested change and some others to provide
better support for zImage. Would that be ok?
>
> On a side note - we should probably move some of that "magic" code for
> renaming and moving files around from autobuilder scripts back to the
> corresponding recipes...
>
> --
> Denys
>
>
> > > -----Original Message-----
> > > From: Maupin, Chase
> > > Sent: Wednesday, October 02, 2013 8:07 AM
> > > To: Cooper Jr., Franklin; [email protected]
> > > Subject: RE: [meta-arago] [PATCH 1/3] Generalize
> PACKAGE_BOOT_UIMAGE
> > > variable
> > >
> > > Acked-by: Chase Maupin <[email protected]>
> > >
> > > But this isn't for meta-arago so the subject is misleading.
> > >
> > >
> > > >-----Original Message-----
> > > >From: [email protected] [mailto:meta-arago-
> > > >[email protected]] On Behalf Of Cooper Jr., Franklin
> > > >Sent: Tuesday, October 01, 2013 1:04 PM
> > > >To: [email protected]
> > > >Cc: Cooper Jr., Franklin
> > > >Subject: [meta-arago] [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE
> > > >variable
> > > >
> > > >* The device tree files along with the uImage sometimes aren't used in
> > > >the boot
> > > > partition.
> > > >* To reflect this change the variable PACKAGE_BOOT_UIMAGE to
> > > > PACKAGE_BOOT_KERNEL_FILES.
> > > >* Also when this variable is set to false remove the kernel and dtb
> > > >files from
> > > > the boot partition instead of avoiding renaming it.
> > > >
> > > >Signed-off-by: Franklin S. Cooper Jr <[email protected]>
> > > >---
> > > > configs/amsdk-config-05.06.00.00.txt | 10 +++++-----
> > > > configs/amsdk-config-05.07.00.00.txt | 10 +++++-----
> > > > configs/amsdk-config-06.00.00.00.txt | 10 +++++-----
> > > > configs/amsdk-config-07.00.00.00.txt | 10 +++++-----
> > > > configs/arago-core-amsdk-2013.04.01.txt | 10 +++++-----
> > > > configs/arago-core-tisdk-2013.04.00.txt | 10 +++++-----
> > > > configs/arago-core-tisdk-2013.04.01.txt | 10 +++++-----
> > > > configs/arago-core-tisdk-2013.04.02.txt | 10 +++++-----
> > > > configs/arago-core-tisdk-dylan-puget.txt | 10 +++++-----
> > > > configs/arago-core-tisdk-puget.txt | 10 +++++-----
> > > > lib/oesdk/package-sdks | 12 ++++++++----
> > > > 11 files changed, 58 insertions(+), 54 deletions(-)
> > > >
> > > >diff --git a/configs/amsdk-config-05.06.00.00.txt b/configs/amsdk-
> > > >config-05.06.00.00.txt index 706a24b..f2d3d1f 100644
> > > >--- a/configs/amsdk-config-05.06.00.00.txt
> > > >+++ b/configs/amsdk-config-05.06.00.00.txt
> > > >@@ -216,11 +216,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="true"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="true"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/amsdk-config-05.07.00.00.txt b/configs/amsdk-
> > > >config-05.07.00.00.txt index 3b0ba8e..8a7107a 100644
> > > >--- a/configs/amsdk-config-05.07.00.00.txt
> > > >+++ b/configs/amsdk-config-05.07.00.00.txt
> > > >@@ -231,11 +231,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="true"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="true"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/amsdk-config-06.00.00.00.txt b/configs/amsdk-
> > > >config-06.00.00.00.txt index edf8ba7..ea84183 100644
> > > >--- a/configs/amsdk-config-06.00.00.00.txt
> > > >+++ b/configs/amsdk-config-06.00.00.00.txt
> > > >@@ -237,11 +237,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="true"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="true"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/amsdk-config-07.00.00.00.txt b/configs/amsdk-
> > > >config-07.00.00.00.txt index 1f4c86d..a011f83 100644
> > > >--- a/configs/amsdk-config-07.00.00.00.txt
> > > >+++ b/configs/amsdk-config-07.00.00.00.txt
> > > >@@ -237,11 +237,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="true"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="true"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/arago-core-amsdk-2013.04.01.txt
> > > >b/configs/arago-core-amsdk-2013.04.01.txt
> > > >index 4c7e1bd..420452b 100644
> > > >--- a/configs/arago-core-amsdk-2013.04.01.txt
> > > >+++ b/configs/arago-core-amsdk-2013.04.01.txt
> > > >@@ -239,11 +239,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="false"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="false"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/arago-core-tisdk-2013.04.00.txt
> > > >b/configs/arago-core-tisdk-2013.04.00.txt
> > > >index ef228ca..a811dbd 100644
> > > >--- a/configs/arago-core-tisdk-2013.04.00.txt
> > > >+++ b/configs/arago-core-tisdk-2013.04.00.txt
> > > >@@ -239,11 +239,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="true"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="true"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/arago-core-tisdk-2013.04.01.txt
> > > >b/configs/arago-core-tisdk-2013.04.01.txt
> > > >index ffeb1d2..35c9df3 100644
> > > >--- a/configs/arago-core-tisdk-2013.04.01.txt
> > > >+++ b/configs/arago-core-tisdk-2013.04.01.txt
> > > >@@ -239,11 +239,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="false"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="false"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/arago-core-tisdk-2013.04.02.txt
> > > >b/configs/arago-core-tisdk-2013.04.02.txt
> > > >index 55ba7d8..f2b1db8 100644
> > > >--- a/configs/arago-core-tisdk-2013.04.02.txt
> > > >+++ b/configs/arago-core-tisdk-2013.04.02.txt
> > > >@@ -239,11 +239,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="false"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="false"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/arago-core-tisdk-dylan-puget.txt
> > > >b/configs/arago-core-tisdk-dylan-puget.txt
> > > >index 5398e87..a2639f7 100644
> > > >--- a/configs/arago-core-tisdk-dylan-puget.txt
> > > >+++ b/configs/arago-core-tisdk-dylan-puget.txt
> > > >@@ -238,11 +238,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="false"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="false"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/configs/arago-core-tisdk-puget.txt b/configs/arago-
> > > >core-tisdk-puget.txt index 8e1fd98..cfda50f 100644
> > > >--- a/configs/arago-core-tisdk-puget.txt
> > > >+++ b/configs/arago-core-tisdk-puget.txt
> > > >@@ -238,11 +238,11 @@
> > > >INSTALL_BUILDER_PROJECT="$SCRIPTS_ROOT/installer-files/tisdk.xml"
> > > > # the symlink.
> > > > SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
> > > >
> > > >-# This variable determines whether the uImage should be placed in the
> > > >boot -# partition tarball or not. For newer kernel and u-boot
> > > >combinations the -# uImage is kept in the rootfs partition and placing
> > > >it in the boot partition -# will cause confusion.
> > > >-PACKAGE_BOOT_UIMAGE="false"
> > > >+# This variable determines whether the uImage and dtb files
> > > >should be placed in
> > > >+# the boot partition tarball or not. For newer kernel and u-boot
> > > >combinations
> > > >+# the uImage and dtb files are kept in the rootfs partition and
> > > >placing it in
> > > >+# the boot partition will cause confusion.
> > > >+PACKAGE_BOOT_KERNEL_FILES="false"
> > > >
> > > > # This variable points to the directory where the webgen tool has been
> > > ># Installed.
> > > >diff --git a/lib/oesdk/package-sdks b/lib/oesdk/package-sdks index
> > > >148dadc..49f1fe7 100644
> > > >--- a/lib/oesdk/package-sdks
> > > >+++ b/lib/oesdk/package-sdks
> > > >@@ -42,15 +42,19 @@ create_sd_card_content() {
> > > > mv u-boot-$m.bin u-boot.bin
> > > > fi
> > > >
> > > >- # For some devices the uImage is read from the /boot
> > > >directory of the
> > > >- # rootfs. In this case do not package the uImage into the
> > > >boot partition
> > > >- # as it will cause confusion.
> > > >- if [ "$PACKAGE_BOOT_UIMAGE" = "true" ]
> > > >+ # For some devices the uImage and dtb files are read from
> > > >the /boot
> > > >+ # directory of the rootfs. In this case do not package the
> > > >uImage
> > > >+ # and device tree files into the boot partition as it will
> > > >cause
> > > >+ # confusion.
> > > >+ if [ "$PACKAGE_BOOT_KERNEL_FILES" = "true" ]
> > > > then
> > > > if [ -e uImage-$m.bin ]
> > > > then
> > > > mv uImage-$m.bin uImage
> > > > fi
> > > >+ else
> > > >+ rm -f uImage*
> > > >+ rm -f *.dtb
> > > > fi
> > > >
> > > > # Copy the MLO if it exists for the device
> > > >--
> > > >1.7.0.4
> > > >
> > > >_______________________________________________
> > > >meta-arago mailing list
> > > >[email protected]
> > > >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > [email protected]
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
