diff options
| -rw-r--r-- | package/coreutils/coreutils.mk | 6 | ||||
| -rw-r--r-- | package/ed/ed.mk | 2 | ||||
| -rw-r--r-- | package/liblockfile/liblockfile.mk | 8 | ||||
| -rw-r--r-- | package/libpcap/libpcap.mk | 2 | ||||
| -rw-r--r-- | package/nfs-utils/nfs-utils.mk | 2 | ||||
| -rw-r--r-- | package/sysvinit/sysvinit.mk | 4 | ||||
| -rw-r--r-- | package/usbmount/usbmount.mk | 3 |
7 files changed, 14 insertions, 13 deletions
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 80bab9c58..ef6afe198 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -21,8 +21,8 @@ coreutils-source: $(DL_DIR)/$(COREUTILS_SOURCE) $(COREUTILS_DIR)/.unpacked: $(DL_DIR)/$(COREUTILS_SOURCE) $(COREUTILS_CAT) $(DL_DIR)/$(COREUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(COREUTILS_DIR) package/coreutils/ coreutils*.patch - touch $(COREUTILS_DIR)/.unpacked + toolchain/patch-kernel.sh $(COREUTILS_DIR) package/coreutils/ coreutils\*.patch + touch $@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked (cd $(COREUTILS_DIR); rm -rf config.cache; \ @@ -110,7 +110,7 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked # This is undefined when crosscompiling... $(SED) 's,.*HAVE_PROC_UPTIME.*,#define HAVE_PROC_UPTIME 1,g' \ $(COREUTILS_DIR)/config.h - touch $(COREUTILS_DIR)/.configured + touch $@ $(COREUTILS_DIR)/$(COREUTILS_BINARY): $(COREUTILS_DIR)/.configured $(MAKE) -C $(COREUTILS_DIR) diff --git a/package/ed/ed.mk b/package/ed/ed.mk index a81510208..b3d2d5de1 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -25,7 +25,7 @@ $(ED_DIR)/.unpacked: $(DL_DIR)/$(ED_SOURCE) $(DL_DIR)/$(ED_PATCH) if [ -d $(ED_DIR)/debian/patches ]; then \ toolchain/patch-kernel.sh $(ED_DIR) $(ED_DIR)/debian/patches \*.patch ; \ fi - toolchain/patch-kernel.sh $(ED_DIR) package/ed/ ed-*.patch + toolchain/patch-kernel.sh $(ED_DIR) package/ed/ ed-\*.patch touch $@ $(ED_DIR)/.configured: $(ED_DIR)/.unpacked diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index 50e0bed39..fc5ab4a55 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -17,8 +17,8 @@ liblockfile-source: $(DL_DIR)/$(LIBLOCKFILE_SOURCE) $(LIBLOCKFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBLOCKFILE_SOURCE) $(LIBLOCKFILE_CAT) $(DL_DIR)/$(LIBLOCKFILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LIBLOCKFILE_DIR) package/liblockfile/ *.patch - touch $(LIBLOCKFILE_DIR)/.unpacked + toolchain/patch-kernel.sh $(LIBLOCKFILE_DIR) package/liblockfile/ \*.patch + touch $@ $(LIBLOCKFILE_DIR)/.configured: $(LIBLOCKFILE_DIR)/.unpacked (cd $(LIBLOCKFILE_DIR); rm -rf config.cache; \ @@ -31,13 +31,13 @@ $(LIBLOCKFILE_DIR)/.configured: $(LIBLOCKFILE_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --enable-shared \ ); - touch $(LIBLOCKFILE_DIR)/.configured + touch $@ $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured mkdir -p $(STAGING_DIR)/man/man1 $(STAGING_DIR)/man/man3 $(MAKE) -C $(LIBLOCKFILE_DIR) prefix= ROOT=$(STAGING_DIR) install ln -sf $(LIBLOCKFILE_BINARY) $(STAGING_DIR)/lib/liblockfile.so.1 - cp -a $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/lib + cp -dpf $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/lib $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY) -mkdir -p $(TARGET_DIR)/usr/lib diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 165096b4a..6165c962e 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -34,7 +34,7 @@ libpcap-source: $(DL_DIR)/$(LIBPCAP_SOURCE) $(LIBPCAP_DIR)/.unpacked: $(DL_DIR)/$(LIBPCAP_SOURCE) $(LIBPCAP_CAT) $(DL_DIR)/$(LIBPCAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LIBPCAP_DIR) package/libpcap/ *.patch + toolchain/patch-kernel.sh $(LIBPCAP_DIR) package/libpcap/ \*.patch touch $@ $(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 9f43ec06b..0adf833db 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -26,7 +26,7 @@ nfs-utils-source: $(DL_DIR)/$(NFS_UTILS_SOURCE) $(NFS_UTILS_DIR)/.unpacked: $(DL_DIR)/$(NFS_UTILS_SOURCE) $(NFS_UTILS_CAT) $(DL_DIR)/$(NFS_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(NFS_UTILS_DIR) package/nfs-utils/ nfs-utils*.patch - toolchain/patch-kernel.sh $(NFS_UTILS_DIR) $(NFS_UTILS_DIR)/debian/ *.patch + toolchain/patch-kernel.sh $(NFS_UTILS_DIR) $(NFS_UTILS_DIR)/debian/ \*.patch $(CONFIG_UPDATE) $(NFS_UTILS_DIR) touch $@ diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index a4ac612e0..70e9ab50b 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -19,8 +19,8 @@ sysvinit-source: $(DL_DIR)/$(SYSVINIT_SOURCE) sysvinit-unpacked: $(SYSVINIT_DIR)/.unpacked $(SYSVINIT_DIR)/.unpacked: $(DL_DIR)/$(SYSVINIT_SOURCE) $(SYSVINIT_CAT) $(DL_DIR)/$(SYSVINIT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(SYSVINIT_DIR) package/sysvinit/ sysvinit-*.patch - touch $(SYSVINIT_DIR)/.unpacked + toolchain/patch-kernel.sh $(SYSVINIT_DIR) package/sysvinit/ sysvinit-\*.patch + touch $@ $(SYSVINIT_DIR)/$(SYSVINIT_BINARY): $(SYSVINIT_DIR)/.unpacked CFLAGS="$(TARGET_CFLAGS)" $(MAKE) CC=$(TARGET_CC) -C $(SYSVINIT_DIR)/src diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk index 529f105b1..719801dd1 100644 --- a/package/usbmount/usbmount.mk +++ b/package/usbmount/usbmount.mk @@ -18,7 +18,7 @@ usbmount-source: $(DL_DIR)/$(USBMOUNT_SOURCE) $(USBMOUNT_DIR)/.unpacked: $(DL_DIR)/$(USBMOUNT_SOURCE) $(USBMOUNT_CAT) $(DL_DIR)/$(USBMOUNT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(USBMOUNT_DIR) package/usbmount usbmount-$(USBMOUNT_VERSION)*.patch + toolchain/patch-kernel.sh $(USBMOUNT_DIR) package/usbmount usbmount-$(USBMOUNT_VERSION)\*.patch touch $@ $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY): $(USBMOUNT_DIR)/.unpacked @@ -26,6 +26,7 @@ $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY): $(USBMOUNT_DIR)/.unpacked @if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ] ; then \ $(INSTALL) -m 0644 -D $(USBMOUNT_DIR)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \ fi; + touch -c $@ usbmount: uclibc $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY) |