summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJian Liu <jian.liu@windriver.com>2014-11-21 17:17:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-03 12:23:59 +0000
commit535afd4b06236fa5ac87d657c4da611f3f61c173 (patch)
tree098bb829dfe959a64e366eb927784d9a3022ac23 /meta
parent5007319cd2b19c846a19c948109e2cb977f53115 (diff)
downloadpoky-535afd4b06236fa5ac87d657c4da611f3f61c173.tar.gz
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. (From OE-Core rev: 2ffc174e9506a00081457145f0fcf3bef5846f4a) Signed-off-by: Jian Liu <jian.liu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb1
1 files changed, 1 insertions, 0 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 07f5c54c97..6157ff381a 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"
151PACKAGE_ARCH = "${MACHINE_ARCH}" 151PACKAGE_ARCH = "${MACHINE_ARCH}"
152 152
153CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]} ${sysconfdir}/shells" 153CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]} ${sysconfdir}/shells"
154CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile"
154 155