busybox: add parallel building fix

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 47 insertions, 6 deletions

diff --git a/patches/busybox-1.27.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.27.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
index 98ad36e1d..5a21793d8 100644
--- a/patches/busybox-1.27.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
+++ b/patches/busybox-1.27.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
@@ -16,7 +16,7 @@ Signed-off-by: Dinny Wu <dinny.wu@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/applets/usage_pod.c b/applets/usage_pod.c
-index 0b1c4aadb8c4..a67e8b4ac348 100644
+index ccc166aed708..9e6d3f0ee5b1 100644
 --- a/applets/usage_pod.c
 +++ b/applets/usage_pod.c
 @@ -71,7 +71,7 @@ int main(void)
diff --git a/patches/busybox-1.27.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.27.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
index 94bb37c8e..3858a0efb 100644
--- a/patches/busybox-1.27.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
+++ b/patches/busybox-1.27.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
@@ -9,10 +9,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/trylink b/scripts/trylink
-index 145df9959091..3f3000141627 100755
+index 9f288c141a6b..713c09d523c8 100755
 --- a/scripts/trylink
 +++ b/scripts/trylink
-@@ -264,7 +264,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
+@@ -262,7 +262,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
  	cat $EXE.out
  	exit 1
      }
@@ -26,7 +26,7 @@ index 145df9959091..3f3000141627 100755
      chmod a+x "$sharedlib_dir/libbusybox.so.$BB_VER"
      echo "libbusybox: $sharedlib_dir/libbusybox.so.$BB_VER"
  fi
-@@ -285,7 +290,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
+@@ -283,7 +288,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
  	cat $EXE.out
  	exit 1
      }
@@ -39,7 +39,7 @@ index 145df9959091..3f3000141627 100755
      echo "busybox linked against libbusybox: $sharedlib_dir/busybox"
  fi
  
-@@ -322,7 +331,9 @@ int main(int argc, char **argv)
+@@ -320,7 +329,9 @@ int main(int argc, char **argv)
  	    exit 1
  	}
  	rm -- "$sharedlib_dir/applet.c" $EXE.out
diff --git a/patches/busybox-1.27.2/0204-build-system-fix-parallel-building-issue.patch b/patches/busybox-1.27.2/0204-build-system-fix-parallel-building-issue.patch
new file mode 100644
index 000000000..0a4353716
--- /dev/null
+++ b/patches/busybox-1.27.2/0204-build-system-fix-parallel-building-issue.patch
@@ -0,0 +1,40 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 9 Mar 2018 19:50:05 +0100
+Subject: [PATCH] build system: fix parallel building issue
+
+The files generated by the include/config/MARKER target are in the
+dependency list for applets/applet_tables.
+If applets/applet_tables is created first during applets_dir then it will
+be created again later as part of $(busybox-dirs).
+As a result include/applet_tables.h is created again. This time while other
+build commands may need it.
+
+Change the dependency for include/applet_tables.h and include/NUM_APPLETS.h
+on applets/applet_tables into a existence-only dependency. This way the
+header files are not recreated even if applets/applet_tables is rebuilt.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ applets/Kbuild.src | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applets/Kbuild.src b/applets/Kbuild.src
+index 3aedbbffef82..bf6014b92c5b 100644
+--- a/applets/Kbuild.src
++++ b/applets/Kbuild.src
+@@ -40,7 +40,7 @@ include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compress
+ quiet_cmd_gen_applet_tables = GEN     include/applet_tables.h include/NUM_APPLETS.h
+       cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h include/NUM_APPLETS.h
+ 
+-include/NUM_APPLETS.h: applets/applet_tables
++include/NUM_APPLETS.h: | applets/applet_tables
+ 	$(call cmd,gen_applet_tables)
+ 
+ # In fact, include/applet_tables.h depends only on applets/applet_tables,
+@@ -53,5 +53,5 @@ include/NUM_APPLETS.h: applets/applet_tables
+ # The alternative is to not list any command,
+ # and then if include/applet_tables.h is deleted, it won't be rebuilt.
+ #
+-include/applet_tables.h: include/NUM_APPLETS.h applets/applet_tables
++include/applet_tables.h: include/NUM_APPLETS.h | applets/applet_tables
+ 	$(call cmd,gen_applet_tables)
diff --git a/patches/busybox-1.27.2/series b/patches/busybox-1.27.2/series
index 0a33a9367..df6b177fb 100644
--- a/patches/busybox-1.27.2/series
+++ b/patches/busybox-1.27.2/series
@@ -8,4 +8,5 @@
 0201-Fix-the-format-warning-when-building-applets-usage_p.patch
 0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
 0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
-# c4ffec89734e3af634e61b0c146d8c80  - git-ptx-patches magic
+0204-build-system-fix-parallel-building-issue.patch
+# 26cfaf1fa63d12318d8b1d80748aa8b3  - git-ptx-patches magic