[oe-commits] Jian Liu : base-files: avoid overwritting editable files during package updating

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 2ffc174e9506a00081457145f0fcf3bef5846f4a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2ffc174e9506a00081457145f0fcf3bef5846f4a

Author: Jian Liu <jian.liu at windriver.com>
Date:   Fri Nov 21 17:17:10 2014 +0800

base-files: avoid overwritting editable files during package updating

Use CONFFILES to mark editable files as such,
  /etc/motd
  /etc/nsswitch.conf
  /etc/profile

If there is no %config micro before the file name in the spec file,
this file will be overwritten after updating package.
This will make our settings lost.

Signed-off-by: Jian Liu <jian.liu at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-core/base-files/base-files_3.0.14.bb | 1 +
 1 file changed, 1 insertion(+)

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 07f5c54..6157ff3 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
@@ -151,4 +151,5 @@ 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"