X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Frun-yocto-check-layer.sh;h=0f8e8f973ccc0a9ed528873b4c19650c66a6dd8d;hb=HEAD;hp=88174820c3b0b413fca87c1544c24409cdffe31e;hpb=4249268041b879b3d2bae338d5de88f4f2d54b26;p=AGL%2Fmeta-agl-demo.git diff --git a/scripts/run-yocto-check-layer.sh b/scripts/run-yocto-check-layer.sh index 88174820c..0f8e8f973 100755 --- a/scripts/run-yocto-check-layer.sh +++ b/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,22 +19,40 @@ AGL_FEATURES ?= "" AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf -# we do not import -DISTRO_FEATURES:append = " systemd smack" +# 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" -# workaround: -# ERROR: Nothing PROVIDES 'smack' (but /home/dl9pf/AGL/master-newlayout/external/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb DEPENDS on or otherwise requires it) -BBMASK += "meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb" +# required by meta-flutter/recipes-graphics/toyota/flutter-auto_git.bb" +LICENSE_FLAGS_ACCEPTED += "commercial" -EOF +# Need to ignore as we have more recent version +# meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb +BBMASK += "meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_*" + +# due to this, we also ignore: +BBMASK += "meta-oe/recipes-support/remmina/remmina_* meta-oe/recipes-graphics/x11vnc/x11vnc_* " -yocto-check-layer \ +EOF + +yocto-check-layer --no-auto-dependency \ --dependency \ - $AGLROOT/external/meta-openembedded/meta-oe \ $AGLROOT/meta-agl/meta-agl-core \ + $AGLROOT/meta-agl/meta-app-framework \ + $AGLROOT/external/meta-openembedded/meta-oe \ + $AGLROOT/external/meta-openembedded/meta-python \ + $AGLROOT/external/meta-openembedded/meta-networking \ + $AGLROOT/external/meta-openembedded/meta-multimedia \ + $AGLROOT/external/meta-flutter \ + $AGLROOT/external/meta-flutter/meta-flutter-apps \ + $AGLROOT/external/meta-qt5 \ + $AGLROOT/external/meta-clang \ -- \ $AGLROOT/meta-agl-demo @@ -42,8 +60,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 \