set CONFFILES to /etc/* by default as Debian does

PATCH In review Robert Yang 2 participants 11 messages Oct 9, 2015

Share & tools

Robert Yang

author

2015-10-09 02:44 UTC #0 lore raw

cover set CONFFILES to /etc/* by default as Debian does

There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, 187 packages are not set in a world build. So treat all the files in /etc/ as CONFILES as Debian does
- Move the file out of /etc/ if it is not a conffile
- If /etc/foo can't be moved out, and is changed during runtime, then create a symlink /etc/foo -> /var/foo

// Robert

The following changes since commit 4038970f8ce27ac0d7a0afe2cdaa9a65108dfff5:

os-release: fix do_compile() when RPM signing is enabled (2015-10-07 00:08:07 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/conffiles
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/conffiles

Robert Yang (8):
bitbake.conf: set CONFFILES by default
recipes-bsp: cleanup CONFFILES
recipes-connectivity: cleanup CONFFILES
recipes-extended: cleanup CONFFILES
recipes-core: cleanup CONFFILES
recipes-devtools: cleanup CONFFILES
recipes-graphics: cleanup CONFFILES recipes-multimedia/sato/support: cleanup CONFFILES

 meta/conf/bitbake.conf                             |    1 +
 meta/recipes-bsp/alsa-state/alsa-state.bb          |    1 -
 meta/recipes-bsp/pcmciautils/pcmciautils.inc       |    2 --
 meta/recipes-connectivity/avahi/avahi.inc          |    2 --
 meta/recipes-connectivity/bind/bind_9.10.2-P4.bb   |   11 -----------
 .../nfs-utils/nfs-utils_1.3.1.bb                   |    2 +-
 meta/recipes-connectivity/openssh/openssh_7.1p1.bb |    3 ---
 meta/recipes-connectivity/ppp/ppp_2.4.7.bb         |    1 -
 .../wpa-supplicant/wpa-supplicant_2.4.bb           |    1 -
 meta/recipes-core/base-files/base-files_3.0.14.bb  |    4 ----
 meta/recipes-core/busybox/busybox.inc              |    3 ---
 meta/recipes-core/dbus/dbus.inc                    |    2 --
 meta/recipes-core/glibc/glibc-package.inc          |    1 -
 .../init-ifupdown/init-ifupdown_1.0.bb             |    1 -
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 --
 meta/recipes-core/netbase/netbase_5.3.bb           |    2 --
 meta/recipes-core/systemd/systemd_225.bb           |    5 -----
 .../sysvinit/sysvinit-inittab_2.88dsf.bb           |    1 -
 meta/recipes-core/udev/udev-extraconf_1.1.bb       |    1 -
 meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb |    2 --
 meta/recipes-devtools/opkg/opkg_0.3.0.bb           |    1 -
 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 --
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |    1 -
 .../xorg-xserver/xserver-xf86-config_0.1.bb        |    3 ---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    8 --------
 .../pulseaudio-client-conf-sato_1.bb               |    1 -
 .../ca-certificates/ca-certificates_20150426.bb    |    4 ----
 36 files changed, 3 insertions(+), 83 deletions(-)

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-10-09 02:44 UTC #1 lore raw

PATCH 1/8 bitbake.conf: set CONFFILES by default

[YOCTO #8436]

Signed-off-by Robert Yang <[email protected]>

---
 meta/conf/bitbake.conf |    1 +
 1 file changed, 1 insertion(+)

meta/conf/bitbake.conf +1 -0

index 9ddd1c0..7a53819 100644
@@ -269,6 +269,7 @@ PACKAGE_BEFORE_PN ?= ""
 PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
 PACKAGES_DYNAMIC = "^${PN}-locale-.*"
 FILES = ""
+CONFFILES = "${sysconfdir}/*"
 
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \

Signature · 1 line

1.7.9.5

Martin Jansa

2015-10-09 14:19 UTC #2 lore raw

Re: [PATCH 1/8] bitbake.conf: set CONFFILES by default

Quoted 19 lines · Robert Yang

There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, 187 packages are not set in a world build. So treat all the files in /etc/ as CONFILES as Debian does
- Move the file out of /etc/ if it is not a conffile
- If /etc/foo can't be moved out, and is changed during runtime, then create a symlink /etc/foo -> /var/foo
[YOCTO #8436]
Signed-off-by Robert Yang <[email protected]>
---
 meta/conf/bitbake.conf |    1 +
 1 file changed, 1 insertion(+)
meta/conf/bitbake.conf +0 -0
index 9ddd1c0..7a53819 100644

meta/conf/bitbake.conf PACKAGE_BEFORE_PN ?= "" · line 272

Quoted 4 lines

meta/conf/bitbake.conf +1 -0

@@ -269,6 +269,7 @@ PACKAGE_BEFORE_PN ?= ""
 PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
 PACKAGES_DYNAMIC = "^${PN}-locale-.*"
 FILES = ""
+CONFFILES = "${sysconfdir}/*"

Should this be
CONFFILS_${PN} ?

Quoted 11 lines

meta/conf/bitbake.conf +0 -0

 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \

Signature · 7 lines

1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Robert Yang

author

2015-10-09 14:56 UTC #3 lore raw

Re: [PATCH 1/8] bitbake.conf: set CONFFILES by default

Quoted 15 lines · Martin Jansa

Quoted 14 lines · Robert Yang
There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, 187 packages are not set in a world build. So treat all the files in /etc/ as CONFILES as Debian does
- Move the file out of /etc/ if it is not a conffile
- If /etc/foo can't be moved out, and is changed during runtime, then create a symlink /etc/foo -> /var/foo
[YOCTO #8436]
Signed-off-by Robert Yang <[email protected]>
---
  meta/conf/bitbake.conf |    1 +
  1 file changed, 1 insertion(+)

Quoted 12 lines

meta/conf/bitbake.conf PACKAGE_BEFORE_PN ?= "" · line 272
Quoted 9 lines
meta/conf/bitbake.conf +1 -0
index 9ddd1c0..7a53819 100644
@@ -269,6 +269,7 @@ PACKAGE_BEFORE_PN ?= ""
  PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
  PACKAGES_DYNAMIC = "^${PN}-locale-.*"
  FILES = ""
+CONFFILES = "${sysconfdir}/*"
Should this be
CONFFILS_${PN} ?

I think that CONFFILES is better than CONFFILES_${PN}, since package.bbclass checks both CONFFILES and CONFFILES_pkg, if we use CONFFILES_${PN} here, then it doesn't work for the pkg like openssh-sshd and openssh-ssh, but CONFFILES works for them.

// Robert

Quoted 13 lines

Quoted 12 lines
meta/conf/bitbake.conf +0 -1
  FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
              ${sysconfdir} ${sharedstatedir} ${localstatedir} \
--
1.7.9.5
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Robert Yang

author

2015-10-09 02:44 UTC #4 lore raw

PATCH 2/8 recipes-bsp: cleanup CONFFILES

In reply to Robert Yang

The ${sysconfdir}/* are CONFFILES by default.

[YOCTO #8436]

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-bsp/alsa-state/alsa-state.bb    |    1 -
 meta/recipes-bsp/pcmciautils/pcmciautils.inc |    2 --
 2 files changed, 3 deletions(-)

meta/recipes-bsp/alsa-state/alsa-state.bb +0 -1

index d0f7bb3..ce59d33 100644
@@ -52,7 +52,6 @@ RRECOMMENDS_alsa-state = "alsa-states"
 
 RDEPENDS_${PN} = "alsa-utils-alsactl"
 FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf"
-CONFFILES_${PN} = "${sysconfdir}/asound.conf"
 
 FILES_alsa-states = "${localstatedir}/lib/alsa/*.state"

meta/recipes-bsp/pcmciautils/pcmciautils.inc +0 -2

index 9d1c55b..0bf0620 100644
@@ -28,5 +28,3 @@ EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 }
-
-CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-10-09 02:44 UTC #5 lore raw

PATCH 3/8 recipes-connectivity: cleanup CONFFILES

In reply to Robert Yang

The ${sysconfdir}/* are CONFFILES by default.

[YOCTO #8436]

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-connectivity/avahi/avahi.inc          |    2 --
 meta/recipes-connectivity/bind/bind_9.10.2-P4.bb   |   11 -----------
 .../nfs-utils/nfs-utils_1.3.1.bb                   |    2 +-
 meta/recipes-connectivity/openssh/openssh_7.1p1.bb |    3 ---
 meta/recipes-connectivity/ppp/ppp_2.4.7.bb         |    1 -
 .../wpa-supplicant/wpa-supplicant_2.4.bb           |    1 -
 6 files changed, 1 insertion(+), 19 deletions(-)

meta/recipes-connectivity/avahi/avahi.inc +0 -2

index 825197d..966dfe0 100644
@@ -113,8 +113,6 @@ RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev"
 
 RRECOMMENDS_avahi-dev[nodeprrecs] = "1"
 
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
 INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
 INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
 INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"

meta/recipes-connectivity/bind/bind_9.10.2-P4.bb +0 ~~-11~~

index 1e1e726..ee63b28 100644
@@ -90,14 +90,3 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
 }
 
-CONFFILES_${PN} = " \
-	${sysconfdir}/bind/named.conf \
-	${sysconfdir}/bind/named.conf.local \
-	${sysconfdir}/bind/named.conf.options \
-	${sysconfdir}/bind/db.0 \
-	${sysconfdir}/bind/db.127 \
-	${sysconfdir}/bind/db.empty \
-	${sysconfdir}/bind/db.local \
-	${sysconfdir}/bind/db.root \
-	"
-

meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb +1 -1

index 42101de..da44500 100644
@@ -75,7 +75,7 @@ CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \
 			   ${localstatedir}/lib/nfs/rmtab \
 			   ${localstatedir}/lib/nfs/xtab \
 			   ${localstatedir}/lib/nfs/statd/state \
-			   ${sysconfdir}/nfsmount.conf"
+			   "
 
 FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \
 		      ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \

meta/recipes-connectivity/openssh/openssh_7.1p1.bb +0 -3

index eeeb4b4..1678d74 100644
@@ -145,9 +145,6 @@ RCONFLICTS_${PN} = "dropbear"
 RCONFLICTS_${PN}-sshd = "dropbear"
 RCONFLICTS_${PN}-keygen = "ssh-keygen"
 
-CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
-CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"
-
 ALTERNATIVE_PRIORITY = "90"
 ALTERNATIVE_${PN}-scp = "scp"
 ALTERNATIVE_${PN}-ssh = "ssh"

meta/recipes-connectivity/ppp/ppp_2.4.7.bb +0 -1

index adc38e1..7fc2d00 100644
@@ -75,7 +75,6 @@ do_install_append () {
 	chmod u+s ${D}${sbindir}/pppd
 }
 
-CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
 PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools"
 FILES_${PN}        = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/[email protected]"
 FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug"

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb +0 -1

index a124cf2..005ec6e 100644
@@ -42,7 +42,6 @@ PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
 FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
 FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
 FILES_${PN} += "${datadir}/dbus-1/system-services/*"
-CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
 do_configure () {
 	${MAKE} -C wpa_supplicant clean

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-10-09 02:44 UTC #6 lore raw

PATCH 4/8 recipes-extended: cleanup CONFFILES

In reply to Robert Yang

The ${sysconfdir}/* are CONFFILES by default.

[YOCTO #8436]

Signed-off-by Robert Yang <[email protected]>

---
 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(-)

meta/recipes-extended/cronie/cronie_1.5.0.bb +0 -1

index 38bd593..d73dae3 100644
@@ -78,4 +78,3 @@ do_install_append () {
 }
 
 FILES_${PN} += "${sysconfdir}/cron*"
-CONFFILES_${PN} += "${sysconfdir}/crontab"

meta/recipes-extended/cups/cups.inc +0 -1

index c0765dc..9c66013 100644
@@ -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 () {

meta/recipes-extended/lighttpd/lighttpd_1.4.36.bb +0 -2

index 67b6e37..cb277dc 100644
@@ -67,8 +67,6 @@ do_install_append() {
 
 FILES_${PN} += "${sysconfdir} /www"
 
-CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
-
 PACKAGES_DYNAMIC += "^lighttpd-module-.*"
 
 python populate_packages_prepend () {

meta/recipes-extended/logrotate/logrotate_3.9.1.bb +1 -2

index 7d0a159..96679ce 100644
@@ -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.

meta/recipes-extended/pam/libpam_1.2.1.bb +0 -5

index ac3097e..0605e25 100644
@@ -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"

meta/recipes-extended/procps/procps_3.3.10.bb +0 -2

index dcfaba7..55699cc 100644
@@ -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"

meta/recipes-extended/sudo/sudo.inc +0 -2

index a25876b..2862450 100644
@@ -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 "

meta/recipes-extended/sysklogd/sysklogd.inc +0 -1

index bcf8aa7..0b84da6 100644
@@ -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"

meta/recipes-extended/tzdata/tzdata_2015g.bb +0 -1

index 039a7c1..c2cba7b 100644
@@ -204,4 +204,3 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu     \
                 ${datadir}/zoneinfo/iso3166.tab          \
                 ${datadir}/zoneinfo/Etc/*"
 
-CONFFILES_${PN} += "${sysconfdir}/timezone ${sysconfdir}/localtime"

meta/recipes-extended/xinetd/xinetd_2.3.15.bb +0 -2

index ffc03e5..7effdbf 100644
@@ -64,5 +64,3 @@ do_install() {
 	       -e 's,@SBINDIR@,${sbindir},g' \
 	       ${D}${systemd_unitdir}/system/xinetd.service
 }
-
-CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-10-09 02:44 UTC #7 lore raw

PATCH 5/8 recipes-core: cleanup CONFFILES

In reply to Robert Yang

The ${sysconfdir}/* are CONFFILES by default.

[YOCTO #8436]

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-core/base-files/base-files_3.0.14.bb  |    4 ----
 meta/recipes-core/busybox/busybox.inc              |    3 ---
 meta/recipes-core/dbus/dbus.inc                    |    2 --
 meta/recipes-core/glibc/glibc-package.inc          |    1 -
 .../init-ifupdown/init-ifupdown_1.0.bb             |    1 -
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 --
 meta/recipes-core/netbase/netbase_5.3.bb           |    2 --
 meta/recipes-core/systemd/systemd_225.bb           |    5 -----
 .../sysvinit/sysvinit-inittab_2.88dsf.bb           |    1 -
 meta/recipes-core/udev/udev-extraconf_1.1.bb       |    1 -
 10 files changed, 22 deletions(-)

meta/recipes-core/base-files/base-files_3.0.14.bb +0 -4

index e16fe72..f6eafb7 100644
@@ -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"
-

meta/recipes-core/busybox/busybox.inc +0 -3

index ed8f9fe..e3aabae 100644
@@ -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

meta/recipes-core/dbus/dbus.inc +0 -2

index 3971081..db5fcb4 100644
@@ -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"

meta/recipes-core/glibc/glibc-package.inc +0 -1

index 5f60368..3c9d89c 100644
@@ -208,7 +208,6 @@ pkg_postinst_nscd () {
 		fi
 	fi
 }
-CONFFILES_nscd="${sysconfdir}/nscd.conf"
 
 SYSTEMD_PACKAGES = "nscd"
 SYSTEMD_SERVICE_nscd = "nscd.service"

meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +0 -1

index 733ae41..e8d87be 100644
@@ -38,4 +38,3 @@ PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}"
 RDEPENDS_${PN} = "netbase"
 RCONFLICTS_${PN} = "netbase (< 1:5.0)"
 
-CONFFILES_${PN} = "${sysconfdir}/network/interfaces"

meta/recipes-core/initscripts/initscripts_1.0.bb +0 -2

index f90de6e..bd3795f 100644
@@ -178,5 +178,3 @@ pkg_postinst_${PN} () {
         rm -f "/etc/volatile.cache"
     fi
 }
-
-CONFFILES_${PN} += "${sysconfdir}/init.d/checkroot.sh"

meta/recipes-core/netbase/netbase_5.3.bb +0 -2

index ccd89ff..7cff754 100644
@@ -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"

meta/recipes-core/systemd/systemd_225.bb +0 -5

index c2dad58..b816a2f 100644
@@ -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 \

meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +0 -1

index 49b1326..b92c68d 100644
@@ -74,7 +74,6 @@ fi
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES_${PN} = "${sysconfdir}/inittab"
-CONFFILES_${PN} = "${sysconfdir}/inittab"
 
 USE_VT ?= "1"
 SYSVINIT_ENABLED_GETTYS ?= "1"

meta/recipes-core/udev/udev-extraconf_1.1.bb +0 -1

index 6fbd925..f6786e8 100644
@@ -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"

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-10-09 02:44 UTC #8 lore raw

PATCH 6/8 recipes-devtools: cleanup CONFFILES

In reply to Robert Yang

The ${sysconfdir}/* are CONFFILES by default.

[YOCTO #8436]

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb |    2 --
 meta/recipes-devtools/opkg/opkg_0.3.0.bb           |    1 -
 2 files changed, 3 deletions(-)

meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb +0 -2

index ace3de4..861f011 100644
@@ -28,8 +28,6 @@ do_install () {
 
 FILES_${PN} = "${sysconfdir}/opkg/ "
 
-CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf"
-
 RREPLACES_${PN} = "opkg-config-base"
 RCONFLICTS_${PN} = "opkg-config-base"
 RPROVIDES_${PN} = "opkg-config-base"

meta/recipes-devtools/opkg/opkg_0.3.0.bb +0 -1

index 588250e..b510580 100644
@@ -71,4 +71,3 @@ FILES_${PN} += "${systemd_unitdir}/system/"
 
 BBCLASSEXTEND = "native nativesdk"
 
-CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-10-09 02:44 UTC #9 lore raw

PATCH 7/8 recipes-graphics: cleanup CONFFILES

In reply to Robert Yang

The ${sysconfdir}/* are CONFFILES by default.

[YOCTO #8436]

Signed-off-by Robert Yang <[email protected]>

---
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |    1 -
 .../xorg-xserver/xserver-xf86-config_0.1.bb        |    3 ---
 2 files changed, 4 deletions(-)

meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +0 -1

index 65348c3..9b52505 100644
@@ -17,4 +17,3 @@ do_install() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"

meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +0 -3

index e07c204..aa5099c 100644
@@ -13,9 +13,6 @@ SRC_URI_append_libc-musl = "\
 
 S = "${WORKDIR}"
 
-CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf"
-CONFFILES_${PN}_append_libc-musl = " ${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY_${PN} = "1"

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-10-09 02:44 UTC #10 lore raw

PATCH 8/8 recipes-multimedia/sato/support: cleanup CONFFILES

In reply to Robert Yang

The ${sysconfdir}/* are CONFFILES by default.

[YOCTO #8436]

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    8 --------
 .../pulseaudio-client-conf-sato_1.bb               |    1 -
 .../ca-certificates/ca-certificates_20150426.bb    |    4 ----
 3 files changed, 13 deletions(-)

meta/recipes-multimedia/pulseaudio/pulseaudio.inc +0 -8

index 5b806d7..1ab7768 100644
@@ -125,14 +125,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

meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb +0 -1

index e27339f..2ccda38 100644
@@ -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"

meta/recipes-support/ca-certificates/ca-certificates_20150426.bb +0 -4

index 716e3df..aca34a4 100644
@@ -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
 }

Signature · 1 line

1.7.9.5