[v3] base-files-3.0.14 configuration files

Submitted by Peter Gsellmann on March 22, 2011, 11:17 a.m.

Details

Message ID 201103221217.53713.pgsellmann@portner-elektronik.at
State New, archived
Headers show

Commit Message

Peter Gsellmann March 22, 2011, 11:17 a.m.
Mark some files in ${sysconfdir} as configuration files so they are not blindly overwritten when upgrading
Adjust conffiles variable to be usable as default in CONFFILES
Distros nylon,slugos inherit and amend default set of conffiles
Distro micro has very few configuration files

Signed-off-by: Peter Gsellmann <pgsellmann@portner-elektronik.at>
---
 recipes/base-files/base-files_3.0.14.bb |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

Patch hide | download patch | download mbox

diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index 0aa27f4..6d64699 100644
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,7 +1,8 @@ 
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r102"
+PR = "r103"
+
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -55,10 +56,10 @@  media = "card cf net ram"
 media_micro = ""
 
 volatiles = "cache run log lock tmp"
-conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
-	     ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
-	     ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
-	     ${sysconfdir}/default"
+conffiles = "${sysconfdir}/fstab ${sysconfdir}/host.conf ${sysconfdir}/hostname \
+            ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
+            ${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
+            "
 
 #
 # set standard hostname, might be a candidate for a DISTRO variable? :M:
@@ -95,7 +96,7 @@  do_install () {
 	fi
 
         if [ "${DISTRO}" != "micro" -a "${DISTRO}" != "micro-uclibc" ]; then
-                install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}  
+                install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
 
                 if [ -n "${DISTRO_NAME}" ]; then
         		echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
@@ -181,8 +182,8 @@  PACKAGE_ARCH_rt3000 = "rt3000"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
-CONFFILES_${PN}_micro = ""
-CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
-CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
+CONFFILES_${PN} = "${conffiles}"
+CONFFILES_${PN}_micro = "${sysconfdir}/hostname ${sysconfdir}/nsswitch.conf"
+CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${conffiles}"
+CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${conffiles}"