aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-10-08 08:15:42 -0700
committerRobert Yang <liezhi.yang@windriver.com>2016-01-14 18:27:59 -0800
commitc957f3915b3385c419e1e8282d1bfafde8567470 (patch)
tree0bb790e13bc4530d5ef718e1b2c91694d7e2939f
parentdcec7ad6697d6ff0136077eb8a0b9264a3a8e8eb (diff)
downloadopenembedded-core-contrib-rbt/conf.tar.gz
openembedded-core-contrib-rbt/conf.tar.bz2
openembedded-core-contrib-rbt/conf.zip
recipes-multimedia/sato/support: cleanup CONFFILESrbt/conf
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc8
-rw-r--r--meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb1
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates_20150426.bb4
3 files changed, 0 insertions, 13 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index ec73526226..21853b5ca0 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -124,14 +124,6 @@ FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so"
# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it)
ALLOW_EMPTY_${PN} = "1"
-CONFFILES_libpulse = "${sysconfdir}/pulse/client.conf"
-
-CONFFILES_pulseaudio-server = "\
- ${sysconfdir}/pulse/default.pa \
- ${sysconfdir}/pulse/daemon.conf \
- ${sysconfdir}/pulse/system.pa \
- "
-
pkg_postinst_${PN}-server() {
if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then
${sysconfdir}/init.d/populate-volatile.sh update
diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
index e27339fb46..2ccda38c52 100644
--- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
+++ b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
@@ -14,4 +14,3 @@ do_install() {
}
FILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf"
-CONFFILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf"
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
index 716e3dfca5..aca34a44ce 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
@@ -65,10 +65,6 @@ pkg_postinst_${PN} () {
SYSROOT="$D" update-ca-certificates
}
-CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf"
-
-# Postinsts don't seem to be run for nativesdk packages when populating SDKs.
-CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt"
do_install_append_class-nativesdk () {
SYSROOT="${D}${SDKPATHNATIVE}" update-ca-certificates
}