* [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does
@ 2015-10-09 2:44 Robert Yang
2015-10-09 2:44 ` [PATCH 1/8] bitbake.conf: set CONFFILES by default Robert Yang
` (7 more replies)
0 siblings, 8 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
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(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/8] bitbake.conf: set CONFFILES by default
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
@ 2015-10-09 2:44 ` Robert Yang
2015-10-09 14:19 ` Martin Jansa
2015-10-09 2:44 ` [PATCH 2/8] recipes-bsp: cleanup CONFFILES Robert Yang
` (6 subsequent siblings)
7 siblings, 1 reply; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
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 <liezhi.yang@windriver.com>
---
meta/conf/bitbake.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9ddd1c0..7a53819 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -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} \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/8] recipes-bsp: cleanup CONFFILES
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
2015-10-09 2:44 ` [PATCH 1/8] bitbake.conf: set CONFFILES by default Robert Yang
@ 2015-10-09 2:44 ` Robert Yang
2015-10-09 2:44 ` [PATCH 3/8] recipes-connectivity: " Robert Yang
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
The ${sysconfdir}/* are CONFFILES by default.
[YOCTO #8436]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-bsp/alsa-state/alsa-state.bb | 1 -
meta/recipes-bsp/pcmciautils/pcmciautils.inc | 2 --
2 files changed, 3 deletions(-)
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb
index d0f7bb3..ce59d33 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -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"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 9d1c55b..0bf0620 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/8] recipes-connectivity: cleanup CONFFILES
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
2015-10-09 2:44 ` [PATCH 1/8] bitbake.conf: set CONFFILES by default Robert Yang
2015-10-09 2:44 ` [PATCH 2/8] recipes-bsp: cleanup CONFFILES Robert Yang
@ 2015-10-09 2:44 ` Robert Yang
2015-10-09 2:44 ` [PATCH 4/8] recipes-extended: " Robert Yang
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
The ${sysconfdir}/* are CONFFILES by default.
[YOCTO #8436]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
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(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 825197d..966dfe0 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -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"
diff --git a/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb b/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb
index 1e1e726..ee63b28 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb
@@ -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 \
- "
-
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
index 42101de..da44500 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
@@ -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 \
diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb b/meta/recipes-connectivity/openssh/openssh_7.1p1.bb
index eeeb4b4..1678d74 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.1p1.bb
@@ -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"
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
index adc38e1..7fc2d00 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
@@ -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/ppp@.service"
FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug"
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
index a124cf2..005ec6e 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/8] recipes-extended: cleanup CONFFILES
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
` (2 preceding siblings ...)
2015-10-09 2:44 ` [PATCH 3/8] recipes-connectivity: " Robert Yang
@ 2015-10-09 2:44 ` Robert Yang
2015-10-09 2:44 ` [PATCH 5/8] recipes-core: " Robert Yang
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
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 | 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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/8] recipes-core: cleanup CONFFILES
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
` (3 preceding siblings ...)
2015-10-09 2:44 ` [PATCH 4/8] recipes-extended: " Robert Yang
@ 2015-10-09 2:44 ` Robert Yang
2015-10-09 2:44 ` [PATCH 6/8] recipes-devtools: " Robert Yang
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
The ${sysconfdir}/* are CONFFILES by default.
[YOCTO #8436]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
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 -
| 1 -
10 files changed, 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 e16fe72..f6eafb7 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 ed8f9fe..e3aabae 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 3971081..db5fcb4 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 5f60368..3c9d89c 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 733ae41..e8d87be 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 f90de6e..bd3795f 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 ccd89ff..7cff754 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 c2dad58..b816a2f 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 49b1326..b92c68d 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"
--git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb
index 6fbd925..f6786e8 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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/8] recipes-devtools: cleanup CONFFILES
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
` (4 preceding siblings ...)
2015-10-09 2:44 ` [PATCH 5/8] recipes-core: " Robert Yang
@ 2015-10-09 2:44 ` Robert Yang
2015-10-09 2:44 ` [PATCH 7/8] recipes-graphics: " Robert Yang
2015-10-09 2:44 ` [PATCH 8/8] recipes-multimedia/sato/support: " Robert Yang
7 siblings, 0 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
The ${sysconfdir}/* are CONFFILES by default.
[YOCTO #8436]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
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(-)
diff --git a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
index ace3de4..861f011 100644
--- a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
+++ b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
@@ -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"
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.0.bb b/meta/recipes-devtools/opkg/opkg_0.3.0.bb
index 588250e..b510580 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.0.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.0.bb
@@ -71,4 +71,3 @@ FILES_${PN} += "${systemd_unitdir}/system/"
BBCLASSEXTEND = "native nativesdk"
-CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 7/8] recipes-graphics: cleanup CONFFILES
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
` (5 preceding siblings ...)
2015-10-09 2:44 ` [PATCH 6/8] recipes-devtools: " Robert Yang
@ 2015-10-09 2:44 ` Robert Yang
2015-10-09 2:44 ` [PATCH 8/8] recipes-multimedia/sato/support: " Robert Yang
7 siblings, 0 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
The ${sysconfdir}/* are CONFFILES by default.
[YOCTO #8436]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../xinput-calibrator/pointercal-xinput_0.0.bb | 1 -
.../xorg-xserver/xserver-xf86-config_0.1.bb | 3 ---
2 files changed, 4 deletions(-)
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
index 65348c3..9b52505 100644
--- a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
+++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
@@ -17,4 +17,3 @@ do_install() {
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
-CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index e07c204..aa5099c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 8/8] recipes-multimedia/sato/support: cleanup CONFFILES
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
` (6 preceding siblings ...)
2015-10-09 2:44 ` [PATCH 7/8] recipes-graphics: " Robert Yang
@ 2015-10-09 2:44 ` Robert Yang
7 siblings, 0 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 2:44 UTC (permalink / raw)
To: openembedded-core
The ${sysconfdir}/* are CONFFILES by default.
[YOCTO #8436]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
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(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 5b806d7..1ab7768 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -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
diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
index e27339f..2ccda38 100644
--- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
+++ b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
@@ -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"
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
index 716e3df..aca34a4 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb
@@ -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
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/8] bitbake.conf: set CONFFILES by default
2015-10-09 2:44 ` [PATCH 1/8] bitbake.conf: set CONFFILES by default Robert Yang
@ 2015-10-09 14:19 ` Martin Jansa
2015-10-09 14:56 ` Robert Yang
0 siblings, 1 reply; 11+ messages in thread
From: Martin Jansa @ 2015-10-09 14:19 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1496 bytes --]
On Thu, Oct 08, 2015 at 07:44:36PM -0700, Robert Yang wrote:
> 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 <liezhi.yang@windriver.com>
> ---
> meta/conf/bitbake.conf | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 9ddd1c0..7a53819 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -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} ?
>
> FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
> ${sysconfdir} ${sharedstatedir} ${localstatedir} \
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/8] bitbake.conf: set CONFFILES by default
2015-10-09 14:19 ` Martin Jansa
@ 2015-10-09 14:56 ` Robert Yang
0 siblings, 0 replies; 11+ messages in thread
From: Robert Yang @ 2015-10-09 14:56 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 10/09/2015 10:19 PM, Martin Jansa wrote:
> On Thu, Oct 08, 2015 at 07:44:36PM -0700, Robert Yang wrote:
>> 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 <liezhi.yang@windriver.com>
>> ---
>> meta/conf/bitbake.conf | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>> index 9ddd1c0..7a53819 100644
>> --- a/meta/conf/bitbake.conf
>> +++ b/meta/conf/bitbake.conf
>> @@ -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
>
>>
>> FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
>> ${sysconfdir} ${sharedstatedir} ${localstatedir} \
>> --
>> 1.7.9.5
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2015-10-09 14:56 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-09 2:44 [YOCTO 2.1] [PATCH 0/8] set CONFFILES to /etc/* by default as Debian does Robert Yang
2015-10-09 2:44 ` [PATCH 1/8] bitbake.conf: set CONFFILES by default Robert Yang
2015-10-09 14:19 ` Martin Jansa
2015-10-09 14:56 ` Robert Yang
2015-10-09 2:44 ` [PATCH 2/8] recipes-bsp: cleanup CONFFILES Robert Yang
2015-10-09 2:44 ` [PATCH 3/8] recipes-connectivity: " Robert Yang
2015-10-09 2:44 ` [PATCH 4/8] recipes-extended: " Robert Yang
2015-10-09 2:44 ` [PATCH 5/8] recipes-core: " Robert Yang
2015-10-09 2:44 ` [PATCH 6/8] recipes-devtools: " Robert Yang
2015-10-09 2:44 ` [PATCH 7/8] recipes-graphics: " Robert Yang
2015-10-09 2:44 ` [PATCH 8/8] recipes-multimedia/sato/support: " Robert Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.