43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From de6aa6fdf977a8bc0022ceff1b219380573c9621 Mon Sep 17 00:00:00 2001
|
|
From: Jan Lieskovsky <jlieskov@redhat.com>
|
|
Date: Mon, 27 Jun 2016 15:33:13 +0200
|
|
Subject: [PATCH] [BugFix] [Infrastructure] Fix parallel make
|
|
|
|
As visible e.g. in:
|
|
https://kojipkgs.fedoraproject.org//work/tasks/1659/14671659/build.log
|
|
|
|
attempt to build current SSG master in parallel:
|
|
+ cd scap-security-guide-0.1.30
|
|
+ make -j4 dist
|
|
..
|
|
|
|
fails with:
|
|
..
|
|
mkdir ../shared/output
|
|
mkdir ../shared/output
|
|
xsltproc -o output/guide.xml ../shared/transforms/includelogo.xslt input/guide.xml
|
|
mkdir: cannot create directory '../shared/output': File exists
|
|
..
|
|
|
|
Fix that (so "make -j4 dist" will work again)
|
|
---
|
|
shared/product-make.include | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/shared/product-make.include b/shared/product-make.include
|
|
index 53fe067..c4c8e2e 100644
|
|
--- a/shared/product-make.include
|
|
+++ b/shared/product-make.include
|
|
@@ -55,7 +55,7 @@ $(OUT)/shorthand.xml: $(OUT)/guide.xml $(IN)/guide.xslt $(guide_xslt_deps)
|
|
# Create temporary $(SHARED)/$(OUT) folder to hold information like list of contributors or list of
|
|
# available remediation functions used by all SSG benchmarks
|
|
$(SHARED)/$(OUT):
|
|
- mkdir $@
|
|
+ mkdir -p $@
|
|
|
|
# Benchmark metadata prerequisite - derive $(SHARED)/$(OUT)/contributors.xml from the content of Contributors.md
|
|
$(SHARED)/$(OUT)/contributors.xml: $(SHARED)/$(OUT)
|
|
--
|
|
2.4.11
|
|
|