util-linux: fix intermittent build failure

This has been killing builds every once and a while for a long time.
This commit is contained in:
Michael Marineau 2014-09-02 20:46:05 -07:00
parent 8916bf4013
commit c78493c0bc
2 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,36 @@
From 652e0379c181b3e7a477f9a67e1ada0988421513 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 2 Sep 2014 20:25:39 -0700
Subject: [PATCH] build-sys: create parent directory for $(PATHFILES)
When building outside the source tree there is nothing to guarantee the
target directory exists before writing to it. Most of the time this just
happens to work because something else creates the directory but not
always. For example:
$ mkdir build
$ cd build
$ ../configure --disable-dependency-tracking
$ make libuuid/uuid.pc
GEN libuuid/uuid.pc
/bin/sh: line 2: libuuid/uuid.pc.tmp: No such file or directory
make: *** [libuuid/uuid.pc] Error 1
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am
index 79b5aea..08269e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,6 +128,7 @@ EXTRA_DIST += $(PATHFILES:=.in)
$(PATHFILES): Makefile
@ rm -f $@ $@.tmp
+ $(AM_V_at) test -d $(dir $@) || mkdir -p $(dir $@)
$(AM_V_GEN) srcdir=''; \
test -f ./$@.in || srcdir=$(srcdir)/; \
$(edit_cmd) $${srcdir}$@.in >$@.tmp
--
1.8.5.5

View File

@ -61,6 +61,7 @@ pkg_setup() {
} }
src_prepare() { src_prepare() {
epatch "${FILESDIR}/0001-build-sys-create-parent-directory-for-PATHFILES.patch"
epatch "${FILESDIR}/0002-lsblk-add-PARTTYPE-tag.patch" epatch "${FILESDIR}/0002-lsblk-add-PARTTYPE-tag.patch"
if [[ ${PV} == 9999 ]] ; then if [[ ${PV} == 9999 ]] ; then