From: Jan-Simon Möller Date: Thu, 12 Jan 2017 12:10:11 +0000 (+0100) Subject: Update meta-ivi-common for 'Daring Dab' X-Git-Tag: 3.99.1~198 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=ddf881cf54a216870503a42eb9d430fad01c3f4b;p=AGL%2Fmeta-agl.git Update meta-ivi-common for 'Daring Dab' This changeset removes unused or old/stale files from the meta-ivi-common layer before the 'Daring Dab' development cycle starts. Change-Id: I3fcdf345918771c6cdfd5a0c01b792ca3d8ae3ad Signed-off-by: Jan-Simon Möller --- diff --git a/meta-ivi-common/recipes-multimedia/.gitkeep b/meta-ivi-common/recipes-multimedia/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager/AudioManager.service b/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager/AudioManager.service deleted file mode 100644 index 12aefada7..000000000 --- a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager/AudioManager.service +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2012 Wind River Systems, Inc. -# Copyright (c) 2016 Collabora Limited -# AudioManager systemd service file - -[Unit] -Description=GENIVI AudioManager - -[Service] -Type=dbus -BusName=org.genivi.audiomanager -ExecStart=/usr/bin/AudioManager - -[Install] -WantedBy=default.target -Alias=dbus-org.genivi.AudioManager.service diff --git a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager_7.3.bb b/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager_7.3.bb deleted file mode 100644 index 5255f11e6..000000000 --- a/meta-ivi-common/recipes-multimedia/audiomanager/audiomanager_7.3.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Genivi AudioManager" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "multimedia" - -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" -PR = "r1" - -DEPENDS = "dlt-daemon dbus" - -BRANCH = "master" - -SRC_URI = " \ - git://git.projects.genivi.org/AudioManager.git;branch=${BRANCH};tag=${PV} \ - file://0001-Fix-duplicated-command-line-arg-t.patch \ - file://AudioManager.service \ - " - -S = "${WORKDIR}/git" -inherit autotools gettext cmake pkgconfig systemd - -EXTRA_OECMAKE += "-DWITH_TESTS=OFF -DUSE_BUILD_LIBS=OFF -DWITH_SYSTEMD_WATCHDOG=ON \ - -DWITH_DBUS_WRAPPER=ON" -OECMAKE_CXX_FLAGS +="-ldl" - -PACKAGECONFIG ??= "" - -# With CommonAPI support -PACKAGECONFIG[capi] = "-DWITH_CAPI_WRAPPER=ON,-DWITH_CAPI_WRAPPER=OFF,common-api-c++-dbus" - -FILES_${PN} += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/AudioManager.service', '', d)} \ - " - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -m 644 -p -D ${WORKDIR}/AudioManager.service ${D}${systemd_user_unitdir}/AudioManager.service - - mkdir -p ${D}/etc/systemd/user/default.target.wants/ - ln -sf ${systemd_user_unitdir}/AudioManager.service ${D}/etc/systemd/user/dbus-org.genivi.AudioManager.service - ln -sf ${systemd_user_unitdir}/AudioManager.service ${D}/etc/systemd/user/default.target.wants/AudioManager.service - fi -} diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0001-install-files-for-a-module-development.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0001-install-files-for-a-module-development.patch similarity index 100% rename from meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0001-install-files-for-a-module-development.patch rename to meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0001-install-files-for-a-module-development.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0002-volume-ramp-additions-to-the-low-level-infra.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0002-volume-ramp-additions-to-the-low-level-infra.patch similarity index 100% rename from meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0002-volume-ramp-additions-to-the-low-level-infra.patch rename to meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0002-volume-ramp-additions-to-the-low-level-infra.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch similarity index 100% rename from meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch rename to meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch similarity index 100% rename from meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch rename to meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch similarity index 100% rename from meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch rename to meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch similarity index 100% rename from meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-8.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch rename to meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_9.0.bbappend b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_9.0.bbappend index 458c40fe3..efe51e90d 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_9.0.bbappend +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_9.0.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/pulseaudio-8.0:" +FILESEXTRAPATHS_prepend := "${THISDIR}/pulseaudio-9.0:" SRC_URI += " \ file://0001-install-files-for-a-module-development.patch \ diff --git a/meta-ivi-common/recipes-nvi-lbs/.gitkeep b/meta-ivi-common/recipes-nvi-lbs/.gitkeep deleted file mode 100644 index e69de29bb..000000000