diff options
-rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend | 5 | ||||
-rw-r--r-- | meta-agl-core/conf/distro/poky-agl.conf | 10 | ||||
-rw-r--r-- | meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.20.bbappend (renamed from meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.16.bbappend) | 0 | ||||
-rwxr-xr-x | scripts/.aglsetup_genconfig.bash | 6 |
4 files changed, 13 insertions, 8 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend new file mode 100644 index 000000000..28160530b --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend @@ -0,0 +1,5 @@ +RDEPENDS_${PN}_append_rcar-gen3 = "\ + ${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-multimedia-kernel-modules','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-multimedia-libs','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-gstreamer1.0-plugins','',d)} \ + " diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index 0301fa093..f72553af2 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -8,10 +8,10 @@ DISTRO_NAME = "Automotive Grade Linux" # Release flags DISTRO_CODENAME = "koi" AGL_BRANCH = "koi" -AGLVERSION = "11.0.4" +AGLVERSION = "11.0.5" # switch devel/release -#AGLRELEASETYPE ?= "agldevelopment" -AGLRELEASETYPE ?= "aglrelease" +AGLRELEASETYPE ?= "agldevelopment" +#AGLRELEASETYPE ?= "aglrelease" OVERRIDES .= ":${AGLRELEASETYPE}" # @@ -40,10 +40,10 @@ INHERIT += "reproducible_build" SDK_VENDOR = "-aglsdk" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" -# SDKPATH is the folder where the SDK is going to be installed +# SDKPATHINSTALL is the folder where the SDK is going to be installed # Due to an issue with the qt5 environment (see SPEC-1667), # we add DEFAULTTUNE to the SDKPATH to mitigate the issue. -SDKPATH = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}" +SDKPATHINSTALL = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}" MAINTAINER = "AGL https://lists.automotivelinux.org/g/agl-dev-community" diff --git a/meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.16.bbappend b/meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.20.bbappend index 028c734aa..028c734aa 100644 --- a/meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.16.bbappend +++ b/meta-app-framework/recipes-core/dbus-cynagora/dbus_1.12.20.bbappend diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index b9f4e5e94..cf06622ba 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -223,15 +223,15 @@ function append_fragment() { echo >>$basefile echo "# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #" >>$basefile echo "# fragment { " >>$basefile - [[ -f $f ]] && echo "# $f" >>$basefile || true + [[ -n $f ]] && echo "# $f" >>$basefile || true echo "#" >>$basefile [[ -n "$label" ]] && echo "$label" >>$basefile - [[ -f $f ]] && cat $f >>$basefile || true + [[ -n $f ]] && cat $f >>$basefile || true echo "" >>$basefile echo "#" >>$basefile echo "# }" >>$basefile echo "# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #" >>$basefile - [[ -f $f ]] && echo $f >>$BUILDDIR/conf/fragments.log || true + [[ -n $f ]] && echo $f >>$BUILDDIR/conf/fragments.log || true } function execute_setup() { |