@@ -12,8 +12,8 @@
},
"GUARD-1" : {
"skip_files" : [
- "meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend",
- "meta-arago-distro/dynamic-layers/selinux/recipes-core/images/tisdk-default-image.bbappend",
+ "meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/arago-default-image.bbappend",
+ "meta-arago-distro/dynamic-layers/selinux/recipes-core/images/arago-default-image.bbappend",
"meta-arago-distro/dynamic-layers/selinux/recipes-kernel/linux/linux-ti-staging_%.bbappend",
"meta-arago-extras/recipes-extended/sysrepo/libyang_%.bbappend",
"meta-arago-test/dynamic-layers/qt6-layer/recipes-core/packagegroups/ti-test.bbappend",
@@ -1,4 +1,4 @@
-meta-arago-distro provides Arago distribution configuration for TI SDK products
+meta-arago-distro provides Arago distribution configuration for TI products
This layer works with the latest Yocto Project release (currently 2.2+) and tracks
the stable/maintenance branches (currently "master") of the corresponding layers:
@@ -31,7 +31,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
# List of target side images to be built and packaged. By default take
# the base image but this can be modified if desired to package
# additional images.
-TARGET_IMAGES ?= "tisdk-base-image"
+TARGET_IMAGES ?= "arago-base-image"
# path to install the meta-toolchain package in the SDK
TISDK_TOOLCHAIN_PATH ?= "linux-devkit"
@@ -124,7 +124,7 @@ PACKAGECONFIG:append:pn-kmscube = " gstreamer"
PACKAGECONFIG:remove:pn-opencl-cts = "opengl gles vulkan"
# Configure RAMFS for jailhouse linux-demo
-JH_RAMFS_IMAGE = "tisdk-jailhouse-inmate"
+JH_RAMFS_IMAGE = "arago-jailhouse-inmate"
# Enable UI and scripting for perf
PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
@@ -35,5 +35,5 @@ DATEH := "${@time.strftime('%Y%m%d%H',time.gmtime())}"
CORESDK_RTOS_FILE_PREFIX = "${DATEH}-"
CORESDK_RTOS_FILE_SUFFIX = ";downloadfilename=${CORESDK_RTOS_FILE_PREFIX}${DEFAULT_FIRMWARE_FILE}"
-# Build and assemble TI-SDK, but don't package it
-IMAGE_FSTYPES:pn-tisdk-core-bundle = ""
+# Build and assemble Arago SDK, but don't package it
+IMAGE_FSTYPES:pn-arago-core-bundle = ""
similarity index 100%
rename from meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend
rename to meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/arago-default-image.bbappend
similarity index 100%
rename from meta-arago-distro/dynamic-layers/selinux/recipes-core/images/tisdk-default-image.bbappend
rename to meta-arago-distro/dynamic-layers/selinux/recipes-core/images/arago-default-image.bbappend
@@ -8,7 +8,7 @@ CLEANBROKEN = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-BOOSTRAP_IMAGE = "tisdk-bootstrap-base-image"
+BOOSTRAP_IMAGE = "arago-bootstrap-base-image"
TARGET = "bootstrap-rootfs-${MACHINE}.cpio"
similarity index 89%
rename from meta-arago-distro/recipes-core/images/tisdk-base-image.bb
rename to meta-arago-distro/recipes-core/images/arago-base-image.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Arago TI SDK base image with test tools"
+SUMMARY = "Arago base image with test tools"
DESCRIPTION = "Arago SDK base image suitable for initramfs containing\
comprehensive test tools."
similarity index 91%
rename from meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb
rename to meta-arago-distro/recipes-core/images/arago-bootstrap-base-image.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Arago TI SDK bootstrap base image for initramfs"
+SUMMARY = "Arago bootstrap base image for initramfs"
DESCRIPTION = "Image meant for basic system verification of linux kernel.\
Intended as basic test system, this image does not package the kernel\
similarity index 90%
rename from meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb
rename to meta-arago-distro/recipes-core/images/arago-bootstrap-image.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Arago TI SDK bootstrap image usable for board bringup"
+SUMMARY = "Arago bootstrap image usable for board bringup"
DESCRIPTION = "This image is a complete package containing a rootfs\
and an initrd with platform test utilities that can be used for new\
similarity index 81%
rename from meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
rename to meta-arago-distro/recipes-core/images/arago-core-bundle.bb
@@ -1,11 +1,11 @@
-SUMMARY = "Installer package for TI SDK - NOT for direct use on target"
+SUMMARY = "Installer package for Arago SDK - NOT for direct use on target"
DESCRIPTION = "This creates an installer including all the default images\
recommended including source, binaries, filesystems, etc.\
- for TI SDK. This is meant to be used on the host system.\
+ for Arago SDK. This is meant to be used on the host system.\
"
-require tisdk-core-bundle.inc
+require arago-core-bundle.inc
DEPLOY_SPL_NAME:omapl138 = ""
DEPLOY_SPL_NAME:k3 = "tispl.bin tiboot3.bin"
similarity index 83%
rename from meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
rename to meta-arago-distro/recipes-core/images/arago-core-bundle.inc
@@ -1,4 +1,4 @@
-# This include is for the common setting used to build TISDK images. These images
+# This include is for the common setting used to build Arago SDK images. These images
# include both host and target side content.
LICENSE = "MIT"
@@ -27,7 +27,7 @@ DTB_FILTER:j7200 = "j7200"
DTB_FILTER:j721s2 = "j721s2"
# List of target side images to build for the SDK
-TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisdk-bootstrap-image"
+TARGET_IMAGES = "arago-base-image arago-default-image arago-thinlinux-image arago-bootstrap-image"
TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk"
TOOLCHAIN_SUFFIX = "-tisdk"
similarity index 91%
rename from meta-arago-distro/recipes-core/images/tisdk-default-image.bb
rename to meta-arago-distro/recipes-core/images/arago-default-image.bb
@@ -1,6 +1,6 @@
-SUMMARY = "Arago TI SDK full filesystem image"
+SUMMARY = "Arago full filesystem image"
-DESCRIPTION = "Complete Arago TI SDK filesystem image containing complete\
+DESCRIPTION = "Complete Arago filesystem image containing complete\
applications and packages to entitle the SoC."
require arago-image.inc
new file mode 100644
@@ -0,0 +1,12 @@
+SUMMARY = "Arago image for Jailhouse Hypervisor"
+
+DESCRIPTION = "Arago image meant for running Jailhouse, a partitioning \
+Hypervisor based on Linux. This image is derived from arago-default-image and \
+contains additional firmware and management tools for Jailhouse.\
+"
+
+require recipes-core/images/arago-default-image.bb
+
+COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
+
+IMAGE_INSTALL += " jailhouse"
similarity index 53%
rename from meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb
rename to meta-arago-distro/recipes-core/images/arago-jailhouse-inmate.bb
@@ -1,11 +1,11 @@
-SUMMARY = "Arago TI SDK super minimal base image for jailhouse linux demo"
+SUMMARY = "Arago super minimal base image for jailhouse linux demo"
DESCRIPTION = "Image meant for basic boot of linux inmate for jailhouse\
-This image is derived from tisdk-tiny-initramfs and contains additional\
+This image is derived from arago-tiny-initramfs and contains additional\
packages for OOB demo.\
"
-require recipes-core/images/tisdk-tiny-initramfs.bb
+require recipes-core/images/arago-tiny-initramfs.bb
COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
similarity index 94%
rename from meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb
rename to meta-arago-distro/recipes-core/images/arago-thinlinux-image.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Arago TI SDK Thin Linux image"
+SUMMARY = "Arago Thin Linux image"
DESCRIPTION = "Minimal bootable image with container to start the next\
complex system up."
similarity index 81%
rename from meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
rename to meta-arago-distro/recipes-core/images/arago-tiny-image.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Arago TI SDK super minimal base image for initramfs"
+SUMMARY = "Arago super minimal base image for initramfs"
DESCRIPTION = "Image meant for basic boot of linux kernel. Intended as\
bare system, this image does not package the kernel in the\
@@ -16,4 +16,4 @@ IMAGE_INSTALL += " \
${ARAGO_TINY_IMAGE_EXTRA_INSTALL} \
"
-DEPENDS += " tisdk-tiny-initramfs"
+DEPENDS += " arago-tiny-initramfs"
similarity index 93%
rename from meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb
rename to meta-arago-distro/recipes-core/images/arago-tiny-initramfs.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Arago TI SDK super minimal base image for initramfs"
+SUMMARY = "Arago super minimal base image for initramfs"
DESCRIPTION = "Image meant for basic boot of linux kernel. Intended as\
bare system, this image does not package the kernel in the\
deleted file mode 100644
@@ -1,12 +0,0 @@
-SUMMARY = "Arago TI SDK image for Jailhouse Hypervisor"
-
-DESCRIPTION = "Arago TI SDK image meant for running Jailhouse, a partitioning \
-Hypervisor based on Linux. This image is derived from tisdk-default-image and \
-contains additional firmware and management tools for Jailhouse.\
-"
-
-require recipes-core/images/tisdk-default-image.bb
-
-COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
-
-IMAGE_INSTALL += " jailhouse"
@@ -1,4 +1,4 @@
-meta-arago-extras provides additional TI SDK applications that are distro-agnostic
+meta-arago-extras provides additional TI applications that are distro-agnostic
This layer works with the latest Yocto Project release (currently 2.2+) and tracks
the stable/maintenance branches (currently "master") of the corresponding layers:
@@ -169,7 +169,7 @@ RDEPENDS:${PN} = "\
${TI_TEST_TI_TOOLS} \
"
-# Package group for things that should only be present in tisdk-default-image
+# Package group for things that should only be present in arago-default-image
PACKAGES += " ${PN}-extras"
RDEPENDS:${PN}-extras = "\
${TI_TEST_EXTRAS} \
Arago is a reference distribution for TI hardware and a foundation for application/product specific Linux SDKs. While Arago can produce an SDK for TI products on its own this is not *the* "TI SDK" shipped today, which is generated by a layer called "meta-tisdk". This "meta-tisdk" produces images with the tisdk branding such as "tisdk-default-image" but as Arago provides images of the same name this is done by appending to the Arago version. This means the content of "tisdk-default-image" changes depending on what layers you have included. Instead there should be different names for images containing different content, the solution here is: meta-arago -> arago-*-image meta-tisdk -> tisdk-*-image The tisdk images can still be based on the arago images, but this way it is clear what you are getting based on the image names. Rename the images here in meta-arago to be prefixed with "arago", and remove some of the legacy "TI SDK" branding. Signed-off-by: Andrew Davis <afd@ti.com> --- check_yocto_rules.json | 4 ++-- meta-arago-distro/README | 2 +- meta-arago-distro/classes/tisdk-bundle.bbclass | 2 +- meta-arago-distro/conf/distro/arago.conf | 2 +- .../conf/distro/include/branding-bleeding.inc | 4 ++-- ...t-image.bbappend => arago-default-image.bbappend} | 0 ...t-image.bbappend => arago-default-image.bbappend} | 0 .../bootstrap-initrd/bootstrap-initrd_1.0.bb | 2 +- .../{tisdk-base-image.bb => arago-base-image.bb} | 2 +- ...p-base-image.bb => arago-bootstrap-base-image.bb} | 2 +- ...k-bootstrap-image.bb => arago-bootstrap-image.bb} | 2 +- .../{tisdk-core-bundle.bb => arago-core-bundle.bb} | 6 +++--- .../{tisdk-core-bundle.inc => arago-core-bundle.inc} | 4 ++-- ...tisdk-default-image.bb => arago-default-image.bb} | 4 ++-- .../recipes-core/images/arago-jailhouse-image.bb | 12 ++++++++++++ ...jailhouse-inmate.bb => arago-jailhouse-inmate.bb} | 6 +++--- ...k-thinlinux-image.bb => arago-thinlinux-image.bb} | 2 +- .../{tisdk-tiny-image.bb => arago-tiny-image.bb} | 4 ++-- ...sdk-tiny-initramfs.bb => arago-tiny-initramfs.bb} | 2 +- .../recipes-core/images/tisdk-jailhouse-image.bb | 12 ------------ meta-arago-extras/README | 2 +- .../recipes-core/packagegroups/ti-test.bb | 2 +- 22 files changed, 39 insertions(+), 39 deletions(-) rename meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/{tisdk-default-image.bbappend => arago-default-image.bbappend} (100%) rename meta-arago-distro/dynamic-layers/selinux/recipes-core/images/{tisdk-default-image.bbappend => arago-default-image.bbappend} (100%) rename meta-arago-distro/recipes-core/images/{tisdk-base-image.bb => arago-base-image.bb} (89%) rename meta-arago-distro/recipes-core/images/{tisdk-bootstrap-base-image.bb => arago-bootstrap-base-image.bb} (91%) rename meta-arago-distro/recipes-core/images/{tisdk-bootstrap-image.bb => arago-bootstrap-image.bb} (90%) rename meta-arago-distro/recipes-core/images/{tisdk-core-bundle.bb => arago-core-bundle.bb} (81%) rename meta-arago-distro/recipes-core/images/{tisdk-core-bundle.inc => arago-core-bundle.inc} (83%) rename meta-arago-distro/recipes-core/images/{tisdk-default-image.bb => arago-default-image.bb} (91%) create mode 100644 meta-arago-distro/recipes-core/images/arago-jailhouse-image.bb rename meta-arago-distro/recipes-core/images/{tisdk-jailhouse-inmate.bb => arago-jailhouse-inmate.bb} (53%) rename meta-arago-distro/recipes-core/images/{tisdk-thinlinux-image.bb => arago-thinlinux-image.bb} (94%) rename meta-arago-distro/recipes-core/images/{tisdk-tiny-image.bb => arago-tiny-image.bb} (81%) rename meta-arago-distro/recipes-core/images/{tisdk-tiny-initramfs.bb => arago-tiny-initramfs.bb} (93%) delete mode 100644 meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb