Patch by michael tesch <tesch1@gmail.com> ...

  The real problem, only caused when you have a *.patch file in the
  main build directory, is that the Makefiles don't escape the globbing
  operator they're passing to patch-kernel.sh.  Attached is a patch to
  fix that.

diff --git a/make/binutils-uclibc.mk b/make/binutils-uclibc.mk
index 8ed94d6f3f94413a431544c5f7f25bd541d13d8a..6199990d5c1ba92339ea9aa360939196d948c90a 100644 (file)
--- a/make/binutils-uclibc.mk
+++ b/make/binutils-uclibc.mk
@@ -33,7 +33,7 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)
 
 $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked
        # Apply appropriate binutils patches.
-       $(SOURCE_DIR)/patch-kernel.sh $(BINUTILS_DIR) $(SOURCE_DIR)/binutils/$(BINUTILS_VERSION) *.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(BINUTILS_DIR) $(SOURCE_DIR)/binutils/$(BINUTILS_VERSION) \*.patch
        touch $(BINUTILS_DIR)/.patched
 
 $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched

diff --git a/make/busybox.mk b/make/busybox.mk
index b6cd287fc3992d0b7b8847e4f29ce108a22d2747..ecafc7da19ce26f38436d3e4399c510085f192f6 100644 (file)
--- a/make/busybox.mk
+++ b/make/busybox.mk
@@ -25,7 +25,7 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
 $(BUSYBOX_DIR)/.configured: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
        $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
        # Allow busybox patches.
-       $(SOURCE_DIR)/patch-kernel.sh $(BUSYBOX_DIR) $(SOURCE_DIR) busybox-*.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(BUSYBOX_DIR) $(SOURCE_DIR) busybox-\*.patch
        cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config
        $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
                PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak

diff --git a/make/dnsmasq.mk b/make/dnsmasq.mk
index 7944d621145aed1666ff60d3627ce50c8e3b566b..c59204992c2993bd6707de7de64ab211e16d7c7e 100644 (file)
--- a/make/dnsmasq.mk
+++ b/make/dnsmasq.mk
@@ -23,7 +23,7 @@ $(DL_DIR)/$(DNSMASQ_SOURCE):
 $(DNSMASQ_DIR)/.source: $(DL_DIR)/$(DNSMASQ_SOURCE)
        zcat $(DL_DIR)/$(DNSMASQ_SOURCE) | tar -C $(BUILD_DIR) -xvf -
        $(SOURCE_DIR)/patch-kernel.sh $(DNSMASQ_DIR) $(SOURCE_DIR) \
-               $(DNSMASQ_VER)-*.patch
+               $(DNSMASQ_VER)-\*.patch
        touch $(DNSMASQ_DIR)/.source
 
 $(DNSMASQ_DIR)/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source

diff --git a/make/dropbear_sshd.mk b/make/dropbear_sshd.mk
index 93664e2d04bf80e8c4b5b799f3202b3f6e5032d8..407fb57794972cde5d495dc07d168c2114a86015 100644 (file)
--- a/make/dropbear_sshd.mk
+++ b/make/dropbear_sshd.mk
@@ -18,7 +18,7 @@ dropbear_sshd-source: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE)
 
 $(DROPBEAR_SSHD_DIR)/.unpacked: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE)
        $(DROPBEAR_SSHD_CAT) $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-       $(SOURCE_DIR)/patch-kernel.sh $(DROPBEAR_SSHD_DIR) $(SOURCE_DIR) dropbear-*.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(DROPBEAR_SSHD_DIR) $(SOURCE_DIR) dropbear-\*.patch
        $(SED) 's,^/\* #define DROPBEAR_MULTI.*,#define DROPBEAR_MULTI,g' $(DROPBEAR_SSHD_DIR)/options.h
        touch $(DROPBEAR_SSHD_DIR)/.unpacked
 

diff --git a/make/gcc-uclibc-2.95.mk b/make/gcc-uclibc-2.95.mk
index ddbf118e9f2d3fcea54697b28e020afcfad33e27..90d8fc63fa8406421fec893bc76719a777663aef 100644 (file)
--- a/make/gcc-uclibc-2.95.mk
+++ b/make/gcc-uclibc-2.95.mk
@@ -62,7 +62,7 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
        # Apply any files named gcc-*.patch from the source directory to gcc
-       $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR)/gcc/$(GCC_VERSION) *.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR)/gcc/$(GCC_VERSION) \*.patch
        #
        # We do not wish to build the libstdc++ library provided with gcc,
        # since it doesn't seem to work at all with uClibc plus gcc 2.95...

diff --git a/make/gcc-uclibc-3.x.mk b/make/gcc-uclibc-3.x.mk
index cfa5049980625134b1d1e6cd4d6f80efde06a5d4..ff44759cd722861a611761e3c17380c5d5f5ff34 100644 (file)
--- a/make/gcc-uclibc-3.x.mk
+++ b/make/gcc-uclibc-3.x.mk
@@ -67,7 +67,7 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
        # Apply any files named gcc-*.patch from the source directory to gcc
-       $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR)/gcc/$(GCC_VERSION) *.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR)/gcc/$(GCC_VERSION) \*.patch
        # Note: The soft float situation has improved considerably with gcc 3.4.x.
        # We can dispense with the custom spec files, as well as libfloat for the arm case.
        # However, we still need a patch for arm.  There's a similar patch for gcc 3.3.x

diff --git a/make/gdb.mk b/make/gdb.mk
index 4030ede7ff12fe60b4bf252e9869c9e8177420e3..e1f590f6c62d77ee1acde4e6e7825279a8d8a387 100644 (file)
--- a/make/gdb.mk
+++ b/make/gdb.mk
@@ -22,7 +22,7 @@ $(DL_DIR)/$(GDB_SOURCE):
 
 $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
        $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
-       $(SOURCE_DIR)/patch-kernel.sh $(GDB_DIR) $(SOURCE_DIR)/gdb/$(GDB_VERSION) *.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(GDB_DIR) $(SOURCE_DIR)/gdb/$(GDB_VERSION) \*.patch
        # Copy a config.sub from gcc.  This is only necessary until
        # gdb's config.sub supports <arch>-linux-uclibc tuples.
        # Should probably integrate this into the patch.

diff --git a/make/iptables.mk b/make/iptables.mk
index 886e54213d56eb1b054a2f73c15f7353872e4987..937348a53c6846adfdc4457465d759728b8d1b27 100644 (file)
--- a/make/iptables.mk
+++ b/make/iptables.mk
@@ -16,7 +16,7 @@ $(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE)
 
 $(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked
        # Allow patches.  Needed for openwrt for instance.
-       $(SOURCE_DIR)/patch-kernel.sh $(IPTABLES_BUILD_DIR) $(SOURCE_DIR) iptables-*.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(IPTABLES_BUILD_DIR) $(SOURCE_DIR) iptables-\*.patch
        #
        $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \
                $(BUILD_DIR)/uClibc/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile

diff --git a/make/kernel-headers.mk b/make/kernel-headers.mk
index 0eb2035fcad32edac380fd7160d9dac20b16e44c..07c2bd5d97cc736de312eca96f6cdcb0b35db37e 100644 (file)
--- a/make/kernel-headers.mk
+++ b/make/kernel-headers.mk
@@ -56,7 +56,7 @@ endif
        touch $(LINUX_DIR)/.unpacked
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
-       $(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR) linux-libc-headers-$(LINUX_VERSION)-*.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR) linux-libc-headers-$(LINUX_VERSION)-\*.patch
        touch $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched

diff --git a/make/mrouted.mk b/make/mrouted.mk
index 13a4f8c72041e40d0d4823a1a1f9f681d2a71a47..c017d910b5fc5d22aeb5fc6f8938045e95b2268a 100644 (file)
--- a/make/mrouted.mk
+++ b/make/mrouted.mk
@@ -24,7 +24,7 @@ mrouted-source: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH)
 $(MROUTED_DIR)/.unpacked: mrouted-source
        $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_SOURCE) | tar -C $(BUILD_DIR) -xvf -
        $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_PATCH) | patch -p1 -d $(MROUTED_DIR)
-       $(SOURCE_DIR)/patch-kernel.sh $(MROUTED_DIR) $(SOURCE_DIR) mrouted-*.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(MROUTED_DIR) $(SOURCE_DIR) mrouted-\*.patch
        touch $(MROUTED_DIR)/.unpacked
 
 $(MROUTED_DIR)/$(MROUTED_BINARY): $(MROUTED_DIR)/.unpacked

diff --git a/make/ncurses.mk b/make/ncurses.mk
index f57868e5400eea5024492be64348cc80c98fed0d..03d8ce663ff94eb339389aec24dd4c5f09cab9ac 100644 (file)
--- a/make/ncurses.mk
+++ b/make/ncurses.mk
@@ -5,7 +5,7 @@
 #
 #############################################################
 # Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
-# $Id: ncurses.mk,v 1.34 2004/09/03 00:49:33 mjn3 Exp $
+# $Id: ncurses.mk,v 1.35 2004/09/09 10:50:57 mjn3 Exp $
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Library General Public License as
@@ -35,7 +35,7 @@ $(NCURSES_DIR)/.dist: $(DL_DIR)/$(NCURSES_SOURCE)
        #use the local tic and not whatever the build system was going to find.
        $(SED) 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \
                $(NCURSES_DIR)/misc/run_tic.in
-       $(SOURCE_DIR)/patch-kernel.sh $(NCURSES_DIR) $(SOURCE_DIR) ncurses-*.patch
+       $(SOURCE_DIR)/patch-kernel.sh $(NCURSES_DIR) $(SOURCE_DIR) ncurses-\*.patch
        touch  $(NCURSES_DIR)/.dist
 
 $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.dist

diff --git a/make/uclibc.mk b/make/uclibc.mk
index 7a837e427945ebdb92e46321d8efa7221956a136..12b79febaae7a60114b654cafc44a6f7a4a5898b 100644 (file)
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -18,7 +18,7 @@ UCLIBC_SITE:=http://www.uclibc.org/downloads
 endif
 
 UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
-                -e 's/i.86/i386/' \
+               -e 's/i.86/i386/' \
                -e 's/sparc.*/sparc/' \
                -e 's/arm.*/arm/g' \
                -e 's/m68k.*/m68k/' \