From cdfdcdf72f35bf0f0cd55b405e4ee4b462d0f29c Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 8 Oct 2015 08:15:42 -0700 Subject: [PATCH] recipes-connectivity: cleanup CONFFILES The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang --- meta/recipes-connectivity/avahi/avahi.inc | 2 -- meta/recipes-connectivity/bind/bind_9.10.3-P2.bb | 11 ----------- .../recipes-connectivity/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(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 825197d6108..966dfe03b54 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.3-P2.bb b/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb index 875a0c8f808..06165b1da09 100644 --- a/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb +++ b/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb @@ -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 \ - " - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb index 2e0c8b19135..30f068dc90c 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.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 d81127cdcd4..cf0bd71ad8e 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.1p1.bb @@ -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" diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 5f06034727d..0a1063e6fcc 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}-oa = "${libdir}/pppd/${PV}/pppoatm.so" diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb index 21263771ed7..111429ae722 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb @@ -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 -- 2.47.2