diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2011-05-09 22:09:01 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-10 07:54:57 +0200 |
| commit | 559844730ca18f6acd9411b248a3122867f43ff1 (patch) | |
| tree | affa8758d2f51955f62fd161dfe88fff796d1c44 | |
| parent | 0f891e388cf10ec1e743798fdc1f4ba3a5c7c05f (diff) | |
| download | ptxdist-559844730ca18f6acd9411b248a3122867f43ff1.tar.gz ptxdist-559844730ca18f6acd9411b248a3122867f43ff1.tar.xz | |
busybox: Fix build with make 3.82
This is the original patch from upstream
http://git.busybox.net/busybox/commit/?h=1_18_stable&id=adbe3b5b982874071b9b826cea1632fc00c85982.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
4 files changed, 50 insertions, 3 deletions
diff --git a/patches/busybox-1.17.1/0001-reactivate-check-for-tty.patch b/patches/busybox-1.17.1/0001-reactivate-check-for-tty.patch index 059d2f67f..d42fb51ca 100644 --- a/patches/busybox-1.17.1/0001-reactivate-check-for-tty.patch +++ b/patches/busybox-1.17.1/0001-reactivate-check-for-tty.patch @@ -27,5 +27,5 @@ index 9befa2b..e65e25c 100644 case 'd': input_mode = set_default; -- -1.7.1 +1.7.5.1 diff --git a/patches/busybox-1.17.1/0002-make-constant-unsigned-to-avoid-integer-overflow.patch b/patches/busybox-1.17.1/0002-make-constant-unsigned-to-avoid-integer-overflow.patch index a29ff3134..3a2c88dde 100644 --- a/patches/busybox-1.17.1/0002-make-constant-unsigned-to-avoid-integer-overflow.patch +++ b/patches/busybox-1.17.1/0002-make-constant-unsigned-to-avoid-integer-overflow.patch @@ -21,5 +21,5 @@ index b55af6d..4ec4b08 100644 #else COMPRESS_MAGIC = 0x9d1f, -- -1.7.1 +1.7.5.1 diff --git a/patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch b/patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch new file mode 100644 index 000000000..ecd8653cb --- /dev/null +++ b/patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch @@ -0,0 +1,46 @@ +From: Denys Vlasenko <vda.linux@googlemail.com> +Date: Sun, 22 Aug 2010 07:28:46 +0000 +Subject: [PATCH] build system: make 3.82 fix. Closes bug 2323 + +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> +--- + Makefile | 13 +++++++++++-- + 1 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 03e9885..a1e9cce 100644 +--- a/Makefile ++++ b/Makefile +@@ -433,7 +433,12 @@ ifeq ($(config-targets),1) + -include $(srctree)/arch/$(ARCH)/Makefile + export KBUILD_DEFCONFIG + +-config %config: scripts_basic outputmakefile gen_build_files FORCE ++config: scripts_basic outputmakefile gen_build_files FORCE ++ $(Q)mkdir -p include ++ $(Q)$(MAKE) $(build)=scripts/kconfig $@ ++ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease ++ ++%config: scripts_basic outputmakefile gen_build_files FORCE + $(Q)mkdir -p include + $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease +@@ -1285,9 +1290,13 @@ endif + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + + # Modules +-/ %/: prepare scripts FORCE ++%/: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) ++/: prepare scripts FORCE ++ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ ++ $(build)=$(build-dir) ++ + %.ko: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) $(@:.ko=.o) +-- +1.7.5.1 + diff --git a/patches/busybox-1.17.1/series b/patches/busybox-1.17.1/series index aaa104a14..559fd1125 100644 --- a/patches/busybox-1.17.1/series +++ b/patches/busybox-1.17.1/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches 0001-reactivate-check-for-tty.patch 0002-make-constant-unsigned-to-avoid-integer-overflow.patch -# c20526b5b00fb9214f7c11f09bfa60c8 - git-ptx-patches magic +0003-build-system-make-3.82-fix.-Closes-bug-2323.patch +# e028d583e9f6b6fec5ad3deb8a550489 - git-ptx-patches magic |