Cleanup of packagegroups/images #1
cover Cleanup of packagegroups/images #1
This is the first set of patches that cleanup packagegroup and image recipes for review. More to come...
Denys Dmytriyenko (9):
packagegroup-arago-cross-canadian: deprecate in favor of upstream
packagegroup-cross-canadian
nativesdk-packagegroup-arago-sdk-host: deprecate in favor of upstream
nativesdk-packagegroup-sdk-host
arago-console-image: drop unused image recipe
arago-console-image: drop unused image recipe
arago-test-image: drop unused image recipe tisdk-recovery-rootfs-image: drop unused image recipe
arago-core-tisdk-bundle: add missing deployment of J7 SYSFW binary
arago-tiny-image: simplify by re-using arago-image.inc arago-image.inc: unbreak populate_sdk task
.../recipes-core/images/arago-base-image.bb | 8 -----
.../recipes-core/images/arago-console-image.bb | 13 --------
.../recipes-core/images/arago-core-tisdk-bundle.bb | 3 +-
.../recipes-core/images/arago-image.inc | 9 +++---
.../recipes-core/images/arago-test-image.bb | 19 ------------
.../recipes-core/images/arago-tiny-image.bb | 35 ++--------------------
.../images/tisdk-recovery-rootfs-image.bb | 10 -------
...append => packagegroup-cross-canadian.bbappend} | 0
.../recipes-core/meta/meta-toolchain-arago.bb | 10 ++-----
.../nativesdk-packagegroup-arago-sdk-host.bb | 21 -------------
.../nativesdk-packagegroup-arago-tisdk-host.bb | 5 +++-
.../packagegroup-arago-cross-canadian.bb | 20 -------------
12 files changed, 16 insertions(+), 137 deletions(-)
delete mode 100644 meta-arago-distro/recipes-core/images/arago-base-image.bb
delete mode 100644 meta-arago-distro/recipes-core/images/arago-console-image.bb
delete mode 100644 meta-arago-distro/recipes-core/images/arago-test-image.bb
delete mode 100644 meta-arago-distro/recipes-core/images/tisdk-recovery-rootfs-image.bb
rename meta-arago-distro/recipes-core/packagegroups/{packagegroup-arago-cross-canadian.bbappend => packagegroup-cross-canadian.bbappend} (100%)
delete mode 100644 meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb
delete mode 100644 meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bbSignature · 1 line
2.7.4
RFC PATCH 1/9 packagegroup-arago-cross-canadian: deprecate in favor of upstream packagegroup-cross-canadian
Upstream meta-environment already provides standard site-config and version files, keep our own environment-setup for now.
---
...bbappend => packagegroup-cross-canadian.bbappend} | 0
.../recipes-core/meta/meta-toolchain-arago.bb | 8 +-------
.../packagegroup-arago-cross-canadian.bb | 20 --------------------
3 files changed, 1 insertion(+), 27 deletions(-)
rename meta-arago-distro/recipes-core/packagegroups/{packagegroup-arago-cross-canadian.bbappend => packagegroup-cross-canadian.bbappend} (100%)
delete mode 100644 meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bbmeta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend renamed from meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bbappend +0 -0
meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb +1 -7
@@ -1,6 +1,6 @@ TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-arago-sdk-host" TOOLCHAIN_HOST_TASK += "nativesdk-buildtools-perl-dummy" -TOOLCHAIN_HOST_TASK += "packagegroup-arago-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK += "packagegroup-cross-canadian-${MACHINE}" TOOLCHAIN_TARGET_TASK ?= "packagegroup-arago-standalone-sdk-target" TOOLCHAIN_SUFFIX ?= "-sdk" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}${TOOLCHAIN_SUFFIX}"
@@ -113,14 +113,8 @@ arago_sdk_fixup () { } fakeroot create_sdk_files() { - # Setup site file for external use - toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} - toolchain_create_sdk_env_script ${SDK_OUTPUT}/${SDKPATH}/environment-setup - # Add version information - toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS} - cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ # Replace the ##DEFAULT_INSTALL_DIR## with the correct pattern.
meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bb deleted +0 -20
@@ -1,20 +0,0 @@ -SUMMARY = "Host Arago SDK package for cross canadian toolchain" -PN = "packagegroup-arago-cross-canadian-${MACHINE}" -PR = "r7" - -inherit cross-canadian packagegroup - -PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" - -# Use indirection to stop these being expanded prematurely -BINUTILS = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" -GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" -GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" - -RDEPENDS_${PN} = "\ - ${@all_multilib_tune_values(d, 'BINUTILS')} \ - ${@all_multilib_tune_values(d, 'GCC')} \ - ${@all_multilib_tune_values(d, 'GDB')} \ - " - -# meta-environment-${MACHINE}
Signature · 1 line
2.7.4
RFC PATCH 2/9 nativesdk-packagegroup-arago-sdk-host: deprecate in favor of upstream nativesdk-packagegroup-sdk-host
In reply to Denys DmytriyenkoUpstream nativesdk-packagegroup-sdk-host installs most host tools, but few more that we require should be added in nativesdk-packagegroup-arago-tisdk-host
--- .../recipes-core/meta/meta-toolchain-arago.bb | 2 +- .../nativesdk-packagegroup-arago-sdk-host.bb | 21 --------------------- .../nativesdk-packagegroup-arago-tisdk-host.bb | 5 ++++- 3 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb
meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb +1 -1
@@ -1,4 +1,4 @@ -TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-arago-sdk-host" +TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host" TOOLCHAIN_HOST_TASK += "nativesdk-buildtools-perl-dummy" TOOLCHAIN_HOST_TASK += "packagegroup-cross-canadian-${MACHINE}" TOOLCHAIN_TARGET_TASK ?= "packagegroup-arago-standalone-sdk-target"
meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb deleted +0 -21
@@ -1,21 +0,0 @@ -SUMMARY = "Host packages for a standalone Arago SDK or external toolchain" -PR = "r18" -LICENSE = "MIT" - -inherit packagegroup nativesdk - -PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" - -RDEPENDS_${PN} = "\ - nativesdk-pkgconfig \ - nativesdk-opkg \ - nativesdk-libtool \ - nativesdk-autoconf \ - nativesdk-automake \ - nativesdk-shadow \ - nativesdk-makedevs \ - nativesdk-python-distutils \ - nativesdk-git \ - nativesdk-cmake \ - nativesdk-mtd-utils-ubifs \ -"
meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb +4 -1
@@ -20,6 +20,9 @@ EXTRA_TI_TOOLS = " \ " RDEPENDS_${PN} = "\ - nativesdk-packagegroup-arago-sdk-host \ + nativesdk-packagegroup-sdk-host \ + nativesdk-python-distutils \ + nativesdk-git \ + nativesdk-mtd-utils-ubifs \ ${EXTRA_TI_TOOLS} \ "
Signature · 1 line
2.7.4
RFC PATCH 3/9 arago-console-image: drop unused image recipe
In reply to Denys Dmytriyenko--- meta-arago-distro/recipes-core/images/arago-base-image.bb | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/images/arago-base-image.bb
meta-arago-distro/recipes-core/images/arago-base-image.bb deleted +0 -8
@@ -1,8 +0,0 @@ -# Arago base image -# gives you a small image with package manager - -require arago-image.inc - -IMAGE_INSTALL += "packagegroup-arago-base" - -export IMAGE_BASENAME = "arago-base-image"
Signature · 1 line
2.7.4
RFC PATCH 4/9 arago-console-image: drop unused image recipe
In reply to Denys Dmytriyenko--- .../recipes-core/images/arago-console-image.bb | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/images/arago-console-image.bb
meta-arago-distro/recipes-core/images/arago-console-image.bb deleted +0 -13
@@ -1,13 +0,0 @@ -# Arago console image -# gives you an image with basic media libraries - -require arago-image.inc - -COMPATIBLE_MACHINE = "(?!arago)" - -IMAGE_INSTALL += "\ - packagegroup-arago-base \ - packagegroup-arago-console \ - " - -export IMAGE_BASENAME = "arago-console-image"
Signature · 1 line
2.7.4
RFC PATCH 5/9 arago-test-image: drop unused image recipe
In reply to Denys Dmytriyenko--- .../recipes-core/images/arago-test-image.bb | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/images/arago-test-image.bb
meta-arago-distro/recipes-core/images/arago-test-image.bb deleted +0 -19
@@ -1,19 +0,0 @@ -# Arago System Test image -# gives you test applications -LICENSE = "MIT" - -require arago-image.inc - -IMAGE_FSTYPES = "tar.xz" - -IMAGE_INSTALL += "\ - packagegroup-arago-base \ - packagegroup-arago-console \ - packagegroup-arago-base-tisdk \ - packagegroup-arago-tisdk-crypto \ - packagegroup-arago-tisdk-addons \ - packagegroup-arago-test \ - packagegroup-arago-test-addons \ - " - -export IMAGE_BASENAME = "arago-test-image"
Signature · 1 line
2.7.4
RFC PATCH 6/9 tisdk-recovery-rootfs-image: drop unused image recipe
In reply to Denys Dmytriyenko--- .../recipes-core/images/tisdk-recovery-rootfs-image.bb | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/images/tisdk-recovery-rootfs-image.bb
meta-arago-distro/recipes-core/images/tisdk-recovery-rootfs-image.bb deleted +0 -10
@@ -1,10 +0,0 @@ -# TI SDK recovery filesystem image -COMPATIBLE_MACHINE = "keystone" - -require arago-image.inc - -IMAGE_INSTALL += "\ - packagegroup-arago-tisdk-recoveryfs \ -" - -export IMAGE_BASENAME = "tisdk-recoveryfs"
Signature · 1 line
2.7.4
RFC PATCH 7/9 arago-core-tisdk-bundle: add missing deployment of J7 SYSFW binary
In reply to Denys Dmytriyenko--- meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.bb +2 -1
@@ -10,6 +10,7 @@ DEPLOY_SPL_NAME_k3 = "tispl.bin tiboot3.bin" DEPLOY_IMAGES_NAME_k3 = "bl31.bin bl32.bin sysfw.itb" DEPLOY_IMAGES_NAME_append_am65xx-evm = " ti-sci-firmware-am65x-gp.bin" +DEPLOY_IMAGES_NAME_append_j7-evm = " ti-sci-firmware-j721e-gp.bin" -ARAGO_TISDK_IMAGE ?= "arago-core-tisdk-image" +ARAGO_TISDK_IMAGE ?= "arago-core-tisdk-bundle" export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}"
Signature · 1 line
2.7.4
RFC PATCH 8/9 arago-tiny-image: simplify by re-using arago-image.inc
In reply to Denys Dmytriyenko--- .../recipes-core/images/arago-tiny-image.bb | 35 ++-------------------- 1 file changed, 3 insertions(+), 32 deletions(-)
meta-arago-distro/recipes-core/images/arago-tiny-image.bb +3 -32
@@ -1,16 +1,9 @@ -# Common pieces for Arago images +ARAGO_SYSVINIT = "1" -LICENSE = "MIT" - -COMPATIBLE_MACHINE = "ti-soc" - -IMAGE_FEATURES += "package-management splash" +require arago-image.inc IMAGE_FSTYPES += "cpio" -# 4KB per 1 inode should be enough -EXTRA_IMAGECMD_ext2.gz += "-i 4096" - # Install a small set of utils which can be used for diagnostics ARAGO_TINY_IMAGE_EXTRA_INSTALL ?= " \ parted \
@@ -21,31 +14,9 @@ ARAGO_TINY_IMAGE_EXTRA_INSTALL ?= " \ arago-feed-config \ " -IMAGE_INSTALL += " \ +IMAGE_INSTALL = " \ packagegroup-arago-sysvinit-boot \ ${ARAGO_TINY_IMAGE_EXTRA_INSTALL} \ " export IMAGE_BASENAME = "arago-tiny-image" - -IMAGE_LINGUAS = "" - -make_bootfiles_symlinks_relative() { - for f in "${IMAGE_ROOTFS}/boot"/* - do - [ -L "$f" ] || continue - - l=$(readlink "$f") - if [ "${l:0:6}" == "/boot/" ] - then - ln -sf "${l##/boot/}" "$f" - elif ["${l:0:1}" == "/" ] - then - ln -sf "..$l" "$f" - fi - done -} - -ROOTFS_POSTPROCESS_COMMAND += "make_bootfiles_symlinks_relative;" - -inherit core-image
Signature · 1 line
2.7.4
RFC PATCH 9/9 arago-image.inc: unbreak populate_sdk task
In reply to Denys DmytriyenkoWe chose not to install nativesdk-perl and its modules, hence ensure dummy dependencies and archs are configured properly.
--- meta-arago-distro/recipes-core/images/arago-image.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
meta-arago-distro/recipes-core/images/arago-image.inc +5 -4
@@ -9,17 +9,18 @@ IMAGE_FEATURES += "package-management splash" # 4KB per 1 inode should be enough EXTRA_IMAGECMD_ext2.gz += "-i 4096" -ARAGO_IMAGE_EXTRA_INSTALL ?= "" - -IMAGE_INSTALL += " \ +IMAGE_INSTALL = " \ packagegroup-core-boot \ - ${ARAGO_IMAGE_EXTRA_INSTALL} \ + ${CORE_IMAGE_EXTRA_INSTALL} \ " export IMAGE_BASENAME = "arago-image" IMAGE_LINGUAS = "" +TOOLCHAIN_HOST_TASK += "nativesdk-buildtools-perl-dummy" +SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" + make_bootfiles_symlinks_relative() { for f in "${IMAGE_ROOTFS}/boot"/* do
Signature · 1 line
2.7.4