Skip to content
Browse files

base-files: remove ${sysconfdir}/tmpfiles.d/var-run.conf

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
  • Loading branch information...
1 parent 7b4f618 commit 939af15d3f265602492f4f733f58e2e8b60d9647 @schnitzeltony schnitzeltony committed with kraj Dec 11, 2012
View
2 recipes-core/base-files/base-files/var-run.conf
@@ -1,2 +0,0 @@
-# empty /var/run
-R /var/run/* - - - - -
View
9 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/
-}

0 comments on commit 939af15

Please sign in to comment.
Something went wrong with that request. Please try again.