diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-05-11 13:02:46 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-05-30 14:14:11 +0000 |
| commit | 5237004c476955be7fb266c7edf4b526f40eb41c (patch) | |
| tree | 9c756805bb2e4369589d2654a81c468a244a582f /meta-agl-core/scripts | |
| parent | 6e6c06eb48b2221418eecce4a46de1146a2063ef (diff) | |
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
Diffstat (limited to 'meta-agl-core/scripts')
| -rwxr-xr-x | meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh | 46 | ||||
| -rwxr-xr-x | meta-agl-core/scripts/run-yocto-check-layer.sh | 18 |
2 files changed, 8 insertions, 56 deletions
diff --git a/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh b/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh deleted file mode 100755 index e0e9d17a4..000000000 --- a/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh +++ /dev/null @@ -1,46 +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" - -AGL_FEATURES += "aglcore" - -EOF - - -yocto-check-layer \ - --dependency \ - $AGLROOT/external/meta-openembedded/meta-oe \ - -- \ - $AGLROOT/meta-agl/meta-agl-core - - -[ $? = 0 ] && rm -rf ${TMPROOT}/testbuild-ycl - -exit 0 - - --dependency \ - $AGLROOT/external/meta-openembedded/meta-oe \ - $AGLROOT/external/meta-openembedded/meta-python \ - $AGLROOT/external/meta-openembedded/meta-networking \ diff --git a/meta-agl-core/scripts/run-yocto-check-layer.sh b/meta-agl-core/scripts/run-yocto-check-layer.sh index 4f1175241..cd9364682 100755 --- a/meta-agl-core/scripts/run-yocto-check-layer.sh +++ b/meta-agl-core/scripts/run-yocto-check-layer.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -x +#set -x SCRIPTPATH="$( cd $(dirname $0) >/dev/null 2>&1 ; pwd -P )" echo $SCRIPTPATH @@ -19,15 +19,18 @@ AGL_FEATURES ?= "" AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf -# we do not import -DISTRO_FEATURES:append = " systemd wayland pam" +# we cannot import the distro config right away +# as the initial values are poky only till the layer +# is added in +# no polkit ! +AGL_DEFAULT_DISTRO_FEATURES = "usrmerge largefile opengl wayland pam bluetooth bluez5 3g" +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 \ -- \ $AGLROOT/meta-agl/meta-agl-core @@ -35,8 +38,3 @@ yocto-check-layer \ [ $? = 0 ] && rm -rf ${TMPROOT}/testbuild-ycl exit 0 - - --dependency \ - $AGLROOT/external/meta-openembedded/meta-oe \ - $AGLROOT/external/meta-openembedded/meta-python \ - $AGLROOT/external/meta-openembedded/meta-networking \ |