From 5237004c476955be7fb266c7edf4b526f40eb41c Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Thu, 11 May 2023 13:02:46 +0200
Subject: Ensure all layers do pass yocto-check-layer and
 run-yocto-check-layer.sh scripts

Ensure the layers do pass again and that the scripts are up-to-date.

Bug-AGL: SPEC-4680
Bug-AGL: SPEC-4681
Bug-AGL: SPEC-4682
Bug-AGL: SPEC-4683
Bug-AGL: SPEC-4684
Change-Id: I5ab1bc49dc361a7fc30a62c5c82d286e66bad72e
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28875
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
---
 .../scripts/run-yocto-check-layer-flags-enabled.sh | 42 ----------------------
 meta-netboot/scripts/run-yocto-check-layer.sh      | 21 ++++++-----
 2 files changed, 13 insertions(+), 50 deletions(-)
 delete mode 100755 meta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh

(limited to 'meta-netboot')

diff --git a/meta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh b/meta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh
deleted file mode 100755
index 4e814f51f..000000000
--- a/meta-netboot/scripts/run-yocto-check-layer-flags-enabled.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#set -x
-
-SCRIPTPATH="$( cd $(dirname $0) >/dev/null 2>&1 ; pwd -P )"
-echo $SCRIPTPATH
-AGLROOT="$SCRIPTPATH/../../.."
-POKYDIR="$AGLROOT/external/poky"
-TMPROOT=`mktemp -d`
-
-rm -rf ${TMPROOT}/testbuild-ycl || true
-mkdir -p ${TMPROOT}/testbuild-ycl
-cd ${TMPROOT}/testbuild-ycl
-
-source $POKYDIR/oe-init-build-env .
-
-cat << EOF >> conf/local.conf
-# just define defaults
-AGL_FEATURES ?= ""
-AGL_EXTRA_IMAGE_FSTYPES ?= ""
-
-# important settings imported from poky-agl.conf
-# we do not import 
-DISTRO_FEATURES:append = " systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-
-NETBOOT_ENABLED = "1"
-NETBOOT_FSTYPES ??= "ext4.gz"
-
-EOF
-
-
-yocto-check-layer \
-	--dependency \
-	    $AGLROOT/external/meta-openembedded/meta-oe \
-	    $AGLROOT/external/meta-openembedded/meta-python \
-	    $AGLROOT/external/meta-openembedded/meta-networking \
-	-- \
-	$AGLROOT/meta-agl/meta-netboot/
-
-
-[ $? = 0 ] && rm -rf ${TMPROOT}/testbuild-ycl
diff --git a/meta-netboot/scripts/run-yocto-check-layer.sh b/meta-netboot/scripts/run-yocto-check-layer.sh
index b36788a99..979c76838 100755
--- a/meta-netboot/scripts/run-yocto-check-layer.sh
+++ b/meta-netboot/scripts/run-yocto-check-layer.sh
@@ -19,21 +19,26 @@ AGL_FEATURES ?= ""
 AGL_EXTRA_IMAGE_FSTYPES ?= ""
 
 # important settings imported from poky-agl.conf
-# we do not import 
-DISTRO_FEATURES:append = " systemd"
+# we cannot import the distro config right away
+# as the initial values are poky only till the layer
+# is added in
+
+AGL_DEFAULT_DISTRO_FEATURES = "usrmerge largefile opengl wayland pam bluetooth bluez5 3g polkit"
+DISTRO_FEATURES:append = " systemd wayland pam \${AGL_DEFAULT_DISTRO_FEATURES}"
 DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
 EOF
 
-
-yocto-check-layer \
+yocto-check-layer --no-auto-dependency \
 	--dependency \
-	    $AGLROOT/external/meta-openembedded/meta-oe \
-	    $AGLROOT/external/meta-openembedded/meta-python \
-	    $AGLROOT/external/meta-openembedded/meta-networking \
+	$AGLROOT/external/meta-openembedded/meta-oe \
+	$AGLROOT/external/meta-openembedded/meta-python \
+	$AGLROOT/external/meta-openembedded/meta-networking \
 	-- \
-	$AGLROOT/meta-agl/meta-netboot/
+	$AGLROOT/meta-agl/meta-netboot
 
 
 [ $? = 0 ] && rm -rf ${TMPROOT}/testbuild-ycl
+
+exit 0
-- 
cgit 1.2.3-korg