This is the original patch from upstream
http://git.busybox.net/busybox/commit/?h=1_18_stable&id=adbe3b5b982874071b9b826cea1632fc00c85982.

Signed-off-by: Bernhard Walle <bernh...@bwalle.de>
---
 .../0001-reactivate-check-for-tty.patch            |    2 +-
 ...nstant-unsigned-to-avoid-integer-overflow.patch |    2 +-
 ...ild-system-make-3.82-fix.-Closes-bug-2323.patch |   46 ++++++++++++++++++++
 patches/busybox-1.17.1/series                      |    3 +-
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 
patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch

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 059d2f6..d42fb51 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 a29ff31..3a2c88d 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 0000000..ecd8653
--- /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.li...@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.li...@googlemail.com>
+Signed-off-by: Bernhard Walle <bernh...@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 aaa104a..559fd11 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
-- 
1.7.5.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to