X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fuml%2Fpatches%2F005-fix_bash4_builds.patch;h=687f5f04e8c5419e4bee936b7f22fda5f1ad5424;hb=a2796f592da404dc8386ae468c1ec58af6bbae65;hp=956182489d4b2662b6b09078b4ff0264f00c5cd1;hpb=cf96a9f7271021d375c42ffcae7290f161a91191;p=openwrt-10.03%2F.git

diff --git a/target/linux/uml/patches/005-fix_bash4_builds.patch b/target/linux/uml/patches/005-fix_bash4_builds.patch
index 956182489..687f5f04e 100644
--- a/target/linux/uml/patches/005-fix_bash4_builds.patch
+++ b/target/linux/uml/patches/005-fix_bash4_builds.patch
@@ -11,11 +11,9 @@ Date:   Sun Sep 6 14:36:01 2009 +0200
     
     Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
 
-diff --git a/arch/um/Makefile b/arch/um/Makefile
-index 0728def..dc1ea7d 100644
 --- a/arch/um/Makefile
 +++ b/arch/um/Makefile
-@@ -99,9 +99,6 @@ CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,)
+@@ -99,9 +99,6 @@ CFLAGS_NO_HARDENING := $(call cc-option,
  CONFIG_KERNEL_STACK_ORDER ?= 2
  STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
  
@@ -32,8 +30,6 @@ index 0728def..dc1ea7d 100644
 -export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH
 +export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH \
 +       ELF_ARCH ELF_FORMAT STACK_SIZE START
-diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
-index 388ec0a..2907436 100644
 --- a/arch/um/kernel/Makefile
 +++ b/arch/um/kernel/Makefile
 @@ -3,6 +3,10 @@