The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436]
Signed-off-by: Robert Yang <liezhi.y...@windriver.com> --- meta/recipes-extended/cronie/cronie_1.5.0.bb | 1 - meta/recipes-extended/cups/cups.inc | 1 - meta/recipes-extended/lighttpd/lighttpd_1.4.36.bb | 2 -- meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 3 +-- meta/recipes-extended/pam/libpam_1.2.1.bb | 5 ----- meta/recipes-extended/procps/procps_3.3.10.bb | 2 -- meta/recipes-extended/sudo/sudo.inc | 2 -- meta/recipes-extended/sysklogd/sysklogd.inc | 1 - meta/recipes-extended/tzdata/tzdata_2015g.bb | 1 - meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 2 -- 10 files changed, 1 insertion(+), 19 deletions(-) diff --git a/meta/recipes-extended/cronie/cronie_1.5.0.bb b/meta/recipes-extended/cronie/cronie_1.5.0.bb index 38bd593..d73dae3 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 c0765dc..9c66013 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -120,7 +120,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.36.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.36.bb index 67b6e37..cb277dc 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.36.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.36.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 7d0a159..96679ce 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 ac3097e..0605e25 100644 --- a/meta/recipes-extended/pam/libpam_1.2.1.bb +++ b/meta/recipes-extended/pam/libpam_1.2.1.bb @@ -162,8 +162,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.10.bb b/meta/recipes-extended/procps/procps_3.3.10.bb index dcfaba7..55699cc 100644 --- a/meta/recipes-extended/procps/procps_3.3.10.bb +++ b/meta/recipes-extended/procps/procps_3.3.10.bb @@ -43,8 +43,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 a25876b..2862450 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 bcf8aa7..0b84da6 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 039a7c1..c2cba7b 100644 --- a/meta/recipes-extended/tzdata/tzdata_2015g.bb +++ b/meta/recipes-extended/tzdata/tzdata_2015g.bb @@ -204,4 +204,3 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/iso3166.tab \ ${datadir}/zoneinfo/Etc/*" -CONFFILES_${PN} += "${sysconfdir}/timezone ${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 ffc03e5..7effdbf 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb @@ -64,5 +64,3 @@ do_install() { -e 's,@SBINDIR@,${sbindir},g' \ ${D}${systemd_unitdir}/system/xinetd.service } - -CONFFILES_${PN} = "${sysconfdir}/xinetd.conf" -- 1.7.9.5 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core