diff options
Diffstat (limited to 'meta-app-framework/scripts')
-rwxr-xr-x | meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh | 51 | ||||
-rwxr-xr-x | meta-app-framework/scripts/run-yocto-check-layer.sh | 40 |
2 files changed, 17 insertions, 74 deletions
diff --git a/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh b/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh deleted file mode 100755 index 37d2f5615..000000000 --- a/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh +++ /dev/null @@ -1,51 +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="/tmp" - -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 smack" -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" -VIRTUAL-RUNTIME_init_manager = "systemd" - -# skip unnecessary in yocto-check-layer - aka FIXME upstream -BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb" -BBMASK += "packagegroup-core-security-ptest.bb" - -# missing in upstream recipes ... aka FIXME upstream -BBCLASSEXTEND_pn-libzip = "native nativesdk" -BBCLASSEXTEND_pn-xmlsec1 = "native nativesdk" - -DISTRO_FEATURES_append = " appfw smack " - -EOF - - -yocto-check-layer \ - --dependency $AGLROOT/external/meta-openembedded/meta-oe \ - $AGLROOT/external/meta-security \ - $AGLROOT/external/meta-openembedded/meta-python \ - $AGLROOT/external/meta-openembedded/meta-networking \ - $AGLROOT/external/meta-openembedded/meta-perl \ - $AGLROOT/external/meta-qt5/ \ - -- \ - $AGLROOT/meta-agl/meta-app-framework/ - -[ $? = 0 ] && rm -rf ${TMPROOT}/testbuild-ycl - - diff --git a/meta-app-framework/scripts/run-yocto-check-layer.sh b/meta-app-framework/scripts/run-yocto-check-layer.sh index 3b19cd012..cbe35ed8d 100755 --- a/meta-app-framework/scripts/run-yocto-check-layer.sh +++ b/meta-app-framework/scripts/run-yocto-check-layer.sh @@ -1,10 +1,11 @@ #!/bin/bash -set -x +#set -x + SCRIPTPATH="$( cd $(dirname $0) >/dev/null 2>&1 ; pwd -P )" echo $SCRIPTPATH AGLROOT="$SCRIPTPATH/../../.." POKYDIR="$AGLROOT/external/poky" -TMPROOT="/tmp" +TMPROOT=`mktemp -d` rm -rf ${TMPROOT}/testbuild-ycl || true mkdir -p ${TMPROOT}/testbuild-ycl @@ -18,32 +19,25 @@ AGL_FEATURES ?= "" AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf -# we do not import -DISTRO_FEATURES_append = " systemd smack" -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" -VIRTUAL-RUNTIME_init_manager = "systemd" - -# skip unnecessary in yocto-check-layer - aka FIXME upstream -BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb" -BBMASK += "packagegroup-core-security-ptest.bb" +# we cannot import the distro config right away +# as the initial values are poky only till the layer +# is added in -# missing in upstream recipes ... aka FIXME upstream -BBCLASSEXTEND_pn-libzip = "native nativesdk" -BBCLASSEXTEND_pn-xmlsec1 = "native nativesdk" +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 --no-auto-dependency \ + --dependency \ + $AGLROOT/meta-agl/meta-agl-core \ + $AGLROOT/external/meta-openembedded/meta-oe \ + -- \ + $AGLROOT/meta-agl/meta-app-framework -yocto-check-layer \ - --dependency $AGLROOT/external/meta-openembedded/meta-oe \ - $AGLROOT/external/meta-security \ - $AGLROOT/external/meta-openembedded/meta-python \ - $AGLROOT/external/meta-openembedded/meta-networking \ - $AGLROOT/external/meta-openembedded/meta-perl \ - $AGLROOT/external/meta-qt5/ \ - -- \ - $AGLROOT/meta-agl/meta-app-framework/ [ $? = 0 ] && rm -rf ${TMPROOT}/testbuild-ycl - +exit 0 |