From patchwork Tue Jun 12 12:46:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 138342 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5306216lji; Tue, 12 Jun 2018 05:46:27 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIha/tI3ebbIpA1+YRM4ouhuZ5V3DN85Q8wLL5jEzCLMrewZXZoVM4GJj8UM9vvAomQOjwJ X-Received: by 2002:a17:902:d24:: with SMTP id 33-v6mr304846plu.22.1528807587575; Tue, 12 Jun 2018 05:46:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528807587; cv=none; d=google.com; s=arc-20160816; b=itBdOFch7KAHRryr6fx9sudCabHJ/SdpPcxrQCRKbtlq0Xg5QbrjgXD9rDhsEuhrqi G/7WgCePFj7QLfX2TvQs7WZqL0Cx1NHiYUKbWNH5YZ+aCJ90qbvkfnEqDFtrkHUwUAGv prn7n0yZFyXrV36bhS09PV3xrdxkTsosan1HglVVsR2Nfs8ly2KQZZ6voTdu7Gs6b2k8 ++bPRJSCqIyE+FrlGUvZdK/PGLkFvP3+tbFZsuC7N/m4vDnGT9OIBN9U2qEnu16789ja iG0ferskuRYHKsehBz+LBmy9JwgoyBPDdQSO6hYHtRdmpM3KNxnL1G9InC2yHKRvnnuM +MMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=T4lF0sj8jMBUIBnKYwYFFCmxYdN/KKUaiavw1f4K+J0=; b=Z0S036gEI7ZK1u5lwOx8Bc8kMvsWrGRzvQhzzzeHGKfNy6I3BcxwrJ+A4Ww6BwYNSP xy9sTn3p0mcCSsTgEGy1CbqcNdaIYd8FYMZyipVejKoWZcHyznOomkbcU+VZkqQqeACt +mBCioM9lWQUGtQlNKiK3PW8UMRyajO/RQ9a06g8xze7RMCIdr8NHjOVcitWFXVFiyPm mOa8euyId7JCsnyHIDM6mUizXexqvZrnGsxs2VyomL0X+i2kgdgePIoSLuLnObqPHk97 i6Xgai060xvIXN9bLY2370THmK9exjRr1SROHsr17eoSneOe3R28yTlsMeRaESFNibwr Rn+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=cfgtLb7W; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b62-v6si89493pfm.104.2018.06.12.05.46.27; Tue, 12 Jun 2018 05:46:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=cfgtLb7W; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5E6F678E59; Tue, 12 Jun 2018 12:46:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by mail.openembedded.org (Postfix) with ESMTP id D68B778B53 for ; Tue, 12 Jun 2018 12:46:21 +0000 (UTC) Received: by mail-wr0-f180.google.com with SMTP id f16-v6so23955853wrm.3 for ; Tue, 12 Jun 2018 05:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=+PWDk94oyS7BClPDprAs5wPu0zhhP9tis22BpXYhvBI=; b=cfgtLb7WnRZSe0UgxiRdV3gyy6Yx68iAnS6BaUI87rb/wkCShb0jZcTvdoLVnVb4ao Wux2K+ZIAlTGPlGkPUAsFwvHuGyQ367+46MIrt9MWUlbcsDSLOpycAWRbAIaCvfc/drQ zExQK0SF8ZluGoyYMaGv+B2uke+bC3343ukLyxpqrPbaCF/avi5m/98JM7TYn6Dz2TAC k0ggL1pIfu01U8jN2fK5ZqWDHce9tFfTyWMkfZTBDnQ6LM3FwTpZXQWHuONe1LS6O2xM c1NdXcloceR+wm9HKQHxWteCcSsqly2BGdItp7OeenEHDVBf/2WsE4ufZ4NGYV3XSfTf U5oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=+PWDk94oyS7BClPDprAs5wPu0zhhP9tis22BpXYhvBI=; b=al+JshTbtlxO0+S701x5g9ZeIEhuA0P/iJF4269suGCxJ6zWUpmW2JRkzcruLtP3/K SNVyxEpuHu0eDQ6KBJ2g6R7SM6gsne+cvFGVA9ji0xLd00irSYhHU6vFysKmliuaQToJ EgSaNCw/4JF/neFAal09KKKbLcSxe5ji6rhDFUcNhUEEdskfviCNqzv9KOZ1mFVBnbG1 kq6ZSskMCue6lzr+9bLb62a+00h3SjQuqrbQyKzno/Z4CSKOrC/A7rIi4c8DgvHNFnCx UWfuiXMFSkEH4A8jmJcRLIz/mdgjXrLAzTEhCbweM/+7xH5MYbnFOE774TnSXOXfFPOz JlHg== X-Gm-Message-State: APt69E15wKqB4RgG/gxNB6W7bO2od8UwWLstIEsza95On3p00m24Hig4 u7owfwoPFfVjOtBRXQPJj+UPD1aD X-Received: by 2002:adf:e687:: with SMTP id r7-v6mr215773wrm.14.1528807582034; Tue, 12 Jun 2018 05:46:22 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id 63-v6sm520250wmv.48.2018.06.12.05.46.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 05:46:20 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 12 Jun 2018 13:46:18 +0100 Message-Id: <20180612124618.25055-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] alsa-tools: rewrite packaging X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org alsa-tools is actually a collection of 20 separate tools, each with their own configure scripts. The dependencies are varied, old, and estoric (FLTK, GTK+ 1, 2, and 3, PyGTK 2, Qt3). Instead of maintaining patches to try and pick a subset that builds, use PACKAGECONFIG and some magic to build what the user requests. By default we build all the tools which have no dependencies, and the tools which need GTK+ 2 or GTK+ 3 if the relevant DISTRO_FEATURES are enabled. Add a patch to fix the build of ld10k1 with musl. The ncurses build dependency doesn't seem to be checked for, so remove that. Signed-off-by: Ross Burton --- ...g-Wreserved-user-defined-literal-warnings.patch | 14 +++- .../alsa/alsa-tools/autotools.patch | 44 ----------- .../alsa/alsa-tools/gitcompile_hdajacksensetest | 13 --- .../alsa/alsa-tools/makefile_no_gtk.patch | 29 ------- meta/recipes-multimedia/alsa/alsa-tools/musl.patch | 47 +++++++++++ meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb | 92 +++++++++++++++------- 6 files changed, 119 insertions(+), 120 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/autotools.patch delete mode 100755 meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-tools/musl.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch index 2290915eab8..c137bc8a284 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch @@ -1,14 +1,18 @@ -From 2e48e4045e1e951433da0ca4b1e49798eedde14f Mon Sep 17 00:00:00 2001 +Upstream-Status: Backport +Signed-off-by: Khem Raj + +From a861bdabf02cd9bfb3ec7c0571c563c0fa14adfb Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Tue, 24 Apr 2018 12:21:18 -0700 -Subject: [PATCH] Fix clang -Wreserved-user-defined-literal warnings +Date: Tue, 24 Apr 2018 12:24:32 -0700 +Subject: [PATCH] us428control: Fix clang -Wreserved-user-defined-literal + warnings | us428control.cc:66:18: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] | printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); | ^ -Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10360805/] Signed-off-by: Khem Raj +Signed-off-by: Takashi Iwai --- us428control/us428control.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -26,3 +30,5 @@ index e839bf4..8cb3c42 100644 printf("mode is one of (us224, us428, mixxx)\n"); } /* +-- +1.7.11.7 diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch deleted file mode 100644 index c85834a593c..00000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b9a65bf3ba5628cfe8cfd2d10ce2dcf11a606775 Mon Sep 17 00:00:00 2001 -From: Dongxiao Xu -Date: Thu, 14 Jul 2011 15:40:36 +0800 -Subject: [PATCH] alsa-tools: Fix recipe build error. - -Add parameters to autoreconf to support cross compile. -Remove some sub-components which needs further recipe support. - -Signed-off-by: Dongxiao Xu - -Upstream-Status: Inappropriate [configuration] - ---- - Makefile | 4 ++-- - ld10k1/gitcompile | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index c32bf25..1119372 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,8 @@ - VERSION = 1.1.6 - TOP = . --SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ -+SUBDIRS = as10k1 envy24control \ - mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ -- us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ -+ us428control usx2yloader vxloader echomixer \ - hwmixvolume hdajackretask hda-verb hdajacksensetest - - all: -diff --git a/ld10k1/gitcompile b/ld10k1/gitcompile -index 99429ac..20005d9 100755 ---- a/ld10k1/gitcompile -+++ b/ld10k1/gitcompile -@@ -1,6 +1,6 @@ - #!/bin/bash - --autoreconf -fi || exit 1 -+autoreconf $ACLOCAL_FLAGS -fi || exit 1 - export CFLAGS='-O2 -Wall -pipe -g' - echo "CFLAGS=$CFLAGS" - echo "./configure $@" diff --git a/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest b/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest deleted file mode 100755 index 58328bd3a50..00000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -aclocal $ACLOCAL_FLAGS || exit 1 -automake --foreign --add-missing || exit 1 -autoconf || exit 1 -export CFLAGS='-O2 -Wall -pipe -g' -echo "CFLAGS=$CFLAGS" -echo "./configure $@" -./configure $@ || exit 1 -unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then - make || exit 1 -fi diff --git a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch deleted file mode 100644 index 54373d1a8f3..00000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch +++ /dev/null @@ -1,29 +0,0 @@ -Remove some sub-components which need gtk+. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Rogerio Nunes -Signed-off-by: Otavio Salvador - -Update patch for alsa-tools 1.0.29 - -Signed-off-by: Kai Kang - -diff --git a/Makefile b/Makefile -index 2457a1c..72346d9 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,9 @@ - VERSION = 1.1.5 - TOP = . --SUBDIRS = as10k1 envy24control \ -- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ -- us428control usx2yloader vxloader echomixer \ -- hwmixvolume hdajackretask hda-verb hdajacksensetest -+SUBDIRS = as10k1 \ -+ mixartloader pcxhrloader sb16_csp seq sscape_ctl \ -+ us428control usx2yloader vxloader \ -+ hwmixvolume hda-verb hdajacksensetest - - all: - @for i in $(SUBDIRS); do \ diff --git a/meta/recipes-multimedia/alsa/alsa-tools/musl.patch b/meta/recipes-multimedia/alsa/alsa-tools/musl.patch new file mode 100644 index 00000000000..9eb129c379e --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools/musl.patch @@ -0,0 +1,47 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 235d9c5e8381518b0a8661786e7e0cbdd1bbcd01 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 12 Jun 2018 13:24:34 +0100 +Subject: [PATCH] ld10k1: define _GNU_SOURCE and use sighandler_t + +__sighandler_t is a glibc internal type which doesn't exist in musl. By using +AC_USE_SYSTEM_EXTENSIONS to get _GNU_SOURCE defined, both glibc and musl +then expose sighandler_t. + +Signed-off-by: Ross Burton +Signed-off-by: Takashi Iwai +--- + ld10k1/configure.ac | 1 + + ld10k1/src/ld10k1_fnc1.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ld10k1/configure.ac b/ld10k1/configure.ac +index 276b24e..f48ca31 100644 +--- a/ld10k1/configure.ac ++++ b/ld10k1/configure.ac +@@ -4,6 +4,7 @@ AC_CONFIG_MACRO_DIR([m4]) + AM_MAINTAINER_MODE([enable]) + + AC_CONFIG_HEADERS(config.h) ++AC_USE_SYSTEM_EXTENSIONS + AC_PROG_CC + AC_PROG_LD + AC_PROG_INSTALL +diff --git a/ld10k1/src/ld10k1_fnc1.c b/ld10k1/src/ld10k1_fnc1.c +index 343584c..ddc43c6 100644 +--- a/ld10k1/src/ld10k1_fnc1.c ++++ b/ld10k1/src/ld10k1_fnc1.c +@@ -179,7 +179,7 @@ int main_loop(comm_param *param, int audigy, const char *card_id, int tram_size, + { + fd_set active_fd_set/*, read_fd_set*/; + int i, j, res = 0; +- __sighandler_t old_sig_pipe; ++ sighandler_t old_sig_pipe; + + int main_sock = 0; + int data_sock = 0; +-- +2.11.0 + diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb index e065eec6b8d..90e54dbb145 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb @@ -3,53 +3,85 @@ HOMEPAGE = "http://www.alsa-project.org" BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" SECTION = "console/utils" LICENSE = "GPLv2 & LGPLv2+" -DEPENDS = "alsa-lib ncurses glib-2.0" +DEPENDS = "alsa-lib" LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ " SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ - file://autotools.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \ - file://gitcompile_hdajacksensetest \ file://0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch \ + file://musl.patch \ " SRC_URI[md5sum] = "5ca8c9437ae779997cd62fb2815fef19" SRC_URI[sha256sum] = "d69c4dc2fb641a974d9903e9eb78c94cb0c7ac6c45bae664f0c9d6c0a1593227" inherit autotools-brokensep pkgconfig - +# brokensep as as10k1 (and probably more) fail out of tree CLEANBROKEN = "1" -EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" -PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," - -# configure.ac/.in doesn't exist so force copy -AUTOTOOLS_COPYACLOCAL = "1" - -do_compile_prepend () { - #Automake dir is not correctly detected in cross compilation case - export AUTOMAKE_DIR="$(automake --print-libdir)" - export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/ ${ACLOCALEXTRAPATH}" - - cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile +# Here we use PACKAGECONFIG options to pick which directories we configure/build. +# Remember on upgrades to check that no new tools have been added. +PACKAGECONFIG ??= "as10k1 hdajacksensetest hda-verb hdsploader ld10k1 mixartloader pcxhrloader \ + sb16_csp seq--sbiload sscape_ctl us428control usx2yloader vxloader \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK2DISTROFEATURES}', 'echomixer envy24control rmedigicontrol', '', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'hdajackretask', '', d)} \ + " + +PACKAGECONFIG[as10k1] = "" +PACKAGECONFIG[echomixer] = ",,gtk+" +PACKAGECONFIG[envy24control] = ",,gtk+" +PACKAGECONFIG[hda-verb] = "" +PACKAGECONFIG[hdajackretask] = ",,gtk+3" +PACKAGECONFIG[hdajacksensetest] = ",,glib-2.0" +PACKAGECONFIG[hdspconf] = ",,fltk" +PACKAGECONFIG[hdsploader] = "" +PACKAGECONFIG[hdspmixer] = ",,fltk" +PACKAGECONFIG[hwmixvolume] = ",,,python-core python-pygtk" +PACKAGECONFIG[ld10k1] = "" +PACKAGECONFIG[mixartloader] = "" +PACKAGECONFIG[pcxhrloader] = "" +PACKAGECONFIG[qlo10k1] = ",,qt-x11-free" +PACKAGECONFIG[rmedigicontrol] = ",,gtk+" +PACKAGECONFIG[sb16_csp] = "" +PACKAGECONFIG[seq--sbiload] = "" +PACKAGECONFIG[sscape_ctl] = "" +PACKAGECONFIG[us428control] = "" +PACKAGECONFIG[usx2yloader] = "" +PACKAGECONFIG[vxloader] = "" + +python do_configure() { + for subdir in d.getVar("PACKAGECONFIG").split(): + subdir = subdir.replace("--", "/") + bb.note("Configuring %s" % subdir) + dd = d.createCopy() + dd.setVar("S", os.path.join(d.getVar("S"), subdir)) + bb.build.exec_func("autotools_do_configure", dd) } -do_install_append() { - sed -i -e "s|/usr/bin/python2|/usr/bin/env python2|g" ${D}${bindir}/hwmixvolume +python do_compile() { + for subdir in d.getVar("PACKAGECONFIG").split(): + subdir = subdir.replace("--", "/") + bb.note("Compiling %s" % subdir) + dd = d.createCopy() + dd.setVar("S", os.path.join(d.getVar("S"), subdir)) + bb.build.exec_func("autotools_do_compile", dd) } -PACKAGES =+ "${PN}-hwmixvolume" - -FILES_${PN}-hwmixvolume = "${bindir}/hwmixvolume" - -FILES_${PN} += "${datadir}/ld10k1 \ - ${datadir}/icons/hicolor \ - " - -RDEPENDS_${PN}-hwmixvolume += "python" +python do_install() { + for subdir in d.getVar("PACKAGECONFIG").split(): + subdir = subdir.replace("--", "/") + bb.note("Installing %s" % subdir) + dd = d.createCopy() + dd.setVar("S", os.path.join(d.getVar("S"), subdir)) + bb.build.exec_func("autotools_do_install", dd) + + # Just remove bash-needing init script that isn't installed as an init script + try: + os.remove(oe.path.join(d.getVar("D"), d.getVar("sbindir"), "ld10k1d")) + except: + pass +} +FILES_${PN} += "${datadir}"