diff options
6 files changed, 4 insertions, 130 deletions
diff --git a/meta-agl-profile-graphical-html5/conf/layer.conf b/meta-agl-profile-graphical-html5/conf/layer.conf index bd0b18d7..d499dd17 100644 --- a/meta-agl-profile-graphical-html5/conf/layer.conf +++ b/meta-agl-profile-graphical-html5/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "html5-framework" BBFILE_PATTERN_html5-framework = "^${LAYERDIR}/" BBFILE_PRIORITY_html5-framework = "80" -LAYERSERIES_COMPAT_html5-framework = "zeus" +LAYERSERIES_COMPAT_html5-framework = "dunfell" diff --git a/meta-agl-profile-graphical-html5/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils b/meta-agl-profile-graphical-html5/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils deleted file mode 100644 index 495601f0..00000000 --- a/meta-agl-profile-graphical-html5/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils +++ /dev/null @@ -1,45 +0,0 @@ -## ----------------------------------------------------------------------- -## -## Copyright 2001-2008 H. Peter Anvin - All Rights Reserved -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, Inc., 53 Temple Place Ste 330, -## Boston MA 02111-1307, USA; either version 2 of the License, or -## (at your option) any later version; incorporated herein by reference. -## -## ----------------------------------------------------------------------- - -INCLUDES = -I. -I../vboxsf -I../vboxsf/include -MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ - -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -CFLAGS = ${INCLUDES} ${MOD_DEFS} -LDFLAGS = - -SRCS = mount.vboxsf.c \ - vbsfmount.c - -OBJS = $(patsubst %.c,%.o,$(notdir $(SRCS))) - -.SUFFIXES: .c .o .i .s .S - - -all: mount.vboxsf - -clean: - -rm -f *.o mount.vboxsf - -spotless: clean - -rm -f *~ - -mount.vboxsf: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $^ - -%.o: %.c - $(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $< -%.i: %.c - $(CC) $(UMAKEDEPS) $(CFLAGS) -E -o $@ $< -%.s: %.c - $(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $< - --include .*.d *.tmp diff --git a/meta-agl-profile-graphical-html5/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb b/meta-agl-profile-graphical-html5/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb deleted file mode 100644 index 62c2b509..00000000 --- a/meta-agl-profile-graphical-html5/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb +++ /dev/null @@ -1,81 +0,0 @@ -SUMMARY = "VirtualBox Linux Guest Drivers" -SECTION = "core" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -DEPENDS = "virtual/kernel" - -inherit module kernel-module-split - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" - -VBOX_NAME = "VirtualBox-${PV}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ - file://Makefile.utils \ -" -SRC_URI[md5sum] = "f4f42fd09857556b04b803fb99cc6905" -SRC_URI[sha256sum] = "4326576e8428ea3626194fc82646347576e94c61f11d412a669fc8a10c2a1e67" - -S = "${WORKDIR}/vbox_module" - -export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" - -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" - -# otherwise 5.2.22 builds just vboxguest -MAKE_TARGETS = "all" - -addtask export_sources after do_patch before do_configure - -do_export_sources() { - mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz - tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz - - # add a mount utility to use shared folder from VBox Addition Source Code - mkdir -p "${S}/utils" - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils - install ${S}/../Makefile.utils ${S}/utils/Makefile - -} - -do_configure_prepend() { - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in <version>/build, or the variable KERN_VER must be set. Stop. - mkdir -p ${WORKDIR}/${KERNEL_VERSION} - ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build -} - -# compile and install mount utility -do_compile() { - oe_runmake all - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils - if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then - echo "ERROR: One of vbox*.ko modules wasn't built" - exit 1 - fi -} - -module_do_install() { - MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc - install -d $MODULE_DIR - install -m 644 vboxguest.ko $MODULE_DIR - install -m 644 vboxsf.ko $MODULE_DIR - install -m 644 vboxvideo.ko $MODULE_DIR -} - -do_install_append() { - install -d ${D}${base_sbindir} - install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} -} - -PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" - -FILES_${PN} = "${base_sbindir}" - -# autoload if installed -KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-pipewire/conf/layer.conf b/meta-pipewire/conf/layer.conf index b3059230..68113221 100644 --- a/meta-pipewire/conf/layer.conf +++ b/meta-pipewire/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "meta-pipewire" BBFILE_PATTERN_meta-pipewire = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-pipewire = "71" -LAYERSERIES_COMPAT_meta-pipewire = "zeus" +LAYERSERIES_COMPAT_meta-pipewire = "dunfell" diff --git a/meta-speech-framework/conf/layer.conf b/meta-speech-framework/conf/layer.conf index 804eae66..b3f004ce 100644 --- a/meta-speech-framework/conf/layer.conf +++ b/meta-speech-framework/conf/layer.conf @@ -24,4 +24,4 @@ BBFILE_COLLECTIONS += "speech-framework" BBFILE_PATTERN_speech-framework = "^${LAYERDIR}/" BBFILE_PRIORITY_speech-framework = "8" -LAYERSERIES_COMPAT_speech-framework = "zeus" +LAYERSERIES_COMPAT_speech-framework = "dunfell" diff --git a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc index 1a18e8ff..dc6c1f6e 100644 --- a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc +++ b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc @@ -11,4 +11,4 @@ BBFILES += "${METADIR}/external/alexa-auto-sdk/extensions/experimental/gstreamer # For now, tweak the layer's compatibility to allow using with zeus, # since we know it works without major issues. -LAYERSERIES_COMPAT_aac_append = " zeus"
\ No newline at end of file +LAYERSERIES_COMPAT_aac_append = " dunfell"
\ No newline at end of file |