From 910541b2b933f4a437ea83ec3ec19242a41a3630 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Sun, 9 Jun 2019 23:11:58 +0200 Subject: Supporting commits for the switch to pipewire MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We move all components around meta-audio-soundmanager-framework to that layer (still kept on request). We deprecate the meta-audio-4a-framework layer for Happy Halibut. Bug-AGL: SPEC-2473 Change-Id: I2a7c9d815801a3f8ea80943165ea6fd1422533ea Signed-off-by: Jan-Simon Möller --- .../4a-hal-device-config-alternatives.README | 3 -- .../4a-hal-device-config-alternatives.bbexample | 57 --------------------- .../4a-hal-device-config.README | 4 -- .../4a-hal-device-config/4a-hal-device-config.bb | 58 ---------------------- .../4a-hal-vendor-config.README | 3 -- .../4a-hal-vendor-config.bbexample | 46 ----------------- .../4a-hal-device-config/files/deploy-hal-udev.sh | 4 -- .../files/udev-sample-rule.rules | 1 - 8 files changed, 176 deletions(-) delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config-alternatives.README delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config-alternatives.bbexample delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config.README delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config.bb delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-vendor-config.README delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-vendor-config.bbexample delete mode 100755 meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/files/deploy-hal-udev.sh delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/files/udev-sample-rule.rules (limited to 'meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config') diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config-alternatives.README b/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config-alternatives.README deleted file mode 100644 index 689f9bf8..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config-alternatives.README +++ /dev/null @@ -1,3 +0,0 @@ -This is a sample on how the update-alternative system can be used to select -the highest priority hal given. -Downside ... always only one file is possible in the etc folder. No HAL_LIST. diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config-alternatives.bbexample b/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config-alternatives.bbexample deleted file mode 100644 index 3bafc3bb..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config-alternatives.bbexample +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "4A - Generic HAL device configuration" -DESCRIPTION = "Generic HAL device configuration in 4A (AGL Advanced Audio Agent)" -HOMEPAGE = "https://git.automotivelinux.org/src/4a-hal-configs/" -SECTION = "apps" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/src/4a-hal-configs;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "45f205076573a858348c10a52d31382f31deaf55" - -PV = "0.1+git${SRCPV}" -S = "${WORKDIR}/git" - -# The package is machine-specific due to variable config content -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit afb-system update-alternative -# This defines INSTALL_PREFIX = "/usr/libexec/agl/" - -# no configure needed -do_configure[noexec] = "1" -# no compile needed -do_compile[noexec] = "1" - - -# when no specific HAL is defined, use a generic usb one -4A_DEFAULT_HAL ??= "2ch-generic-usb" - -# for specific machines, activate only known HAL -4A_DEFAULT_HAL_m3ulcb ?= "rcar-m3" -# Downside: only one file at a time! -4A_DEFAULT_HAL_h3ulcb ?= "rcar-m3" -4A_DEFAULT_HAL_intel-corei7-64 ?= "intel-minnow" -4A_DEFAULT_HAL_qemux86-64 ?= "intel-qemu" - -# Due to bug SPEC-1610, default hal for RPI3 is not active yet -# 4A_DEFAULT_HAL_raspberrypi3 ?= "raspberry-pi-3" - -do_install () { - # get pkgdir for 4a-hal - PKGDIR=${D}/${INSTALL_PREFIX}/4a-hal - - install -d -m 0755 ${PKGDIR}/etc.available - cp -ar ${S}/*/*.json ${PKGDIR}/etc.available/ - chown -R root:root ${PKGDIR}/ -} - -# we define a '4a-default-hal' alternative with a low default priority -# you can deploy your own hal with a higher prio -ALTERNATIVE_${PN} = "4a-default-hal" -ALTERNATIVE_PRIORITY = "10" -ALTERNATIVE_LINK_NAME[4a-default-hal] = "${INSTALL_PREFIX}/4a-hal/etc/4a-default-hal.json" -ALTERNATIVE_TARGET[4a-default-hal] = "${INSTALL_PREFIX}/4a-hal/etc.available/hal-4a-${4A_DEFAULT_HAL}.json" - - -RPROVIDES_${PN} += "virtual/4a-default-hal" \ No newline at end of file diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config.README b/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config.README deleted file mode 100644 index 602486a4..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config.README +++ /dev/null @@ -1,4 +0,0 @@ -To keep it simple. - -Just expose 4A_HAL_LIST as-is to conf/local.conf so the user can actually choose any json file. - diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config.bb b/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config.bb deleted file mode 100644 index e504c3da..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-device-config.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "4A - Generic HAL device configuration" -DESCRIPTION = "Generic HAL device configuration in 4A (AGL Advanced Audio Agent)" -HOMEPAGE = "https://git.automotivelinux.org/src/4a-hal-configs/" -SECTION = "apps" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/src/4a-hal-configs;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "fdf0e3c4c67ceb5ddc77c9c1f27d85c1be2055a6" - -PV = "0.1+git${SRCPV}" -S = "${WORKDIR}/git" - -# The package is machine-specific due to variable config content -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit afb-system -# This defines INSTALL_PREFIX = "/usr/libexec/agl/" - -# no configure needed -do_configure[noexec] = "1" - -# no compile needed -do_compile[noexec] = "1" - -# when no specific HAL is defined, use a generic usb one -4A_HAL_LIST ??= "2ch-generic-usb" - -# for specific machines, activate only known HALs -4A_HAL_LIST_m3ulcb ?= "rcar-m3 rcar-m3kf" -4A_HAL_LIST_h3ulcb ?= "rcar-m3 rcar-m3kf" -4A_HAL_LIST_intel-corei7-64 ?= "intel-minnow intel-upsquared-hdmi" -4A_HAL_LIST_qemux86-64 ?= "intel-qemu" - -# Due to bug SPEC-1610, default hal for RPI3 is not active yet -# 4A_HAL_LIST_raspberrypi3 ?= "raspberry-pi-3" - -do_install () { - - # get pkgdir for 4a-hal - PKGDIR=${D}/${INSTALL_PREFIX}/4a-hal - - install -d -m 0755 ${PKGDIR} - install -d -m 0755 ${PKGDIR}/etc - install -d -m 0755 ${PKGDIR}/etc.available - - cp -ar ${S}/*/*.json ${PKGDIR}/etc.available/ - chown -R root:root ${PKGDIR}/etc.available - - for x in ${4A_HAL_LIST}; do - hal=hal-4a-$x.json - cp -v $PKGDIR/etc.available/${hal} $PKGDIR/etc/ - done -} - - -RPROVIDES_${PN} += "virtual/4a-default-hal" diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-vendor-config.README b/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-vendor-config.README deleted file mode 100644 index 29531ccd..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-vendor-config.README +++ /dev/null @@ -1,3 +0,0 @@ -This is a sample how a vendor can: -- inject his own hal (as file hal-4a-myhal.json) -- set PREFERRED_RPROVIDER_virtual/4a-default-hal = "4a-hal-vendor-config" on conf/local.conf diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-vendor-config.bbexample b/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-vendor-config.bbexample deleted file mode 100644 index 105ab1fa..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/4a-hal-vendor-config.bbexample +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "4A - Vendor HAL device configuration" -DESCRIPTION = "Vendor HAL device configuration in 4A (AGL Advanced Audio Agent)" -HOMEPAGE = "https://example.com/" -SECTION = "apps" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI = "file://hal-4a-myhal.json" - -PV = "0.1" -S = "${WORKDIR}/" - -# The package is machine-specific due to variable config content -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit afb-system -# This defines INSTALL_PREFIX = "/usr/libexec/agl/" - -# no configure needed -do_configure[noexec] = "1" - -# no compile needed -do_compile[noexec] = "1" - -# use our local hal -4A_HAL_LIST = "myhal" - -do_install () { - - # get pkgdir for 4a-hal - PKGDIR=${D}/${INSTALL_PREFIX}/4a-hal - - install -d -m 0755 ${PKGDIR}/etc.available - - cp -ar ${S}/*.json ${PKGDIR}/etc.available/ - chown -R root:root ${PKGDIR}/etc.available - - for x in ${4A_HAL_LIST}; do - hal=hal-4a-$x.json - cp -v $PKGDIR/etc.available/${hal} $PKGDIR/etc/ - done -} - - -RPROVIDES_${PN} += "virtual/4a-default-hal" \ No newline at end of file diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/files/deploy-hal-udev.sh b/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/files/deploy-hal-udev.sh deleted file mode 100755 index f031d58b..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/files/deploy-hal-udev.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -rm /usr/libexec/agl/4a-hal/etc/* -cp /usr/libexec/agl/4a-hal/etc.available/$i /usr/libexec/agl/4a-hal/etc/ diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/files/udev-sample-rule.rules b/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/files/udev-sample-rule.rules deleted file mode 100644 index d2d16a17..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-device-config/files/udev-sample-rule.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", SUBSYSTEM=="usb", SOMEOTHERMATCH="bar", RUN+="/usr/bin/deploy-hal-udev.sh hal-4a-greenbox.json" -- cgit 1.2.3-korg