From 369864cf105bf541f4e42643d6e5647ecea20379 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 24 Jun 2005 08:36:13 +0000 Subject: [PATCH] be a bit more consistant with naming, always escape wildcards --- package/busybox/busybox.mk | 2 +- package/dhcp/dhcp.mk | 2 +- package/dnsmasq/dnsmasq.mk | 2 +- package/dropbear_sshd/dropbear_sshd.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/iptables/iptables.mk | 2 +- package/libglib12/libglib12.mk | 2 +- package/ltp-testsuite/ltp-testsuite.mk | 2 +- package/lzo/lzo.mk | 2 +- package/mrouted/mrouted.mk | 2 +- package/ncurses/ncurses.mk | 2 +- package/netkitbase/netkitbase.mk | 2 +- package/pciutils/pciutils.mk | 2 +- package/portmap/portmap.mk | 2 +- package/procps/procps.mk | 2 +- package/python/python.mk | 2 +- package/rsync/rsync.mk | 2 +- package/rxvt/rxvt.mk | 2 +- package/tar/tar.mk | 2 +- package/tcl/tcl.mk | 2 +- package/tftpd/tftpd.mk | 2 +- package/tinyx/tinyx.mk | 2 +- package/util-linux/util-linux.mk | 2 +- package/valgrind/valgrind.mk | 2 +- package/vtun/vtun.mk | 2 +- package/xorg/xorg.mk | 2 +- target/cramfs/cramfs.mk | 2 +- target/ext2/ext2root.mk | 2 +- target/squashfs/squashfsroot.mk | 2 +- toolchain/kernel-headers/kernel-headers.mk | 2 +- toolchain/uClibc/uclibc.mk | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index e090feb6dc..6b65e1fb81 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -28,7 +28,7 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - # Allow busybox patches. - toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-\*.patch + toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox\*.patch touch $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index b615b0d3b3..d893ec9b80 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -25,7 +25,7 @@ dhcp-source: $(DL_DIR)/$(DHCP_SOURCE) $(DHCP_DIR)/.unpacked: $(DL_DIR)/$(DHCP_SOURCE) $(DHCP_CAT) $(DL_DIR)/$(DHCP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(DHCP_DIR) package/dhcp/ dhcp*.patch + toolchain/patch-kernel.sh $(DHCP_DIR) package/dhcp/ dhcp\*.patch touch $(DHCP_DIR)/.unpacked $(DHCP_DIR)/.configured: $(DHCP_DIR)/.unpacked diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index c144fb24a4..77e08f3bbd 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/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) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(DNSMASQ_DIR) package/dnsmasq/ \ - $(DNSMASQ_VER)-\*.patch + $(DNSMASQ_VER)\*.patch touch $(DNSMASQ_DIR)/.source $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source diff --git a/package/dropbear_sshd/dropbear_sshd.mk b/package/dropbear_sshd/dropbear_sshd.mk index 443ddbbb54..746abd3dab 100644 --- a/package/dropbear_sshd/dropbear_sshd.mk +++ b/package/dropbear_sshd/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) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(DROPBEAR_SSHD_DIR) package/dropbear_sshd/ dropbear-\*.patch + toolchain/patch-kernel.sh $(DROPBEAR_SSHD_DIR) package/dropbear_sshd/ dropbear\*.patch $(SED) 's,^/\* #define DROPBEAR_MULTI.*,#define DROPBEAR_MULTI,g' $(DROPBEAR_SSHD_DIR)/options.h touch $(DROPBEAR_SSHD_DIR)/.unpacked diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 65e3f6e500..dace74ba27 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -18,7 +18,7 @@ e2fsprogs-source: $(DL_DIR)/$(E2FSPROGS_SOURCE) $(E2FSPROGS_DIR)/.unpacked: $(DL_DIR)/$(E2FSPROGS_SOURCE) $(E2FSPROGS_CAT) $(DL_DIR)/$(E2FSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(E2FSPROGS_DIR) package/e2fsprogs/ e2fsprogs*.patch + toolchain/patch-kernel.sh $(E2FSPROGS_DIR) package/e2fsprogs/ e2fsprogs\*.patch touch $(E2FSPROGS_DIR)/.unpacked $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index a950986804..879b2f8bbc 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -17,7 +17,7 @@ $(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE) $(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked # Allow patches. Needed for openwrt for instance. - toolchain/patch-kernel.sh $(IPTABLES_BUILD_DIR) package/iptables/ iptables-\*.patch + toolchain/patch-kernel.sh $(IPTABLES_BUILD_DIR) package/iptables/ 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/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 73a5d04c1b..a4c56f614e 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -17,7 +17,7 @@ libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ *-patch* + toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ \*-patch\* touch $(LIBGLIB12_DIR)/.unpacked $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 1b2971fbd3..626338c564 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -16,7 +16,7 @@ ltp-testsuite-source: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) $(LTP_TESTSUITE_DIR)/.unpacked: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) $(LTP_TESTSUITE_CAT) $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LTP_TESTSUITE_DIR) package/ltp-testsuite/ ltp-testsuite-\*.patch + toolchain/patch-kernel.sh $(LTP_TESTSUITE_DIR) package/ltp-testsuite/ ltp-testsuite\*.patch touch $(LTP_TESTSUITE_DIR)/.unpacked $(LTP_TESTSUITE_DIR)/ltp-testsuite: $(LTP_TESTSUITE_DIR)/.unpacked diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 9c99e50207..6b0a96bede 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -20,7 +20,7 @@ lzo-source: $(DL_DIR)/$(LZO_SOURCE) $(LZO_DIR)/.unpacked: $(DL_DIR)/$(LZO_SOURCE) $(LZO_CAT) $(DL_DIR)/$(LZO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LZO_DIR) package/lzo/ lzo-\*.patch + toolchain/patch-kernel.sh $(LZO_DIR) package/lzo/ lzo\*.patch touch $(LZO_DIR)/.unpacked LZO_CONFIG_SHARED:=--disable-shared diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 26df7537d4..94e18e081e 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -23,7 +23,7 @@ mrouted-source: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH) $(MROUTED_DIR)/.unpacked: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH) $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_PATCH) | patch -p1 -d $(MROUTED_DIR) - toolchain/patch-kernel.sh $(MROUTED_DIR) package/mrouted/ mrouted-\*.patch + toolchain/patch-kernel.sh $(MROUTED_DIR) package/mrouted/ mrouted\*.patch touch $(MROUTED_DIR)/.unpacked $(MROUTED_DIR)/$(MROUTED_BINARY): $(MROUTED_DIR)/.unpacked diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 6e35c3de58..106f773b04 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -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 - toolchain/patch-kernel.sh $(NCURSES_DIR) package/ncurses/ ncurses-\*.patch + toolchain/patch-kernel.sh $(NCURSES_DIR) package/ncurses/ ncurses\*.patch touch $(NCURSES_DIR)/.dist $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.dist diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index 53bacea5d2..fed9700782 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -21,7 +21,7 @@ $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE) $(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure # don't try to run cross compiled binaries while configuring things $(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure - toolchain/patch-kernel.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase*.patch + toolchain/patch-kernel.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch touch $(NETKITBASE_DIR)/.unpacked $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 86017e1975..a33e29d588 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -25,7 +25,7 @@ pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE) $(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE) $(PCIUTILS_CAT) $(DL_DIR)/$(PCIUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/pci.id - toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils*.patch + toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils\*.patch touch $(PCIUTILS_DIR)/.unpacked $(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk index 2fc70d74a4..1bef8a97e3 100644 --- a/package/portmap/portmap.mk +++ b/package/portmap/portmap.mk @@ -16,7 +16,7 @@ $(DL_DIR)/$(PORTMAP_SOURCE): $(PORTMAP_DIR)/.unpacked: $(DL_DIR)/$(PORTMAP_SOURCE) $(PORTMAP_CAT) $(DL_DIR)/$(PORTMAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(PORTMAP_DIR) package/portmap/ portmap*.patch + toolchain/patch-kernel.sh $(PORTMAP_DIR) package/portmap/ portmap\*.patch touch $(PORTMAP_DIR)/.unpacked $(PORTMAP_DIR)/$(PORTMAP_BINARY): $(PORTMAP_DIR)/.unpacked diff --git a/package/procps/procps.mk b/package/procps/procps.mk index 0309d57134..14be46ba16 100644 --- a/package/procps/procps.mk +++ b/package/procps/procps.mk @@ -15,7 +15,7 @@ $(DL_DIR)/$(PROCPS_SOURCE): $(PROCPS_DIR)/.source: $(DL_DIR)/$(PROCPS_SOURCE) zcat $(DL_DIR)/$(PROCPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(PROCPS_DIR) package/procps/ procps*.patch + toolchain/patch-kernel.sh $(PROCPS_DIR) package/procps/ procps\*.patch $(SED) '/^CFLAGS/s:-O2:$(TARGET_CFLAGS):' $(PROCPS_DIR)/Makefile touch $(PROCPS_DIR)/.source diff --git a/package/python/python.mk b/package/python/python.mk index 995c6aa9a9..a2f9bb5b45 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -21,7 +21,7 @@ $(PYTHON_DIR)/.unpacked: $(DL_DIR)/$(PYTHON_SOURCE) touch $(PYTHON_DIR)/.unpacked $(PYTHON_DIR)/.patched: $(PYTHON_DIR)/.unpacked - toolchain/patch-kernel.sh $(PYTHON_DIR) package/python/ python*.patch + toolchain/patch-kernel.sh $(PYTHON_DIR) package/python/ python\*.patch touch $(PYTHON_DIR)/.patched $(PYTHON_DIR)/.hostpython: $(PYTHON_DIR)/.patched diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 03e61f6c94..c0d9722ffd 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -16,7 +16,7 @@ $(DL_DIR)/$(RSYNC_SOURCE): $(RSYNC_DIR)/.unpacked: $(DL_DIR)/$(RSYNC_SOURCE) $(RSYNC_CAT) $(DL_DIR)/$(RSYNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(RSYNC_DIR) package/rsync/ rsync*.patch + toolchain/patch-kernel.sh $(RSYNC_DIR) package/rsync/ rsync\*.patch touch $(RSYNC_DIR)/.unpacked $(RSYNC_DIR)/.configured: $(RSYNC_DIR)/.unpacked diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index 47afb6756f..3a47526a7a 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -48,7 +48,7 @@ $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked --x-includes=$(TINYX_DIR)/exports/include \ --x-libraries=$(TINYX_DIR)/exports/lib \ ); - toolchain/patch-kernel.sh $(RXVT_DIR) package/rxvt/ rxvt*.patch + toolchain/patch-kernel.sh $(RXVT_DIR) package/rxvt/ rxvt\*.patch touch $(RXVT_DIR)/.configured $(RXVT_BINARY): $(RXVT_DIR)/.configured diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 23f938c5b7..51a436a00d 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -18,7 +18,7 @@ tar-source: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_DIR)/.unpacked: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_CAT) $(DL_DIR)/$(GNUTAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(GNUTAR_DIR) package/tar/ tar*.patch + toolchain/patch-kernel.sh $(GNUTAR_DIR) package/tar/ tar\*.patch touch $(GNUTAR_DIR)/.unpacked $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 5195bf7503..72fb834d31 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -13,7 +13,7 @@ $(DL_DIR)/$(TCL_SOURCE): $(TCL_DIR)/.source: $(DL_DIR)/$(TCL_SOURCE) zcat $(DL_DIR)/$(TCL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(TCL_DIR) package/tcl/ tcl*.patch + toolchain/patch-kernel.sh $(TCL_DIR) package/tcl/ tcl\*.patch touch $(TCL_DIR)/.source $(TCL_DIR)/.configured: $(TCL_DIR)/.source diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 4bc2c596ba..cf4b770dff 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -18,7 +18,7 @@ tftpd-source: $(DL_DIR)/$(TFTP_HPA_SOURCE) $(TFTP_HPA_DIR)/.unpacked: $(DL_DIR)/$(TFTP_HPA_SOURCE) $(TFTP_HPA_CAT) $(DL_DIR)/$(TFTP_HPA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(TFTP_HPA_DIR) package/tftpd/ tftpd*.patch + toolchain/patch-kernel.sh $(TFTP_HPA_DIR) package/tftpd/ tftpd\*.patch touch $(TFTP_HPA_DIR)/.unpacked $(TFTP_HPA_DIR)/.configured: $(TFTP_HPA_DIR)/.unpacked diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk index 99c3558f41..efdf20d3a3 100644 --- a/package/tinyx/tinyx.mk +++ b/package/tinyx/tinyx.mk @@ -65,7 +65,7 @@ $(DL_DIR)/$(TINYX_SOURCE): # $(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE) $(TINYX_CAT) $(DL_DIR)/$(TINYX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(TINYX_DIR) package/tinyx/ tinyx*.patch + toolchain/patch-kernel.sh $(TINYX_DIR) package/tinyx/ tinyx\*.patch $(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(TINYX_CF)/cross.def $(SED) 's:REPLACE_ARCH:$(ARCH):g' $(TINYX_CF)/cross.def $(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(TINYX_CF)/cross.def diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index df73c4b279..879d8009fb 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -20,7 +20,7 @@ $(DL_DIR)/$(UTIL-LINUX_PATCH): $(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE) $(DL_DIR)/$(UTIL-LINUX_PATCH) $(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_PATCH) | patch -p1 -d $(UTIL-LINUX_DIR) - toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux*.patch + toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux\*.patch touch $(UTIL-LINUX_DIR)/.unpacked $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 8b8ca044b5..04a2bfee83 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -16,7 +16,7 @@ $(VALGRIND_DIR)/.unpacked: $(DL_DIR)/$(VALGRIND_SOURCE) touch $(VALGRIND_DIR)/.unpacked $(VALGRIND_DIR)/.patched: $(VALGRIND_DIR)/.unpacked - toolchain/patch-kernel.sh $(VALGRIND_DIR) package/valgrind/ valgrind*.patch + toolchain/patch-kernel.sh $(VALGRIND_DIR) package/valgrind/ valgrind\*.patch touch $(VALGRIND_DIR)/.patched $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 0ef29ea7ce..4e323d479d 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -21,7 +21,7 @@ vtun-source: $(DL_DIR)/$(VTUN_SOURCE) $(VTUN_DIR)/.unpacked: $(DL_DIR)/$(VTUN_SOURCE) $(VTUN_CAT) $(DL_DIR)/$(VTUN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - mv $(BUILD_DIR)/vtun $(VTUN_DIR) - toolchain/patch-kernel.sh $(VTUN_DIR) package/vtun/ vtun*.patch + toolchain/patch-kernel.sh $(VTUN_DIR) package/vtun/ vtun\*.patch touch $(VTUN_DIR)/.unpacked $(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index a9369c5ab3..01a12739ad 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -40,7 +40,7 @@ $(DL_DIR)/$(XORG_SOURCE): $(XORG_DIR)/.configure: $(DL_DIR)/$(XORG_SOURCE) $(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ xorg*.patch + toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ xorg\*.patch $(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF) $(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF) $(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(XORG_CF) diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 68a55d4066..4392138326 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -12,7 +12,7 @@ $(DL_DIR)/$(CRAMFS_SOURCE): $(CRAMFS_DIR): $(DL_DIR)/$(CRAMFS_SOURCE) zcat $(DL_DIR)/$(CRAMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - toolchain/patch-kernel.sh $(CRAMFS_DIR) target/cramfs/ cramfs*.patch + toolchain/patch-kernel.sh $(CRAMFS_DIR) target/cramfs/ cramfs\*.patch $(CRAMFS_DIR)/mkcramfs: $(CRAMFS_DIR) $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" -C $(CRAMFS_DIR); diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index c83e99b6a3..7f6065c6e4 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -13,7 +13,7 @@ $(DL_DIR)/$(GENEXT2_SOURCE): $(GENEXT2_DIR)/.unpacked: $(DL_DIR)/$(GENEXT2_SOURCE) zcat $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf - mv $(GENEXT2_DIR).orig $(GENEXT2_DIR) - toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs*.patch + toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs\*.patch touch $(GENEXT2_DIR)/.unpacked $(GENEXT2_DIR)/.configured: $(GENEXT2_DIR)/.unpacked diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index 4f4d76dba4..09b08066fb 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -12,7 +12,7 @@ $(DL_DIR)/$(SQUASHFS_SOURCE): $(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH) zcat $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - toolchain/patch-kernel.sh $(SQUASHFS_DIR) target/squashfs/ squashfs.patch + toolchain/patch-kernel.sh $(SQUASHFS_DIR) target/squashfs/ squashfs\*.patch touch $(SQUASHFS_DIR)/.unpacked $(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index e9ca5dc042..67a1de1095 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -87,7 +87,7 @@ endif touch $(LINUX_HEADERS_DIR)/.unpacked $(LINUX_HEADERS_DIR)/.patched: $(LINUX_HEADERS_DIR)/.unpacked - toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_VERSION)-\*.patch + toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_VERSION)\*.patch touch $(LINUX_HEADERS_DIR)/.patched $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 2e7aa1e6f2..873603d7d0 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -47,7 +47,7 @@ $(DL_DIR)/$(UCLIBC_SOURCE): $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) mkdir -p $(TOOL_BUILD_DIR) bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(UCLIBC_DIR) toolchain/uClibc/ *.patch + toolchain/patch-kernel.sh $(UCLIBC_DIR) toolchain/uClibc/ \*.patch touch $(UCLIBC_DIR)/.unpacked $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked -- 2.30.2