* [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable
@ 2013-10-01 18:04 Franklin S. Cooper Jr
2013-10-01 18:04 ` [PATCH 2/3] Remove unnecessary binary from boot partition Franklin S. Cooper Jr
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Franklin S. Cooper Jr @ 2013-10-01 18:04 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
* 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 <fcooper@ti.com>
---
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
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3] Remove unnecessary binary from boot partition
2013-10-01 18:04 [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Franklin S. Cooper Jr
@ 2013-10-01 18:04 ` Franklin S. Cooper Jr
2013-10-02 13:11 ` Maupin, Chase
2013-10-01 18:04 ` [PATCH 3/3] Don't package kernel files in boot partition for AMSDK 7.0 Franklin S. Cooper Jr
2013-10-02 13:07 ` [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Maupin, Chase
2 siblings, 1 reply; 14+ messages in thread
From: Franklin S. Cooper Jr @ 2013-10-01 18:04 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
lib/oesdk/package-sdks | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/lib/oesdk/package-sdks b/lib/oesdk/package-sdks
index 49f1fe7..8f4e5e2 100644
--- a/lib/oesdk/package-sdks
+++ b/lib/oesdk/package-sdks
@@ -42,6 +42,12 @@ create_sd_card_content() {
mv u-boot-$m.bin u-boot.bin
fi
+ # Remove this binary since it wouldn't be used in the boot partition
+ if [ -e u-boot-spl.bin-$m ]
+ then
+ rm u-boot-spl.bin-$m
+ fi
+
# 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
--
1.7.0.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/3] Don't package kernel files in boot partition for AMSDK 7.0
2013-10-01 18:04 [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Franklin S. Cooper Jr
2013-10-01 18:04 ` [PATCH 2/3] Remove unnecessary binary from boot partition Franklin S. Cooper Jr
@ 2013-10-01 18:04 ` Franklin S. Cooper Jr
2013-10-02 13:11 ` Maupin, Chase
2013-10-02 13:07 ` [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Maupin, Chase
2 siblings, 1 reply; 14+ messages in thread
From: Franklin S. Cooper Jr @ 2013-10-01 18:04 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
configs/amsdk-config-07.00.00.00.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configs/amsdk-config-07.00.00.00.txt b/configs/amsdk-config-07.00.00.00.txt
index a011f83..bf409d7 100644
--- a/configs/amsdk-config-07.00.00.00.txt
+++ b/configs/amsdk-config-07.00.00.00.txt
@@ -241,7 +241,7 @@ SD_CARD_CONTENT="/home/jenkins/extra-files/sd_content"
# 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"
+PACKAGE_BOOT_KERNEL_FILES="false"
# This variable points to the directory where the webgen tool has been
# Installed.
--
1.7.0.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable
2013-10-01 18:04 [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Franklin S. Cooper Jr
2013-10-01 18:04 ` [PATCH 2/3] Remove unnecessary binary from boot partition Franklin S. Cooper Jr
2013-10-01 18:04 ` [PATCH 3/3] Don't package kernel files in boot partition for AMSDK 7.0 Franklin S. Cooper Jr
@ 2013-10-02 13:07 ` Maupin, Chase
2013-10-02 13:27 ` Cooper Jr., Franklin
2013-10-04 15:01 ` Cooper Jr., Franklin
2 siblings, 2 replies; 14+ messages in thread
From: Maupin, Chase @ 2013-10-02 13:07 UTC (permalink / raw)
To: Cooper Jr., Franklin, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
But this isn't for meta-arago so the subject is misleading.
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
>Sent: Tuesday, October 01, 2013 1:04 PM
>To: meta-arago@arago-project.org
>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 <fcooper@ti.com>
>---
> 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
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] Remove unnecessary binary from boot partition
2013-10-01 18:04 ` [PATCH 2/3] Remove unnecessary binary from boot partition Franklin S. Cooper Jr
@ 2013-10-02 13:11 ` Maupin, Chase
2013-10-02 13:59 ` Denys Dmytriyenko
0 siblings, 1 reply; 14+ messages in thread
From: Maupin, Chase @ 2013-10-02 13:11 UTC (permalink / raw)
To: Cooper Jr., Franklin, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
>Sent: Tuesday, October 01, 2013 1:04 PM
>To: meta-arago@arago-project.org
>Cc: Cooper Jr., Franklin
>Subject: [meta-arago] [PATCH 2/3] Remove unnecessary binary from
>boot partition
>
>Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
>---
> lib/oesdk/package-sdks | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
>diff --git a/lib/oesdk/package-sdks b/lib/oesdk/package-sdks
>index 49f1fe7..8f4e5e2 100644
>--- a/lib/oesdk/package-sdks
>+++ b/lib/oesdk/package-sdks
>@@ -42,6 +42,12 @@ create_sd_card_content() {
> mv u-boot-$m.bin u-boot.bin
> fi
>
>+ # Remove this binary since it wouldn't be used in the boot
>partition
>+ if [ -e u-boot-spl.bin-$m ]
>+ then
>+ rm u-boot-spl.bin-$m
>+ fi
>+
> # 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
>--
>1.7.0.4
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] Don't package kernel files in boot partition for AMSDK 7.0
2013-10-01 18:04 ` [PATCH 3/3] Don't package kernel files in boot partition for AMSDK 7.0 Franklin S. Cooper Jr
@ 2013-10-02 13:11 ` Maupin, Chase
2013-10-02 14:00 ` Denys Dmytriyenko
0 siblings, 1 reply; 14+ messages in thread
From: Maupin, Chase @ 2013-10-02 13:11 UTC (permalink / raw)
To: Cooper Jr., Franklin, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
>Sent: Tuesday, October 01, 2013 1:04 PM
>To: meta-arago@arago-project.org
>Cc: Cooper Jr., Franklin
>Subject: [meta-arago] [PATCH 3/3] Don't package kernel files in
>boot partition for AMSDK 7.0
>
>Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
>---
> configs/amsdk-config-07.00.00.00.txt | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/configs/amsdk-config-07.00.00.00.txt b/configs/amsdk-
>config-07.00.00.00.txt
>index a011f83..bf409d7 100644
>--- a/configs/amsdk-config-07.00.00.00.txt
>+++ b/configs/amsdk-config-07.00.00.00.txt
>@@ -241,7 +241,7 @@ SD_CARD_CONTENT="/home/jenkins/extra-
>files/sd_content"
> # 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"
>+PACKAGE_BOOT_KERNEL_FILES="false"
>
> # This variable points to the directory where the webgen tool has
>been
> # Installed.
>--
>1.7.0.4
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable
2013-10-02 13:07 ` [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Maupin, Chase
@ 2013-10-02 13:27 ` Cooper Jr., Franklin
2013-10-02 13:31 ` Denys Dmytriyenko
2013-10-04 15:01 ` Cooper Jr., Franklin
1 sibling, 1 reply; 14+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-02 13:27 UTC (permalink / raw)
To: Maupin, Chase; +Cc: meta-arago@arago-project.org
Ah your right. This is automatically done when I use git send-email to this mailing list. I need to see what I can do to prevent it from happening
> On Oct 2, 2013, at 8:07 AM, "Maupin, Chase" <chase.maupin@ti.com> wrote:
>
> Acked-by: Chase Maupin <chase.maupin@ti.com>
>
> But this isn't for meta-arago so the subject is misleading.
>
>
>> -----Original Message-----
>> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>> bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
>> Sent: Tuesday, October 01, 2013 1:04 PM
>> To: meta-arago@arago-project.org
>> 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 <fcooper@ti.com>
>> ---
>> 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
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable
2013-10-02 13:27 ` Cooper Jr., Franklin
@ 2013-10-02 13:31 ` Denys Dmytriyenko
0 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2013-10-02 13:31 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
Nothing you can do, as it's not git send-email, it's the mailing list that
adds prefix automatically. The only options are to add own extra [module]
prefix or not to send to the list... :)
On Wed, Oct 02, 2013 at 01:27:00PM +0000, Cooper Jr., Franklin wrote:
> Ah your right. This is automatically done when I use git send-email to this
> mailing list. I need to see what I can do to prevent it from happening
>
> > On Oct 2, 2013, at 8:07 AM, "Maupin, Chase" <chase.maupin@ti.com> wrote:
> >
> > Acked-by: Chase Maupin <chase.maupin@ti.com>
> >
> > But this isn't for meta-arago so the subject is misleading.
> >
> >
> >> -----Original Message-----
> >> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >> bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
> >> Sent: Tuesday, October 01, 2013 1:04 PM
> >> To: meta-arago@arago-project.org
> >> 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 <fcooper@ti.com>
> >> ---
> >> 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
> >> meta-arago@arago-project.org
> >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] Remove unnecessary binary from boot partition
2013-10-02 13:11 ` Maupin, Chase
@ 2013-10-02 13:59 ` Denys Dmytriyenko
0 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2013-10-02 13:59 UTC (permalink / raw)
To: Maupin, Chase; +Cc: meta-arago@arago-project.org, Cooper Jr., Franklin
On Wed, Oct 02, 2013 at 01:11:24PM +0000, Maupin, Chase wrote:
> Acked-by: Chase Maupin <chase.maupin@ti.com>
Ack.
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
> >Sent: Tuesday, October 01, 2013 1:04 PM
> >To: meta-arago@arago-project.org
> >Cc: Cooper Jr., Franklin
> >Subject: [meta-arago] [PATCH 2/3] Remove unnecessary binary from
> >boot partition
> >
> >Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> >---
> > lib/oesdk/package-sdks | 6 ++++++
> > 1 files changed, 6 insertions(+), 0 deletions(-)
> >
> >diff --git a/lib/oesdk/package-sdks b/lib/oesdk/package-sdks
> >index 49f1fe7..8f4e5e2 100644
> >--- a/lib/oesdk/package-sdks
> >+++ b/lib/oesdk/package-sdks
> >@@ -42,6 +42,12 @@ create_sd_card_content() {
> > mv u-boot-$m.bin u-boot.bin
> > fi
> >
> >+ # Remove this binary since it wouldn't be used in the boot
> >partition
> >+ if [ -e u-boot-spl.bin-$m ]
> >+ then
> >+ rm u-boot-spl.bin-$m
> >+ fi
> >+
> > # 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
> >--
> >1.7.0.4
> >
> >_______________________________________________
> >meta-arago mailing list
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] Don't package kernel files in boot partition for AMSDK 7.0
2013-10-02 13:11 ` Maupin, Chase
@ 2013-10-02 14:00 ` Denys Dmytriyenko
2013-10-04 20:41 ` Denys Dmytriyenko
0 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2013-10-02 14:00 UTC (permalink / raw)
To: Maupin, Chase; +Cc: meta-arago@arago-project.org, Cooper Jr., Franklin
On Wed, Oct 02, 2013 at 01:11:42PM +0000, Maupin, Chase wrote:
> Acked-by: Chase Maupin <chase.maupin@ti.com>
Ack. This is amsdk specific config though.
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
> >Sent: Tuesday, October 01, 2013 1:04 PM
> >To: meta-arago@arago-project.org
> >Cc: Cooper Jr., Franklin
> >Subject: [meta-arago] [PATCH 3/3] Don't package kernel files in
> >boot partition for AMSDK 7.0
> >
> >Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> >---
> > configs/amsdk-config-07.00.00.00.txt | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> >diff --git a/configs/amsdk-config-07.00.00.00.txt b/configs/amsdk-
> >config-07.00.00.00.txt
> >index a011f83..bf409d7 100644
> >--- a/configs/amsdk-config-07.00.00.00.txt
> >+++ b/configs/amsdk-config-07.00.00.00.txt
> >@@ -241,7 +241,7 @@ SD_CARD_CONTENT="/home/jenkins/extra-
> >files/sd_content"
> > # 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"
> >+PACKAGE_BOOT_KERNEL_FILES="false"
> >
> > # This variable points to the directory where the webgen tool has
> >been
> > # Installed.
> >--
> >1.7.0.4
> >
> >_______________________________________________
> >meta-arago mailing list
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable
2013-10-02 13:07 ` [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Maupin, Chase
2013-10-02 13:27 ` Cooper Jr., Franklin
@ 2013-10-04 15:01 ` Cooper Jr., Franklin
2013-10-04 20:48 ` Denys Dmytriyenko
1 sibling, 1 reply; 14+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-04 15:01 UTC (permalink / raw)
To: Maupin, Chase, meta-arago@arago-project.org
Denys,
Are you ok with this patch?
> -----Original Message-----
> From: Maupin, Chase
> Sent: Wednesday, October 02, 2013 8:07 AM
> To: Cooper Jr., Franklin; meta-arago@arago-project.org
> Subject: RE: [meta-arago] [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE
> variable
>
> Acked-by: Chase Maupin <chase.maupin@ti.com>
>
> But this isn't for meta-arago so the subject is misleading.
>
>
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
> >Sent: Tuesday, October 01, 2013 1:04 PM
> >To: meta-arago@arago-project.org
> >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 <fcooper@ti.com>
> >---
> > 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
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] Don't package kernel files in boot partition for AMSDK 7.0
2013-10-02 14:00 ` Denys Dmytriyenko
@ 2013-10-04 20:41 ` Denys Dmytriyenko
0 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2013-10-04 20:41 UTC (permalink / raw)
To: Maupin, Chase, meta-arago@arago-project.org, Cooper Jr., Franklin
On Wed, Oct 02, 2013 at 10:00:18AM -0400, Denys Dmytriyenko wrote:
> On Wed, Oct 02, 2013 at 01:11:42PM +0000, Maupin, Chase wrote:
> > Acked-by: Chase Maupin <chase.maupin@ti.com>
>
> Ack. This is amsdk specific config though.
So, this does apply to newer kernel and u-boot. Does it mean AMSDK 7.0 will
only have platforms with 3.12 kernel and 2013.10 u-boot? :)
--
Denys
> > >-----Original Message-----
> > >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > >bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
> > >Sent: Tuesday, October 01, 2013 1:04 PM
> > >To: meta-arago@arago-project.org
> > >Cc: Cooper Jr., Franklin
> > >Subject: [meta-arago] [PATCH 3/3] Don't package kernel files in
> > >boot partition for AMSDK 7.0
> > >
> > >Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > >---
> > > configs/amsdk-config-07.00.00.00.txt | 2 +-
> > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > >diff --git a/configs/amsdk-config-07.00.00.00.txt b/configs/amsdk-
> > >config-07.00.00.00.txt
> > >index a011f83..bf409d7 100644
> > >--- a/configs/amsdk-config-07.00.00.00.txt
> > >+++ b/configs/amsdk-config-07.00.00.00.txt
> > >@@ -241,7 +241,7 @@ SD_CARD_CONTENT="/home/jenkins/extra-
> > >files/sd_content"
> > > # 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"
> > >+PACKAGE_BOOT_KERNEL_FILES="false"
> > >
> > > # This variable points to the directory where the webgen tool has
> > >been
> > > # Installed.
> > >--
> > >1.7.0.4
> > >
> > >_______________________________________________
> > >meta-arago mailing list
> > >meta-arago@arago-project.org
> > >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable
2013-10-04 15:01 ` Cooper Jr., Franklin
@ 2013-10-04 20:48 ` Denys Dmytriyenko
2013-10-05 0:48 ` Cooper Jr., Franklin
0 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2013-10-04 20:48 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
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?
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; meta-arago@arago-project.org
> > Subject: RE: [meta-arago] [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE
> > variable
> >
> > Acked-by: Chase Maupin <chase.maupin@ti.com>
> >
> > But this isn't for meta-arago so the subject is misleading.
> >
> >
> > >-----Original Message-----
> > >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > >bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
> > >Sent: Tuesday, October 01, 2013 1:04 PM
> > >To: meta-arago@arago-project.org
> > >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 <fcooper@ti.com>
> > >---
> > > 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
> > >meta-arago@arago-project.org
> > >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable
2013-10-04 20:48 ` Denys Dmytriyenko
@ 2013-10-05 0:48 ` Cooper Jr., Franklin
0 siblings, 0 replies; 14+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-05 0:48 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Friday, October 04, 2013 3:49 PM
> To: Cooper Jr., Franklin
> Cc: Maupin, Chase; meta-arago@arago-project.org
> 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; meta-arago@arago-project.org
> > > Subject: RE: [meta-arago] [PATCH 1/3] Generalize
> PACKAGE_BOOT_UIMAGE
> > > variable
> > >
> > > Acked-by: Chase Maupin <chase.maupin@ti.com>
> > >
> > > But this isn't for meta-arago so the subject is misleading.
> > >
> > >
> > > >-----Original Message-----
> > > >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > > >bounces@arago-project.org] On Behalf Of Cooper Jr., Franklin
> > > >Sent: Tuesday, October 01, 2013 1:04 PM
> > > >To: meta-arago@arago-project.org
> > > >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 <fcooper@ti.com>
> > > >---
> > > > 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
> > > >meta-arago@arago-project.org
> > > >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2013-10-05 0:48 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-01 18:04 [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Franklin S. Cooper Jr
2013-10-01 18:04 ` [PATCH 2/3] Remove unnecessary binary from boot partition Franklin S. Cooper Jr
2013-10-02 13:11 ` Maupin, Chase
2013-10-02 13:59 ` Denys Dmytriyenko
2013-10-01 18:04 ` [PATCH 3/3] Don't package kernel files in boot partition for AMSDK 7.0 Franklin S. Cooper Jr
2013-10-02 13:11 ` Maupin, Chase
2013-10-02 14:00 ` Denys Dmytriyenko
2013-10-04 20:41 ` Denys Dmytriyenko
2013-10-02 13:07 ` [PATCH 1/3] Generalize PACKAGE_BOOT_UIMAGE variable Maupin, Chase
2013-10-02 13:27 ` Cooper Jr., Franklin
2013-10-02 13:31 ` Denys Dmytriyenko
2013-10-04 15:01 ` Cooper Jr., Franklin
2013-10-04 20:48 ` Denys Dmytriyenko
2013-10-05 0:48 ` Cooper Jr., Franklin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.