diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-10-08 08:15:42 -0700 |
---|---|---|
committer | Robert Yang <liezhi.yang@windriver.com> | 2015-10-08 19:41:43 -0700 |
commit | 9039c4beb03cffbe6b3e18a62ad377a60e6b3122 (patch) | |
tree | b8a31401a00d577a979c3b91269678760fc7281c /meta | |
parent | 30751bce10a7a779df57f0fdc9186e1d50e32841 (diff) | |
download | openembedded-core-contrib-9039c4beb03cffbe6b3e18a62ad377a60e6b3122.tar.gz |
recipes-core: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default.
[YOCTO #8436]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/netbase/netbase_5.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_225.bb | 5 | ||||
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-extraconf_1.1.bb | 1 |
10 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index e16fe722b8..f6eafb725f 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -172,7 +172,3 @@ FILES_${PN} = "/" FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" PACKAGE_ARCH = "${MACHINE_ARCH}" - -CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]} ${sysconfdir}/shells" -CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" - diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index ed8f9fe766..e3aabae80c 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -40,9 +40,6 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" SYSTEMD_PACKAGES = "${PN}-syslog" SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" -CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" - RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" inherit cml1 systemd update-rc.d ptest diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 3971081fd1..db5fcb4f48 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -35,8 +35,6 @@ USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \ --no-create-home --shell /bin/false \ --user-group messagebus" -CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" - DEBIANNAME_${PN} = "dbus-1" PACKAGES =+ "${PN}-lib" diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 5f6036840f..3c9d89c2b2 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -208,7 +208,6 @@ pkg_postinst_nscd () { fi fi } -CONFFILES_nscd="${sysconfdir}/nscd.conf" SYSTEMD_PACKAGES = "nscd" SYSTEMD_SERVICE_nscd = "nscd.service" diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index 733ae41f20..e8d87be70b 100644 --- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb @@ -38,4 +38,3 @@ PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}" RDEPENDS_${PN} = "netbase" RCONFLICTS_${PN} = "netbase (< 1:5.0)" -CONFFILES_${PN} = "${sysconfdir}/network/interfaces" diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index f90de6e4da..bd3795fcba 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -178,5 +178,3 @@ pkg_postinst_${PN} () { rm -f "/etc/volatile.cache" fi } - -CONFFILES_${PN} += "${sysconfdir}/init.d/checkroot.sh" diff --git a/meta/recipes-core/netbase/netbase_5.3.bb b/meta/recipes-core/netbase/netbase_5.3.bb index ccd89ff84f..7cff754169 100644 --- a/meta/recipes-core/netbase/netbase_5.3.bb +++ b/meta/recipes-core/netbase/netbase_5.3.bb @@ -20,5 +20,3 @@ do_install () { install -m 0644 etc-protocols ${D}${sysconfdir}/protocols install -m 0644 etc-services ${D}${sysconfdir}/services } - -CONFFILES_${PN} = "${sysconfdir}/hosts" diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index c2dad58754..b816a2fcde 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb @@ -266,11 +266,6 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" -CONFFILES_${PN} = "${sysconfdir}/systemd/journald.conf \ - ${sysconfdir}/systemd/logind.conf \ - ${sysconfdir}/systemd/system.conf \ - ${sysconfdir}/systemd/user.conf" - FILES_${PN} = " ${base_bindir}/* \ ${datadir}/bash-completion \ ${datadir}/dbus-1/services \ diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 49b1326a26..b92c68d618 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -74,7 +74,6 @@ fi PACKAGE_ARCH = "${MACHINE_ARCH}" FILES_${PN} = "${sysconfdir}/inittab" -CONFFILES_${PN} = "${sysconfdir}/inittab" USE_VT ?= "1" SYSVINIT_ENABLED_GETTYS ?= "1" diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 6fbd92548a..f6786e8a1f 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb @@ -33,7 +33,6 @@ do_install() { FILES_${PN} = "${sysconfdir}/udev" RDEPENDS_${PN} = "udev" -CONFFILES_${PN} = "${sysconfdir}/udev/mount.blacklist" # to replace udev-extra-rules from meta-oe RPROVIDES_${PN} = "udev-extra-rules" |