[PATCH] busybox: update appletlib dependency patch

[PATCH] busybox: update appletlib dependency patch

[Roman I Khimov]

Previous version still failed from time to time on clean-start builds
with 4 bitbake threads and '-j16'. Building busybox as sole target worked
well.

The reason is that previous version introduced a race between applets make
processes spawned from top-level Makefile and from libbb Makefile.

Fix it with high-level dependency that doesn't create races.
---
 .../files/busybox-appletlib-dependency.patch       |   24 +++++++++++--------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/recipes/busybox/files/busybox-appletlib-dependency.patch b/recipes/busybox/files/busybox-appletlib-dependency.patch
index 85a61e8..3efd4c0 100644
--- a/recipes/busybox/files/busybox-appletlib-dependency.patch
+++ b/recipes/busybox/files/busybox-appletlib-dependency.patch
@@ -1,11 +1,15 @@
---- a/libbb/Kbuild	2008-11-09 20:28:09.000000000 +0300
-+++ b/libbb/Kbuild	2009-02-17 17:41:48.718747865 +0300
-@@ -147,3 +147,8 @@ lib-$(CONFIG_PGREP) += xregcomp.o
- lib-$(CONFIG_PKILL) += xregcomp.o
- lib-$(CONFIG_DEVFSD) += xregcomp.o
- lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o
+Index: busybox-1.13.2/Makefile
+===================================================================
+--- busybox-1.13.2.orig/Makefile	2009-03-19 15:44:37.419270265 +0300
++++ busybox-1.13.2/Makefile	2009-03-19 15:45:57.737521296 +0300
+@@ -471,6 +471,10 @@
+ 		util-linux/ \
+ 		util-linux/volume_id/ \
+ 
++# Lib interdeps
++# libbb uses headers generated in applets
++libbb: applets
 +
-+libbb/appletlib.o: include/usage_compressed.h include/applet_tables.h
-+
-+include/usage_compressed.h include/applet_tables.h:
-+        $(Q)$(MAKE) $(build)=applets $@
+ endif # KBUILD_EXTMOD
+ 
+ ifeq ($(dot-config),1)
-- 
1.6.2.1


-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Re: [PATCH] busybox: update appletlib dependency patch

[Roman I Khimov]

On Friday 27 March 2009 12:03:58 Roman I Khimov wrote:
>  .../files/busybox-appletlib-dependency.patch       |   24
> +++++++++++-------- 1 files changed, 14 insertions(+), 10 deletions(-)

ping

Re: [PATCH] busybox: update appletlib dependency patch

[Koen Kooi]

Acked-by: Koen Kooi <koen@openembedded.org>


On 27-03-09 10:03, Roman I Khimov wrote:
> Previous version still failed from time to time on clean-start builds
> with 4 bitbake threads and '-j16'. Building busybox as sole target worked
> well.
>
> The reason is that previous version introduced a race between applets make
> processes spawned from top-level Makefile and from libbb Makefile.
>
> Fix it with high-level dependency that doesn't create races.
> ---
>   .../files/busybox-appletlib-dependency.patch       |   24 +++++++++++--------
>   1 files changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/recipes/busybox/files/busybox-appletlib-dependency.patch b/recipes/busybox/files/busybox-appletlib-dependency.patch
> index 85a61e8..3efd4c0 100644
> --- a/recipes/busybox/files/busybox-appletlib-dependency.patch
> +++ b/recipes/busybox/files/busybox-appletlib-dependency.patch
> @@ -1,11 +1,15 @@
> ---- a/libbb/Kbuild	2008-11-09 20:28:09.000000000 +0300
> -+++ b/libbb/Kbuild	2009-02-17 17:41:48.718747865 +0300
> -@@ -147,3 +147,8 @@ lib-$(CONFIG_PGREP) += xregcomp.o
> - lib-$(CONFIG_PKILL) += xregcomp.o
> - lib-$(CONFIG_DEVFSD) += xregcomp.o
> - lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o
> +Index: busybox-1.13.2/Makefile
> +===================================================================
> +--- busybox-1.13.2.orig/Makefile	2009-03-19 15:44:37.419270265 +0300
> ++++ busybox-1.13.2/Makefile	2009-03-19 15:45:57.737521296 +0300
> +@@ -471,6 +471,10 @@
> + 		util-linux/ \
> + 		util-linux/volume_id/ \
> +
> ++# Lib interdeps
> ++# libbb uses headers generated in applets
> ++libbb: applets
>   +
> -+libbb/appletlib.o: include/usage_compressed.h include/applet_tables.h
> -+
> -+include/usage_compressed.h include/applet_tables.h:
> -+        $(Q)$(MAKE) $(build)=applets $@
> + endif # KBUILD_EXTMOD
> +
> + ifeq ($(dot-config),1)

Re: [PATCH] busybox: update appletlib dependency patch

[Holger Schurig]

> The reason is that previous version introduced a race between
> applets make processes spawned from top-level Makefile and
> from libbb Makefile.

Just a question: do you (we?) make sure that such patches end up 
upstream?