bitbake.conf: set CONFFILES by default

PATCH In review Robert Yang 3 participants 17 messages Jan 15, 2016 – Jan 18, 2016

lore

Share & tools

lore

Robert Yang

author

2016-01-15 02:29 UTC #0 lore raw

cover bitbake.conf: set CONFFILES by default

The following changes since commit 541315d6c56df6448f64c262f99d43d5c1e9400b:

update_font_cache: only scan system font directories (2016-01-11 23:23:18 +0000)

are available in the git repository at:

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

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.3-P2.bb   |   11 -----------
 .../nfs-utils/nfs-utils_1.3.3.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.5.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_1.8.20.bb              |    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/readline/readline.inc            |    2 --
 meta/recipes-core/systemd/systemd_228.bb           |    7 -------
 .../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.1.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.38.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.11.bb      |    2 --
 meta/recipes-extended/sudo/sudo.inc                |    2 --
 meta/recipes-extended/sysklogd/sysklogd.inc        |    1 -
 meta/recipes-extended/tzdata/tzdata_2015g.bb       |    3 ---
 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 ----
 37 files changed, 3 insertions(+), 89 deletions(-)

Signature · 1 line

1.7.9.5

Robert Yang

author

2016-01-15 02:29 UTC #1 lore raw

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

There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does:
- All the files in /etc/ are CONFFILES
- 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 +1 -0

index 2fe6b24..f0e4b3a 100644
@@ -271,6 +271,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

Mike Looijmans

2016-01-15 06:27 UTC #2 lore raw

How about /etc/init.d and /etc/rcS.d? Are these now suddenly CONFFILES too?

Quoted 22 lines · Robert Yang

There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does:
- All the files in /etc/ are CONFFILES
- 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 2fe6b24..f0e4b3a 100644

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

Quoted 7 lines

meta/conf/bitbake.conf +1 -0

@@ -271,6 +271,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} \

Kind regards,

Mike Looijmans
System Expert

TOPIC Embedded Products
Eindhovenseweg 32-C, NL-5683 KH Best
Postbus 440, NL-5680 AK Best
Telefoon: +31 (0) 499 33 69 79
E-mail: [email protected]
Website: www.topicproducts.com

Please consider the environment before printing this e-mail

Robert Yang

author

2016-01-15 06:37 UTC #3 lore raw

Quoted 1 line · Mike Looijmans

How about /etc/init.d and /etc/rcS.d? Are these now suddenly CONFFILES too?

For /etc/init.d/*, yes, and I think that they should be CONFFILES.

For /etc/rcS.d/*, they are symlinks which are not owned by pkg, but created by update-rc.d.

// Robert

Quoted 55 lines · Robert Yang

Quoted 27 lines
There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does:
- All the files in /etc/ are CONFFILES
- 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 2fe6b24..f0e4b3a 100644
@@ -271,6 +271,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}/*"
Quoted 4 lines
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/*
${libdir}/lib*${SOLIBS} \
              ${sysconfdir} ${sharedstatedir} ${localstatedir} \
Kind regards,
Mike Looijmans
System Expert
TOPIC Embedded Products
Eindhovenseweg 32-C, NL-5683 KH Best
Postbus 440, NL-5680 AK Best
Telefoon: +31 (0) 499 33 69 79
E-mail: [email protected]
Website: www.topicproducts.com
Please consider the environment before printing this e-mail

Mike Looijmans

2016-01-16 10:51 UTC #4 lore raw

Quoted 7 lines · Robert Yang

Quoted 2 lines · Mike Looijmans
How about /etc/init.d and /etc/rcS.d? Are these now suddenly CONFFILES too?
For /etc/init.d/*, yes, and I think that they should be CONFFILES.

Startup scripts are config files? Wow that's news to me.

They all include /etc/defaults/something for a good reason: So you don't have to hack the script.

Quoted 2 lines

For /etc/rcS.d/*, they are symlinks which are not owned by pkg, but created by update-rc.d.

Only if the recipe happens to use update-rc. Quite some packages don't use it and just create the symlinks themselves.

As I recall, this suggestion has been made before and was rejected then. Nothing really changed since.

Signature · 1 line

Mike Looijmans

Robert Yang

author

2016-01-18 01:33 UTC #5 lore raw

Quoted 10 lines · Mike Looijmans

Quoted 7 lines · Robert Yang
Quoted 2 lines · Mike Looijmans
How about /etc/init.d and /etc/rcS.d? Are these now suddenly CONFFILES too?
For /etc/init.d/*, yes, and I think that they should be CONFFILES.
Startup scripts are config files? Wow that's news to me.

Yes, debian treats startup scripts as config files.

Quoted 7 lines

They all include /etc/defaults/something for a good reason: So you don't have to hack the script.
Quoted 2 lines
For /etc/rcS.d/*, they are symlinks which are not owned by pkg, but created by update-rc.d.

Quoted 6 lines

Only if the recipe happens to use update-rc. Quite some packages don't use it and just create the symlinks themselves.
As I recall, this suggestion has been made before and was rejected then. Nothing really changed since.

I had sent this patch before, but I didn't see any rejected emails.

// Robert

Quoted 2 lines

Richard Purdie

2016-01-15 11:12 UTC #6 lore raw

In reply to Robert Yang

Quoted 10 lines · Robert Yang

There are a lot of binary packages have files in /etc/, but only a few
of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does:
- All the files in /etc/ are CONFFILES
- 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

Quoted 6 lines

[YOCTO #8436]
Signed-off-by Robert Yang <[email protected]>
---
 meta/conf/bitbake.conf |    1 +
 1 file changed, 1 insertion(+)

We have discussed this before and we decided that setting CONFFILES globally seemed like a bad idea?

What has changed since the last discussion?

Cheers,

Richard

Robert Yang

author

2016-01-16 05:37 UTC #7 lore raw

Quoted 13 lines · Richard Purdie

Quoted 12 lines · Robert Yang
There are a lot of binary packages have files in /etc/, but only a few
of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does:
- All the files in /etc/ are CONFFILES
- 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]

Quoted 7 lines

Quoted 4 lines
Signed-off-by Robert Yang <[email protected]>
---
  meta/conf/bitbake.conf |    1 +
  1 file changed, 1 insertion(+)
We have discussed this before and we decided that setting CONFFILES globally seemed like a bad idea?

Sorry, but I can't find any emails which said this was a bad idea. If we don't set CONFFILES by default, maybe we need mark a lot of CONFFILES inside the recipes. I think that mark the CONFFILES under /etc/ doesn't hurt anything, but help a lot when doing upgrade on target:

1) When the old file is not changed, it will be replaced by new file.
2) When the old file is changed, it will ask the user what to do (dpkg) or save a bak (rpm).

//Robert

Quoted 7 lines

What has changed since the last discussion?
Cheers,
Richard

Mike Looijmans

2016-01-16 11:08 UTC #8 lore raw

Quoted 16 lines · Robert Yang

Quoted 13 lines · Richard Purdie
Quoted 12 lines · Robert Yang
There are a lot of binary packages have files in /etc/, but only a few
of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does:
- All the files in /etc/ are CONFFILES
- 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]

Quoted 7 lines

Quoted 7 lines
Quoted 4 lines
Signed-off-by Robert Yang <[email protected]>
---
  meta/conf/bitbake.conf |    1 +
  1 file changed, 1 insertion(+)
We have discussed this before and we decided that setting CONFFILES globally seemed like a bad idea?

That is how I recall it. Please please please don't do it. It will wreak havoc on all kinds of systems.

Quoted 9 lines

Sorry, but I can't find any emails which said this was a bad idea. If we don't set CONFFILES by default, maybe we need mark a lot of CONFFILES inside the recipes. I think that mark the CONFFILES under /etc/ doesn't hurt anything, but help a lot when doing upgrade on target:
1) When the old file is not changed, it will be replaced by new file.
2) When the old file is changed, it will ask the user what to do (dpkg) or save a bak (rpm).

In a perfect world, yeah.

In the world other people have to live in, the GUI has to shut down to free up resources to get the upgrade to complete successfully. This means you cannot ask the user sitting on the couch holding the remote staring at a static "please wait upgrade in progress" screen any questions.

Then if you could ask him questions, he'll just have no clue as to what to answer.

You can create "backup" files all you like, but 99% of the users will never ever see the file system, and do not know how to rename, edit or copy a file. Which on the other hand does not stop them from trying, and they're quite used to the situation that a simple reinstall will bring things back in working order if they somehow "got it wrong".

In the world I live in, things happen that change files that shouldn't be changed. Power outage (could be just the cleaning lady pulling the plug) just to name one.

Manually fixing things up is fine if you're an experienced developer or power user. But remember that the majority of the end users are less tech savvy, and just use a "box" with software that happens to be built by OpenEmbedded, which they never heard of.

Quoted 1 line

Quoted 1 line
What has changed since the last discussion?

Nothing relevant...

Signature · 1 line

Mike Looijmans

Robert Yang

author

2016-01-18 02:21 UTC #9 lore raw

Quoted 53 lines · Mike Looijmans

Quoted 16 lines · Robert Yang
Quoted 13 lines · Richard Purdie
Quoted 12 lines · Robert Yang
There are a lot of binary packages have files in /etc/, but only a few
of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does:
- All the files in /etc/ are CONFFILES
- 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]
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Signed-off-by Robert Yang <[email protected]>
---
  meta/conf/bitbake.conf |    1 +
  1 file changed, 1 insertion(+)
We have discussed this before and we decided that setting CONFFILES globally seemed like a bad idea?
That is how I recall it. Please please please don't do it. It will wreak havoc on all kinds of systems.
Quoted 9 lines
Sorry, but I can't find any emails which said this was a bad idea. If we don't set CONFFILES by default, maybe we need mark a lot of CONFFILES inside the recipes. I think that mark the CONFFILES under /etc/ doesn't hurt anything, but help a lot when doing upgrade on target:
1) When the old file is not changed, it will be replaced by new file.
2) When the old file is changed, it will ask the user what to do (dpkg) or save a bak (rpm).
In a perfect world, yeah.
In the world other people have to live in, the GUI has to shut down to free up resources to get the upgrade to complete successfully. This means you cannot ask the user sitting on the couch holding the remote staring at a static "please wait upgrade in progress" screen any questions.
Then if you could ask him questions, he'll just have no clue as to what to answer.
You can create "backup" files all you like, but 99% of the users will never ever see the file system, and do not know how to rename, edit or copy a file. Which on the other hand does not stop them from trying, and they're quite used to the situation that a simple reinstall will bring things back in working order if they somehow "got it wrong".

Quoted 8 lines

In the world I live in, things happen that change files that shouldn't be changed. Power outage (could be just the cleaning lady pulling the plug) just to name one.
Manually fixing things up is fine if you're an experienced developer or power user. But remember that the majority of the end users are less tech savvy, and just use a "box" with software that happens to be built by OpenEmbedded, which they never heard of.

For apt-get, you can configure dpkg to use non-interactive when upgrade or dist-upgrade:
--force-confnew or --force-confold

For ipkg, I think that you can use: --force-maintainer

For rpm, save a bak is the default action.

// Robert

Quoted 6 lines

Quoted 2 lines
Quoted 2 lines
What has changed since the last discussion?
Nothing relevant...

Robert Yang

author

2016-01-15 02:29 UTC #10 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

2016-01-15 02:29 UTC #11 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.3-P2.bb   |   11 -----------
 .../nfs-utils/nfs-utils_1.3.3.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.5.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.3-P2.bb +0 ~~-11~~

index 875a0c8..06165b1 100644
@@ -93,14 +93,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.3.bb +1 -1

index 2e0c8b1..30f068d 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 d81127c..cf0bd71 100644
@@ -149,9 +149,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 5f06034..0a1063e 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}-oa       = "${libdir}/pppd/${PV}/pppoatm.so"

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

index 2126377..111429a 100644
@@ -34,7 +34,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

2016-01-15 02:29 UTC #12 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.38.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.11.bb      |    2 --
 meta/recipes-extended/sudo/sudo.inc                |    2 --
 meta/recipes-extended/sysklogd/sysklogd.inc        |    1 -
 meta/recipes-extended/tzdata/tzdata_2015g.bb       |    3 ---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb      |    2 --
 10 files changed, 1 insertion(+), 21 deletions(-)

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

index 697501a..922ba00 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 5aa365d..bc8f19a 100644
@@ -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 () {

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

index 7cfc141..6f6a14e 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 5f1a601..6688d8e 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 3e69f11..cc5cb0f 100644
@@ -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"

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

index c6dccc6..e842e47 100644
@@ -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"

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 85b3cdc..aed4412 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 -3

index a6faa1d..4a573d1 100644
@@ -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"

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

index 652fe91..3996bfa 100644
@@ -68,5 +68,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

2016-01-15 02:29 UTC #13 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_1.8.20.bb              |    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/readline/readline.inc            |    2 --
 meta/recipes-core/systemd/systemd_228.bb           |    7 -------
 .../sysvinit/sysvinit-inittab_2.88dsf.bb           |    1 -
 meta/recipes-core/udev/udev-extraconf_1.1.bb       |    1 -
 11 files changed, 26 deletions(-)

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

index d391707..d61b58b 100644
@@ -174,7 +174,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 9541123..858468a 100644
@@ -42,9 +42,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_1.8.20.bb +0 -2

index 0c7f6b1..9063273 100644
@@ -39,8 +39,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 bad6424..c7d44af 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/readline/readline.inc +0 -2

index 35df8b4..f4fd077 100644
@@ -38,5 +38,3 @@ do_install_append () {
 }
 
 BBCLASSEXTEND = "native nativesdk"
-
-CONFFILES_${PN} += "${sysconfdir}/inputrc"

meta/recipes-core/systemd/systemd_228.bb +0 -7

index aa2e846..cbad8b8 100644
@@ -280,13 +280,6 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
 
 RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
 
-CONFFILES_${PN} = "${sysconfdir}/machine-id \
-                ${sysconfdir}/systemd/coredump.conf \
-                ${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 f539da8d..7a8b2ea 100644
@@ -77,7 +77,6 @@ fi
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES_${PN} = "${sysconfdir}/inittab ${sysconfdir}/init.d/start_getty"
-CONFFILES_${PN} = "${sysconfdir}/inittab"
 
 USE_VT ?= "1"
 SYSVINIT_ENABLED_GETTYS ?= "1"

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

index ecd4a8a..36aeafa 100644
@@ -34,7 +34,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

2016-01-15 02:29 UTC #14 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.1.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.1.bb +0 -1

index 577f495..345b555 100644
@@ -72,4 +72,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

2016-01-15 02:29 UTC #15 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

2016-01-15 02:29 UTC #16 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 ec73526..21853b5 100644
@@ -124,14 +124,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