tisdk-uenv: Do not deploy to prebuilt images dir from recipe
PATCH 1/2 tisdk-uenv: Do not deploy to prebuilt images dir from recipe
The "prebuilt-images" dir is not part of any normal filesystem, it is for our "TI-SDK" bundle, so this file should be placed there by that bbclass, not as part of normal package building.
--- meta-arago-distro/classes/tisdk-bundle.bbclass | 6 ++++++ .../recipes-tisdk/tisdk-uenv/tisdk-uenv.bb | 12 +++--------- 2 files changed, 9 insertions(+), 9 deletions(-)
meta-arago-distro/classes/tisdk-bundle.bbclass +6 -0
@@ -179,6 +179,12 @@ tisdk_image_build () { return 1 fi + # Copy the U-Boot uEnv.txt file if is exists + if [ -e ${DEPLOY_DIR_IMAGE}/uEnv.txt ] + then + cp ${DEPLOY_DIR_IMAGE}/uEnv.txt ${prebuilt_dir}/ + fi + # Copy the Kernel image if it exists if [ -e ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin ] then
meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb +3 -9
@@ -1,4 +1,4 @@ -SUMMARY = "Install a uEnv.txt file into the SDK prebuilt-binaries directory" +SUMMARY = "Add a uEnv.txt file into the deploy directory" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -6,20 +6,14 @@ SRC_URI = "\ file://uEnv.txt \ " -PR = "r3" +PR = "r4" PV = "1.0" PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${WORKDIR}" -do_install () { - install -d ${D}/board-support/prebuilt-images - - install -m 0644 ${S}/uEnv.txt ${D}/board-support/prebuilt-images/ -} - -FILES:${PN} += "board-support/*" +inherit nopackages # deploy files for wic image inherit deploy
Signature · 1 line
2.39.2
PATCH 2/2 packagegroup-arago-tisdk-amsdk-sdk-host: Remove this recipe
This recipe only now exists to add "tisdk-uenv" to tisdk-core-bundle images so uEnv.txt can be packaged into prebuilt-images. We only need to package the uEnv.txt as a "prebuilt-image" if some bundled image includes it, no need to manually add this for all images.
--- .../recipes-core/images/tisdk-core-bundle.inc | 4 ---- .../packagegroup-arago-tisdk-amsdk-sdk-host.bb | 16 ---------------- 2 files changed, 20 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +0 -4
@@ -33,7 +33,3 @@ TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisd TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk" TOOLCHAIN_SUFFIX = "-tisdk" - -IMAGE_INSTALL = "\ - packagegroup-arago-tisdk-amsdk-sdk-host \ -"
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb deleted +0 -16
@@ -1,16 +0,0 @@ -SUMMARY = "Task to install additional scripts and applications into the SDK" -LICENSE = "MIT" -PR = "r30" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -EXTRA_FILES = "" -EXTRA_FILES:ti43x = "tisdk-uenv" -EXTRA_FILES:omap-a15 = "tisdk-uenv" -EXTRA_FILES:k3 = "tisdk-uenv" - -RDEPENDS:${PN} = "\ - ${EXTRA_FILES} \ -"
Signature · 1 line
2.39.2
Re: [meta-arago][scarthgap/master][PATCH 2/2] packagegroup-arago-tisdk-amsdk-sdk-host: Remove this recipe
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
This recipe only now exists to add "tisdk-uenv" to tisdk-core-bundle images so uEnv.txt can be packaged into prebuilt-images. We only need to package the uEnv.txt as a "prebuilt-image" if some bundled image includes it, no need to manually add this for all images.
Does this mean the tisdk-base/default images will no longer include the example empty uEnv.txt file?
Quoted 56 lines
Signed-off-by Andrew Davis <[email protected]>--- .../recipes-core/images/tisdk-core-bundle.inc | 4 ---- .../packagegroup-arago-tisdk-amsdk-sdk-host.bb | 16 ---------------- 2 files changed, 20 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bbmeta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +0
-4@@ -33,7 +33,3 @@ TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisd TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk" TOOLCHAIN_SUFFIX = "-tisdk" - -IMAGE_INSTALL = "\ - packagegroup-arago-tisdk-amsdk-sdk-host \ -"meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb deleted +0
-17@@ -1,16 +0,0 @@ -SUMMARY = "Task to install additional scripts and applications into the SDK" -LICENSE = "MIT" -PR = "r30" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -EXTRA_FILES = "" -EXTRA_FILES:ti43x = "tisdk-uenv" -EXTRA_FILES:omap-a15 = "tisdk-uenv" -EXTRA_FILES:k3 = "tisdk-uenv" - -RDEPENDS:${PN} = "\ - ${EXTRA_FILES} \ -" --2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16334): https://lists.yoctoproject.org/g/meta-arago/message/16334
Mute This Topic: https://lists.yoctoproject.org/mt/114418842/7902621
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 7 lines
Jonathan Cormier Senior Software Engineer Voice: 315.425.4045 x222 http://www.CriticalLink.com 6712 Brooklawn Parkway, Syracuse, NY 13211
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [meta-arago][scarthgap/master][PATCH 2/2] packagegroup-arago-tisdk-amsdk-sdk-host: Remove this recipe
Quoted 10 lines · Jon Cormier via lists.yoctoproject.org
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
This recipe only now exists to add "tisdk-uenv" to tisdk-core-bundle images so uEnv.txt can be packaged into prebuilt-images. We only need to package the uEnv.txt as a "prebuilt-image" if some bundled image includes it, no need to manually add this for all images.
Does this mean the tisdk-base/default images will no longer include the example empty uEnv.txt file?
Specifically the wic images. The other image formats don't include the boot files.
Quoted 71 lines
Quoted 43 lines
Signed-off-by Andrew Davis <[email protected]>--- .../recipes-core/images/tisdk-core-bundle.inc | 4 ---- .../packagegroup-arago-tisdk-amsdk-sdk-host.bb | 16 ---------------- 2 files changed, 20 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bbmeta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +0
-4@@ -33,7 +33,3 @@ TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisd TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk" TOOLCHAIN_SUFFIX = "-tisdk" - -IMAGE_INSTALL = "\ - packagegroup-arago-tisdk-amsdk-sdk-host \ -"meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb deleted +0
-17@@ -1,16 +0,0 @@ -SUMMARY = "Task to install additional scripts and applications into the SDK" -LICENSE = "MIT" -PR = "r30" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -EXTRA_FILES = "" -EXTRA_FILES:ti43x = "tisdk-uenv" -EXTRA_FILES:omap-a15 = "tisdk-uenv" -EXTRA_FILES:k3 = "tisdk-uenv" - -RDEPENDS:${PN} = "\ - ${EXTRA_FILES} \ -" --Quoted 7 lines
2.39.2
--
Jonathan Cormier
Senior Software EngineerVoice: 315.425.4045 x222
http://www.CriticalLink.com
6712 Brooklawn Parkway, Syracuse, NY 13211-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16336): https://lists.yoctoproject.org/g/meta-arago/message/16336
Mute This Topic: https://lists.yoctoproject.org/mt/114418842/7902621
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 7 lines
Jonathan Cormier Senior Software Engineer Voice: 315.425.4045 x222 http://www.CriticalLink.com 6712 Brooklawn Parkway, Syracuse, NY 13211
Re: [meta-arago][scarthgap/master][PATCH 2/2] packagegroup-arago-tisdk-amsdk-sdk-host: Remove this recipe
Quoted 6 lines · Jon Cormier
Quoted 4 lines · Jon Cormier via lists.yoctoproject.org
Quoted 1 line · Andrew Davis via lists.yoctoproject.org
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
This recipe only now exists to add "tisdk-uenv" to tisdk-core-bundle images so uEnv.txt can be packaged into prebuilt-images. We only need to package the uEnv.txt as a "prebuilt-image" if some bundled image includes it, no need to manually add this for all images.
Does this mean the tisdk-base/default images will no longer include the example empty uEnv.txt file?
Specifically the wic images. The other image formats don't include the boot files.
For most images, adding that example uEnv.txt file is done with this code here in arago.conf[0]. So the wic images will still have this file added even after this patchset, for now..
I say "for now" as I'm not a fan of how these get added to the images unconditionally in a .conf file, vs added explicitly in the image's .bb files. Even longer term, U-Boot is moving more towards boot script files (boot.scr), which are more flexible and standard (uEnv.txt is rather TI specific).
Andrew
[0] https://git.yoctoproject.org/meta-arago/tree/meta-arago-distro/conf/distro/arago.conf#n35
Quoted 73 lines
Quoted 71 lines
Quoted 43 lines
Signed-off-by Andrew Davis <[email protected]>--- .../recipes-core/images/tisdk-core-bundle.inc | 4 ---- .../packagegroup-arago-tisdk-amsdk-sdk-host.bb | 16 ---------------- 2 files changed, 20 deletions(-)delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +0
-4@@ -33,7 +33,3 @@ TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisd TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk" TOOLCHAIN_SUFFIX = "-tisdk" - -IMAGE_INSTALL = "\ - packagegroup-arago-tisdk-amsdk-sdk-host \ -"meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb deleted +0
-17@@ -1,16 +0,0 @@ -SUMMARY = "Task to install additional scripts and applications into the SDK" -LICENSE = "MIT" -PR = "r30" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -EXTRA_FILES = "" -EXTRA_FILES:ti43x = "tisdk-uenv" -EXTRA_FILES:omap-a15 = "tisdk-uenv" -EXTRA_FILES:k3 = "tisdk-uenv" - -RDEPENDS:${PN} = "\ - ${EXTRA_FILES} \ -" --Quoted 7 lines
2.39.2
--
Jonathan Cormier
Senior Software EngineerVoice: 315.425.4045 x222
http://www.CriticalLink.com
6712 Brooklawn Parkway, Syracuse, NY 13211-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16336): https://lists.yoctoproject.org/g/meta-arago/message/16336
Mute This Topic: https://lists.yoctoproject.org/mt/114418842/7902621
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-arago][scarthgap/master][PATCH 2/2] packagegroup-arago-tisdk-amsdk-sdk-host: Remove this recipe
Quoted 19 lines · Andrew Davis
Quoted 6 lines · Jon Cormier
Quoted 4 lines · Jon Cormier via lists.yoctoproject.org
Quoted 1 line · Andrew Davis via lists.yoctoproject.org
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
This recipe only now exists to add "tisdk-uenv" to tisdk-core-bundle images so uEnv.txt can be packaged into prebuilt-images. We only need to package the uEnv.txt as a "prebuilt-image" if some bundled image includes it, no need to manually add this for all images.
Does this mean the tisdk-base/default images will no longer include the example empty uEnv.txt file?
Specifically the wic images. The other image formats don't include the boot files.
Quoted 7 lines
For most images, adding that example uEnv.txt file is done with this code here in arago.conf[0]. So the wic images will still have this file added even after this patchset, for now..
I say "for now" as I'm not a fan of how these get added to the images unconditionally in a .conf file, vs added explicitly in the image's .bb files.
This is fair. It does make it tricky to remove the uEnv if a customer doesn't want it. Or if they want to replace it with their own recipe. Currently are forced to bbappend the ti recipe.
Quoted 3 lines
Even longer term, U-Boot is moving more towards boot script files (boot.scr), which are more flexible and standard (uEnv.txt is rather TI specific).
Hmm at least for development, having the config file being text is pretty desirable.
Quoted 79 lines
Andrew
[0] https://git.yoctoproject.org/meta-arago/tree/meta-arago-distro/conf/distro/arago.conf#n35
Quoted 73 lines
Quoted 71 lines
Quoted 43 lines
Signed-off-by Andrew Davis <[email protected]>--- .../recipes-core/images/tisdk-core-bundle.inc | 4 ---- .../packagegroup-arago-tisdk-amsdk-sdk-host.bb | 16 ---------------- 2 files changed, 20 deletions(-)delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +0
-4@@ -33,7 +33,3 @@ TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisd TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk" TOOLCHAIN_SUFFIX = "-tisdk" - -IMAGE_INSTALL = "\ - packagegroup-arago-tisdk-amsdk-sdk-host \ -"meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb deleted +0
-17@@ -1,16 +0,0 @@ -SUMMARY = "Task to install additional scripts and applications into the SDK" -LICENSE = "MIT" -PR = "r30" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -EXTRA_FILES = "" -EXTRA_FILES:ti43x = "tisdk-uenv" -EXTRA_FILES:omap-a15 = "tisdk-uenv" -EXTRA_FILES:k3 = "tisdk-uenv" - -RDEPENDS:${PN} = "\ - ${EXTRA_FILES} \ -" --Quoted 7 lines
2.39.2
--
Jonathan Cormier
Senior Software EngineerVoice: 315.425.4045 x222
http://www.CriticalLink.com
6712 Brooklawn Parkway, Syracuse, NY 13211-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16336): https://lists.yoctoproject.org/g/meta-arago/message/16336
Mute This Topic: https://lists.yoctoproject.org/mt/114418842/7902621
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 7 lines
Jonathan Cormier Senior Software Engineer Voice: 315.425.4045 x222 http://www.CriticalLink.com 6712 Brooklawn Parkway, Syracuse, NY 13211
Re: [meta-arago][scarthgap/master][PATCH 2/2] packagegroup-arago-tisdk-amsdk-sdk-host: Remove this recipe
Quoted 27 lines · Jon Cormier
Quoted 19 lines · Andrew Davis
Quoted 6 lines · Jon Cormier
Quoted 4 lines · Jon Cormier via lists.yoctoproject.org
Quoted 1 line · Andrew Davis via lists.yoctoproject.org
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
This recipe only now exists to add "tisdk-uenv" to tisdk-core-bundle images so uEnv.txt can be packaged into prebuilt-images. We only need to package the uEnv.txt as a "prebuilt-image" if some bundled image includes it, no need to manually add this for all images.
Does this mean the tisdk-base/default images will no longer include the example empty uEnv.txt file?
Specifically the wic images. The other image formats don't include the boot files.
Quoted 7 lines
For most images, adding that example uEnv.txt file is done with this code here in arago.conf[0]. So the wic images will still have this file added even after this patchset, for now..
I say "for now" as I'm not a fan of how these get added to the images unconditionally in a .conf file, vs added explicitly in the image's .bb files.
Quoted 8 lines
This is fair. It does make it tricky to remove the uEnv if a customer doesn't want it. Or if they want to replace it with their own recipe. Currently are forced to bbappend the ti recipe.
Quoted 3 lines
Even longer term, U-Boot is moving more towards boot script files (boot.scr), which are more flexible and standard (uEnv.txt is rather TI specific).
Hmm at least for development, having the config file being text is pretty desirable.
boot.scr files are text, you might be getting that confused with the binary environment files produced by "env save", usually called <board_name>.env or similar.
The difference between uEnv.txt and boot.scr is that the latter is run as a series of commands instead of environment variable definitions like uEnv.txt. The commands can also set env vars just like uEnv.txt by using 'env set xxx` commands, but also allows much more like variable evaluation and conditional logic.
Andrew
Quoted 81 lines
Quoted 79 lines
Andrew
[0] https://git.yoctoproject.org/meta-arago/tree/meta-arago-distro/conf/distro/arago.conf#n35
Quoted 73 lines
Quoted 71 lines
Quoted 43 lines
Signed-off-by Andrew Davis <[email protected]>--- .../recipes-core/images/tisdk-core-bundle.inc | 4 ---- .../packagegroup-arago-tisdk-amsdk-sdk-host.bb | 16 ---------------- 2 files changed, 20 deletions(-)delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +0
-4@@ -33,7 +33,3 @@ TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisd TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk" TOOLCHAIN_SUFFIX = "-tisdk" - -IMAGE_INSTALL = "\ - packagegroup-arago-tisdk-amsdk-sdk-host \ -"meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb deleted +0
-17@@ -1,16 +0,0 @@ -SUMMARY = "Task to install additional scripts and applications into the SDK" -LICENSE = "MIT" -PR = "r30" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -EXTRA_FILES = "" -EXTRA_FILES:ti43x = "tisdk-uenv" -EXTRA_FILES:omap-a15 = "tisdk-uenv" -EXTRA_FILES:k3 = "tisdk-uenv" - -RDEPENDS:${PN} = "\ - ${EXTRA_FILES} \ -" --Quoted 7 lines
2.39.2
--
Jonathan Cormier
Senior Software EngineerVoice: 315.425.4045 x222
http://www.CriticalLink.com
6712 Brooklawn Parkway, Syracuse, NY 13211-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16336): https://lists.yoctoproject.org/g/meta-arago/message/16336
Mute This Topic: https://lists.yoctoproject.org/mt/114418842/7902621
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-arago][scarthgap/master][PATCH 2/2] packagegroup-arago-tisdk-amsdk-sdk-host: Remove this recipe
Quoted 34 lines · Andrew Davis via lists.yoctoproject.org
Quoted 33 lines · Jon Cormier
Quoted 19 lines · Andrew Davis
Quoted 6 lines · Jon Cormier
Quoted 4 lines · Jon Cormier via lists.yoctoproject.org
Quoted 1 line · Andrew Davis via lists.yoctoproject.org
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
This recipe only now exists to add "tisdk-uenv" to tisdk-core-bundle images so uEnv.txt can be packaged into prebuilt-images. We only need to package the uEnv.txt as a "prebuilt-image" if some bundled image includes it, no need to manually add this for all images.
Does this mean the tisdk-base/default images will no longer include the example empty uEnv.txt file?
Specifically the wic images. The other image formats don't include the boot files.
Quoted 7 lines
For most images, adding that example uEnv.txt file is done with this code here in arago.conf[0]. So the wic images will still have this file added even after this patchset, for now..
I say "for now" as I'm not a fan of how these get added to the images unconditionally in a .conf file, vs added explicitly in the image's .bb files.
This is fair. It does make it tricky to remove the uEnv if a customer doesn't want it. Or if they want to replace it with their own recipe. Currently are forced to bbappend the ti recipe.
Quoted 3 lines
Even longer term, U-Boot is moving more towards boot script files (boot.scr), which are more flexible and standard (uEnv.txt is rather TI specific).
Quoted 6 lines
Quoted 2 lines
Hmm at least for development, having the config file being text is pretty desirable.
boot.scr files are text, you might be getting that confused with the binary environment files produced by "env save", usually called <board_name>.env or similar.
Usually, the source boot.cmd script is a text, which you need to feed to mkimage with "-T script" parameter to process it into boot.scr, which is not exactly a text file any more...
Quoted 5 lines
The difference between uEnv.txt and boot.scr is that the latter is run as a series of commands instead of environment variable definitions like uEnv.txt. The commands can also set env vars just like uEnv.txt by using 'env set xxx` commands, but also allows much more like variable evaluation and conditional logic.