From fd78578b11990bc885651c52690dbcf9169bd7ac Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Fri, 7 Dec 2018 15:50:58 +0100 Subject: Move hal configuration files into own repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... and own recipe This allows to manage the various types of configuration files independently of the source code as these might not always fit into the git repo context-wise. Initial recipe is 4a-hal-device-config.bb . This is re-using the same mechanism as previously used. Samples for alternative implementations and vendor hals are included as well to explore improved ways of handling the multipe configuration files possible. Bug-AGL: SPEC-2011 Change-Id: Ib04b5c4e7b764bed85dbceb50a62a8c6fd031c5a Signed-off-by: Jan-Simon Möller --- .../4a-hal-generic/4a-hal-generic_git.bb | 35 +++------------------- 1 file changed, 4 insertions(+), 31 deletions(-) (limited to 'meta-audio-4a-framework/recipes-multimedia/4a-hal-generic') diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb b/meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb index 264ba951..4b183883 100644 --- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb +++ b/meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb @@ -16,39 +16,12 @@ S = "${WORKDIR}/git" inherit afb-system-cmake -# FIXME: -#FILES_${PN}-dev += "${INSTALL_PREFIX}/4a-hal/htdocs" -#FILES_${PN} += "${INSTALL_PREFIX}/afb-aaaa" -#FILES_${PN} += "${INSTALL_PREFIX}/lib" - -# The package is machine-specific due to variable config content -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# 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" - -### TODO: this list should be completed for more machines - do_install_append () { # get pkgdir - note that '4a-hal' comes from project ${project_git_repo}/conf.d/cmake/config.cmake PKGDIR=${D}/${INSTALL_PREFIX}/4a-hal - # move all config files to a 'available' dir - mv $PKGDIR/etc $PKGDIR/etc.available - - # then install only required hals files in the etc folder - mkdir -p $PKGDIR/etc - for x in ${4A_HAL_LIST}; do - hal=hal-4a-$x.json - mv -v $PKGDIR/etc.available/${hal} $PKGDIR/etc/ - done + # transition: provided by separate package + rm -rf $PKGDIR/etc } + +RDEPENDS_${PN} += "virtual/4a-default-hal" -- cgit 1.2.3-korg