summaryrefslogtreecommitdiffstats
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
commit48d1141e32643dbd80d90b49fd6fa4dacd5473d8 (patch)
treecadd9b6ea1b668eefd88766635fa72b1846f89f6
parentcdfdcdf72f35bf0f0cd55b405e4ee4b462d0f29c (diff)
downloadopenembedded-core-contrib-48d1141e32643dbd80d90b49fd6fa4dacd5473d8.tar.gz
openembedded-core-contrib-48d1141e32643dbd80d90b49fd6fa4dacd5473d8.tar.bz2
openembedded-core-contrib-48d1141e32643dbd80d90b49fd6fa4dacd5473d8.zip
recipes-extended: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/recipes-extended/cronie/cronie_1.5.0.bb1
-rw-r--r--meta/recipes-extended/cups/cups.inc1
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb2
-rw-r--r--meta/recipes-extended/logrotate/logrotate_3.9.1.bb3
-rw-r--r--meta/recipes-extended/pam/libpam_1.2.1.bb5
-rw-r--r--meta/recipes-extended/procps/procps_3.3.11.bb2
-rw-r--r--meta/recipes-extended/sudo/sudo.inc2
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc1
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2015g.bb3
-rw-r--r--meta/recipes-extended/xinetd/xinetd_2.3.15.bb2
10 files changed, 1 insertions, 21 deletions
diff --git a/meta/recipes-extended/cronie/cronie_1.5.0.bb b/meta/recipes-extended/cronie/cronie_1.5.0.bb
index 697501ac1f..922ba00456 100644
--- a/meta/recipes-extended/cronie/cronie_1.5.0.bb
+++ b/meta/recipes-extended/cronie/cronie_1.5.0.bb
@@ -78,4 +78,3 @@ do_install_append () {
}
FILES_${PN} += "${sysconfdir}/cron*"
-CONFFILES_${PN} += "${sysconfdir}/crontab"
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 5aa365d095..bc8f19ae34 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -116,7 +116,6 @@ FILES_${PN} += "${datadir}/doc/cups/images \
${datadir}/doc/cups/*.css \
${datadir}/icons/ \
"
-CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"
SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess"
cups_sysroot_preprocess () {
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb
index 7cfc141370..6f6a14e4d6 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb
@@ -67,8 +67,6 @@ do_install_append() {
FILES_${PN} += "${sysconfdir} /www"
-CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
-
PACKAGES_DYNAMIC += "^lighttpd-module-.*"
python populate_packages_prepend () {
diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
index 5f1a601aeb..6688d8e61e 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
@@ -27,8 +27,7 @@ PACKAGECONFIG ?= "\
PACKAGECONFIG[acl] = ",,acl"
PACKAGECONFIG[selinux] = ",,libselinux"
-CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status \
- ${sysconfdir}/logrotate.conf"
+CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status"
# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
# optimization variables, so use it rather than EXTRA_CFLAGS.
diff --git a/meta/recipes-extended/pam/libpam_1.2.1.bb b/meta/recipes-extended/pam/libpam_1.2.1.bb
index 3e69f117fe..cc5cb0faa7 100644
--- a/meta/recipes-extended/pam/libpam_1.2.1.bb
+++ b/meta/recipes-extended/pam/libpam_1.2.1.bb
@@ -163,8 +163,3 @@ addtask pam_sanity before do_configure
BBCLASSEXTEND = "nativesdk native"
-CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session"
-CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth"
-CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password"
-CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive"
-CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account"
diff --git a/meta/recipes-extended/procps/procps_3.3.11.bb b/meta/recipes-extended/procps/procps_3.3.11.bb
index c6dccc6774..e842e47dec 100644
--- a/meta/recipes-extended/procps/procps_3.3.11.bb
+++ b/meta/recipes-extended/procps/procps_3.3.11.bb
@@ -42,8 +42,6 @@ do_install_append () {
fi
}
-CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
-
bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime"
base_bindir_progs += "kill pidof ps watch"
base_sbindir_progs += "sysctl"
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index a25876b7fc..286245015a 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -19,8 +19,6 @@ inherit autotools
PACKAGECONFIG ??= ""
PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
-CONFFILES_${PN} = "${sysconfdir}/sudoers"
-
EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor"
EXTRA_OECONF_append_libc-musl = " --disable-hardening "
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 85b3cdc56a..aed4412f46 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -22,7 +22,6 @@ SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar
SRC_URI_append_e500v2 = " file://no-vectorization.patch"
INITSCRIPT_NAME = "syslog"
-CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}"
CFLAGS_append = " -DSYSV"
diff --git a/meta/recipes-extended/tzdata/tzdata_2015g.bb b/meta/recipes-extended/tzdata/tzdata_2015g.bb
index a6faa1d19c..4a573d1fe6 100644
--- a/meta/recipes-extended/tzdata/tzdata_2015g.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2015g.bb
@@ -207,6 +207,3 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \
${datadir}/zoneinfo/zone.tab \
${datadir}/zoneinfo/iso3166.tab \
${datadir}/zoneinfo/Etc/*"
-
-CONFFILES_${PN} += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE', True)) else "" }"
-CONFFILES_${PN} += "${sysconfdir}/localtime"
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 652fe91de9..3996bfaa4c 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -68,5 +68,3 @@ do_install() {
-e 's,@SBINDIR@,${sbindir},g' \
${D}${systemd_unitdir}/system/xinetd.service
}
-
-CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"