From 3d2c3c76a1cff591bc38a0971b30ee7e4ab9d9ee Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Thu, 9 Sep 2004 10:50:57 +0000 Subject: [PATCH] Patch by michael tesch ... 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. --- make/binutils-uclibc.mk | 2 +- make/busybox.mk | 2 +- make/dnsmasq.mk | 2 +- make/dropbear_sshd.mk | 2 +- make/gcc-uclibc-2.95.mk | 2 +- make/gcc-uclibc-3.x.mk | 2 +- make/gdb.mk | 2 +- make/iptables.mk | 2 +- make/kernel-headers.mk | 2 +- make/mrouted.mk | 2 +- make/ncurses.mk | 4 ++-- make/uclibc.mk | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/make/binutils-uclibc.mk b/make/binutils-uclibc.mk index 8ed94d6f3f..6199990d5c 100644 --- 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 b6cd287fc3..ecafc7da19 100644 --- 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 7944d62114..c59204992c 100644 --- 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 93664e2d04..407fb57794 100644 --- 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 ddbf118e9f..90d8fc63fa 100644 --- 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 cfa5049980..ff44759cd7 100644 --- 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 4030ede7ff..e1f590f6c6 100644 --- 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 -linux-uclibc tuples. # Should probably integrate this into the patch. diff --git a/make/iptables.mk b/make/iptables.mk index 886e54213d..937348a53c 100644 --- 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 0eb2035fca..07c2bd5d97 100644 --- 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 13a4f8c720..c017d910b5 100644 --- 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 f57868e540..03d8ce663f 100644 --- a/make/ncurses.mk +++ b/make/ncurses.mk @@ -5,7 +5,7 @@ # ############################################################# # Copyright (C) 2002 by Ken Restivo -# $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 7a837e4279..12b79febaa 100644 --- 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/' \ -- 2.30.2