From f4235a45f1c0b01208a67de94637f73b0d5ad6d4 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Wed, 17 Nov 2021 14:25:13 +0100 Subject: Follow-up removal of deprecated recipes after appfw removal A follow-up cleanup to the previous changes. - the aws+azure binders are deprecated in master, thus remove meta-iot-cloud - meta-security is no longer a dependency - rm agl-sota (due to meta-updater deprecation) - rm agl-sign-wgts feature - cleanup poky-agl.conf Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Moeller Change-Id: I274179ab1fb74b274e955bd9a3eeccccac615770 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26870 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Scott Murray --- templates/feature/agl-sign-wgts/50_local.conf.inc | 2 -- .../agl-sign-wgts/README_feature_agl-sign-wgts.md | 8 ------- templates/feature/agl-sota/50_bblayers.conf.inc | 3 --- templates/feature/agl-sota/50_local.conf.inc | 8 ------- templates/feature/agl-sota/50_setup.sh | 26 ---------------------- .../feature/agl-sota/README_feature_agl-sota.md | 9 -------- 6 files changed, 56 deletions(-) delete mode 100644 templates/feature/agl-sign-wgts/50_local.conf.inc delete mode 100644 templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md delete mode 100644 templates/feature/agl-sota/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-sota/50_local.conf.inc delete mode 100644 templates/feature/agl-sota/50_setup.sh delete mode 100644 templates/feature/agl-sota/README_feature_agl-sota.md (limited to 'templates') diff --git a/templates/feature/agl-sign-wgts/50_local.conf.inc b/templates/feature/agl-sign-wgts/50_local.conf.inc deleted file mode 100644 index fb1f6ab1a..000000000 --- a/templates/feature/agl-sign-wgts/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl/meta-agl/conf/include/agl-sign-wgts.inc -require conf/include/agl-sign-wgts.inc diff --git a/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md b/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md deleted file mode 100644 index 5e3b4b12c..000000000 --- a/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -description: Feature agl-sign-wgts -authors: José Bollo , ---- - -### Feature agl-sign-wgts - -Activation of the signature of wgt files diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc deleted file mode 100644 index f3623354c..000000000 --- a/templates/feature/agl-sota/50_bblayers.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/external/meta-updater \ - " diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc deleted file mode 100644 index 8019022c4..000000000 --- a/templates/feature/agl-sota/50_local.conf.inc +++ /dev/null @@ -1,8 +0,0 @@ -# See meta-updater/conf/distro/sota.conf.inc -INHERIT += "sota" -DISTRO_FEATURES:append = " sota usrmerge" -DISTRO_FEATURES_NATIVE:append = " sota" -AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz" -# Netboot is not obeying usrmerge distro feature -# therefore it is not compatible with agl-sota -CONFLICT_DISTRO_FEATURES += "netboot" diff --git a/templates/feature/agl-sota/50_setup.sh b/templates/feature/agl-sota/50_setup.sh deleted file mode 100644 index 76cb016f2..000000000 --- a/templates/feature/agl-sota/50_setup.sh +++ /dev/null @@ -1,26 +0,0 @@ - -cat <> ${BUILDDIR}/conf/bblayers.conf - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# fragment { -# ${METADIR}/meta-agl/templates/feature/agl-sota/50_setup.sh -# -EOF - -case ${MACHINE} in - "qemux86-64") - echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-qemux86-64\"" >> ${BUILDDIR}/conf/bblayers.conf;; - "raspberrypi4") - echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-raspberrypi\"" >> ${BUILDDIR}/conf/bblayers.conf;; - *) - echo "#No extra SOTA feature layer for MACHINE ${MACHINE}" >> ${BUILDDIR}/conf/bblayers.conf;; -esac - - -cat <> ${BUILDDIR}/conf/bblayers.conf - -# -# } -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - -EOF diff --git a/templates/feature/agl-sota/README_feature_agl-sota.md b/templates/feature/agl-sota/README_feature_agl-sota.md deleted file mode 100644 index beeffc234..000000000 --- a/templates/feature/agl-sota/README_feature_agl-sota.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-sota -authors: Anton Gerasimov , Changhyeok Bae , Jan-Simon Moeller , Jan-Simon Möller , Leon Anavi , Phil Wise , Ronan Le Martret ---- - -### Feature agl-sota - -*Description is missing - please complete file meta-agl/templates/feature/agl-sota/README_feature_agl-sota.md* - -- cgit 1.2.3-korg