From: Andreas Müller <schnitzelt...@googlemail.com> Fix conflict with systemd's version of the same file causing errors at do_rootfs like:
| * check_data_file_clashes: Package systemd wants to install file /home/andreas/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-full-image/1.0-r0/rootfs/etc/tmpfiles.d/var-run.conf | But that file is already provided by package * base-files --- recipes-core/base-files/base-files/var-run.conf | 2 -- recipes-core/base-files/base-files_3.0.14.bbappend | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 recipes-core/base-files/base-files/var-run.conf diff --git a/recipes-core/base-files/base-files/var-run.conf b/recipes-core/base-files/base-files/var-run.conf deleted file mode 100644 index 782cc4a..0000000 --- a/recipes-core/base-files/base-files/var-run.conf +++ /dev/null @@ -1,2 +0,0 @@ -# empty /var/run -R /var/run/* - - - - - diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index 80a72ad..5420ddb 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,8 +1,6 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}" - -PRINC = "14" -SRC_URI_append = " file://var-run.conf" +PRINC = "15" # Original: volatiles = "cache run log lock tmp" # We don't any of those in volatiles, so: @@ -34,8 +32,3 @@ do_install_angstromissue () { echo >> ${D}${sysconfdir}/issue fi } - -do_install_append() { - install -d ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ -} -- 1.7.9.5 _______________________________________________ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel