Commit 3d2c3c76 authored by Manuel Novoa III 's avatar Manuel Novoa III
Browse files

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.
parent 7e764491

make/binutils-uclibc.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

make/busybox.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

make/dnsmasq.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

make/dropbear_sshd.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

make/gcc-uclibc-2.95.mk

+1 −1
Original line number Diff line number Diff line
@@ -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...