]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
recipes-extended: cleanup CONFFILES
authorRobert Yang <liezhi.yang@windriver.com>
Thu, 8 Oct 2015 15:15:42 +0000 (08:15 -0700)
committerRobert Yang <liezhi.yang@windriver.com>
Fri, 15 Jan 2016 02:27:59 +0000 (18:27 -0800)
The ${sysconfdir}/* are CONFFILES by default.

[YOCTO #8436]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
meta/recipes-extended/cronie/cronie_1.5.0.bb
meta/recipes-extended/cups/cups.inc
meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb
meta/recipes-extended/logrotate/logrotate_3.9.1.bb
meta/recipes-extended/pam/libpam_1.2.1.bb
meta/recipes-extended/procps/procps_3.3.11.bb
meta/recipes-extended/sudo/sudo.inc
meta/recipes-extended/sysklogd/sysklogd.inc
meta/recipes-extended/tzdata/tzdata_2015g.bb
meta/recipes-extended/xinetd/xinetd_2.3.15.bb

index 697501ac1f686d3bc7426047195c6ce06b3d3884..922ba00456f517d8c3909a64f9c115159cc2f4b7 100644 (file)
@@ -78,4 +78,3 @@ do_install_append () {
 }
 
 FILES_${PN} += "${sysconfdir}/cron*"
-CONFFILES_${PN} += "${sysconfdir}/crontab"
index 5aa365d095bb8c1ce73554d1de17c215eeb94895..bc8f19ae348f2fa724bcd2b00237d0eda59c82a0 100644 (file)
@@ -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 () {
index 7cfc1413704c1b0305d6f0bb3c206d692a23dcaa..6f6a14e4d68c931595b330e8bc3e7e608da2428e 100644 (file)
@@ -67,8 +67,6 @@ do_install_append() {
 
 FILES_${PN} += "${sysconfdir} /www"
 
-CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
-
 PACKAGES_DYNAMIC += "^lighttpd-module-.*"
 
 python populate_packages_prepend () {
index 5f1a601aebd72279edca70655bec56eda38b609e..6688d8e61e375c358b4a367fec032686633d1182 100644 (file)
@@ -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.
index 3e69f117fec771ed2e48f8f5ddaf699351a9d764..cc5cb0faa76bba1457977552d46d97e0d1a7bc7a 100644 (file)
@@ -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"
index c6dccc6774216d8dd2dcf0249be07588b787a853..e842e47decc3e581aef03b9c46aceedb0544d1ce 100644 (file)
@@ -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"
index a25876b7fc52b6eb4040cc36603133d3a08936a5..286245015a0f340cb60d7c77f1e51257654c124a 100644 (file)
@@ -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 "
index 85b3cdc56afc0bc9c3b8923491e01059a764d856..aed4412f463bef0f3200a42abd1b1337d29c7741 100644 (file)
@@ -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"
 
index a6faa1d19c51c4e77bb1e95887d90b9a0faed3b3..4a573d1fe62d8310b04d82eab00076402656c9bd 100644 (file)
@@ -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"
index 652fe91de9961bda4018896faa40656b880f17f2..3996bfaa4c1760c211ccd856a204fae7c8f6a246 100644 (file)
@@ -68,5 +68,3 @@ do_install() {
               -e 's,@SBINDIR@,${sbindir},g' \
               ${D}${systemd_unitdir}/system/xinetd.service
 }
-
-CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"