diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | package/bzip2/bzip2.mk | 34 | ||||
| -rw-r--r-- | package/dhcp/dhcp.mk | 6 | ||||
| -rw-r--r-- | package/dropbear_sshd/dropbear_sshd.mk | 8 | ||||
| -rw-r--r-- | package/flex/flex.mk | 2 | ||||
| -rw-r--r-- | package/gawk/gawk.mk | 2 | ||||
| -rw-r--r-- | package/gzip/gzip.mk | 10 | ||||
| -rw-r--r-- | package/libfloat/libfloat.mk | 6 | ||||
| -rw-r--r-- | target/device/AMD/DBAu1500/linux.mk | 3 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-2.95.mk | 6 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 6 |
11 files changed, 42 insertions, 43 deletions
@@ -106,7 +106,7 @@ $(STAGING_DIR): @mkdir -p $(STAGING_DIR)/lib @mkdir -p $(STAGING_DIR)/include @mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME) - @ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib + @ln -snf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib $(TARGET_DIR): if [ -f "$(TARGET_SKELETON)" ] ; then \ diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index c6eeb019a..e77a38407 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -17,8 +17,8 @@ bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE) $(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE) $(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(SED) "s,ln \$$(,ln -sf \$$(,g" $(BZIP2_DIR)/Makefile - $(SED) "s,ln -s (lib.*),ln -sf \$$1 ; ln -sf libbz2.so.1.0.2 libbz2.so,g" \ + $(SED) "s,ln \$$(,ln -snf \$$(,g" $(BZIP2_DIR)/Makefile + $(SED) "s,ln -s (lib.*),ln -snf \$$1 ; ln -snf libbz2.so.1.0.2 libbz2.so,g" \ $(BZIP2_DIR)/Makefile-libbz2_so ifneq ($(BR2_LARGEFILE),y) $(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile @@ -33,11 +33,11 @@ $(STAGING_DIR)/lib/libbz2.so.1.0.2: $(BZIP2_DIR)/.unpacked $(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) libbz2.a - cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/include/ - cp $(BZIP2_DIR)/libbz2.so.1.0.2 $(STAGING_DIR)/lib/ - cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/lib/ - (cd $(STAGING_DIR)/lib/; ln -sf libbz2.so.1.0.2 libbz2.so) - (cd $(STAGING_DIR)/lib/; ln -sf libbz2.so.1.0.2 libbz2.so.1.0) + cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/include/ + cp $(BZIP2_DIR)/libbz2.so.1.0.2 $(STAGING_DIR)/lib/ + cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/lib/ + (cd $(STAGING_DIR)/lib/; ln -snf libbz2.so.1.0.2 libbz2.so) + (cd $(STAGING_DIR)/lib/; ln -snf libbz2.so.1.0.2 libbz2.so.1.0) $(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.1.0.2 $(TARGET_CONFIGURE_OPTS) \ @@ -52,22 +52,22 @@ $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY) rm -f $(TARGET_DIR)/usr/include/bzlib.h cp $(BZIP2_DIR)/libbz2.so.1.0.2 $(TARGET_DIR)/usr/lib/ (cd $(TARGET_DIR)/usr/lib; \ - ln -sf libbz2.so.1.0.2 libbz2.so.1.0; \ - ln -sf libbz2.so.1.0.2 libbz2.so) + ln -snf libbz2.so.1.0.2 libbz2.so.1.0; \ + ln -snf libbz2.so.1.0.2 libbz2.so) (cd $(TARGET_DIR)/usr/bin; \ - ln -sf bzip2 bunzip2; \ - ln -sf bzip2 bzcat; \ - ln -sf bzdiff bzcmp; \ - ln -sf bzmore bzless; \ - ln -sf bzgrep bzegrep; \ - ln -sf bzgrep bzfgrep;) + ln -snf bzip2 bunzip2; \ + ln -snf bzip2 bzcat; \ + ln -snf bzdiff bzcmp; \ + ln -snf bzmore bzless; \ + ln -snf bzgrep bzegrep; \ + ln -snf bzgrep bzfgrep;) rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc $(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/lib/libbz2.a - mkdir -p $(TARGET_DIR)/usr/include + mkdir -p $(TARGET_DIR)/usr/include cp $(STAGING_DIR)/include/bzlib.h $(TARGET_DIR)/usr/include/ - cp $(STAGING_DIR)/lib/libbz2.a $(TARGET_DIR)/usr/lib/ + cp $(STAGING_DIR)/lib/libbz2.a $(TARGET_DIR)/usr/lib/ rm -f $(TARGET_DIR)/lib/libbz2.so (cd $(TARGET_DIR)/usr/lib; \ ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \ diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 6647f856e..d13cd45a4 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -37,7 +37,7 @@ $(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured $(STRIP) $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) - (cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp) + (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) $(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_SERVER_BINARY) $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY) $(INSTALL) -m 0755 -D package/dhcp/init-server $(TARGET_DIR)/etc/init.d/S80dhcp-server $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf $(TARGET_DIR)/etc/dhcp/dhcpd.conf @@ -46,7 +46,7 @@ $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) - (cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp) + (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) $(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY) $(INSTALL) -m 0755 -D package/dhcp/init-relay $(TARGET_DIR)/etc/init.d/S80dhcp-relay $(INSTALL) -m 0644 -D package/dhcp/default-relay $(TARGET_DIR)/etc/default/dhcp-relay @@ -54,7 +54,7 @@ $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) - (cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp) + (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) $(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_CLIENT_BINARY) $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY) $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf $(TARGET_DIR)/etc/dhcp/dhclient.conf rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ diff --git a/package/dropbear_sshd/dropbear_sshd.mk b/package/dropbear_sshd/dropbear_sshd.mk index d25518c5c..443ddbbb5 100644 --- a/package/dropbear_sshd/dropbear_sshd.mk +++ b/package/dropbear_sshd/dropbear_sshd.mk @@ -65,10 +65,10 @@ $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY): $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SS install -m 755 $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY) \ $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY) $(STRIP) $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY) - ln -sf ../sbin/dropbear $(TARGET_DIR)/usr/bin/scp - ln -sf ../sbin/dropbear $(TARGET_DIR)/usr/bin/ssh - ln -sf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey - ln -sf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert + ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/scp + ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/ssh + ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey + ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert cp $(DROPBEAR_SSHD_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/ chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 6474b3126..40973a25d 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -68,7 +68,7 @@ $(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY) -C $(FLEX_DIR) install rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc - (cd $(TARGET_DIR)/usr/bin; ln -sf flex lex) + (cd $(TARGET_DIR)/usr/bin; ln -snf flex lex) flex: uclibc $(TARGET_DIR)/$(FLEX_TARGET_BINARY) diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index aadba5ec0..888482953 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -50,7 +50,7 @@ $(TARGET_DIR)/$(GAWK_TARGET_BINARY): $(GAWK_DIR)/$(GAWK_BINARY) rm -f $(TARGET_DIR)/usr/bin/awk $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GAWK_DIR) install rm -f $(TARGET_DIR)/usr/bin/gawk-* - (cd $(TARGET_DIR)/usr/bin; ln -sf gawk awk) + (cd $(TARGET_DIR)/usr/bin; ln -snf gawk awk) $(STRIP) $(TARGET_DIR)/usr/lib/awk/* > /dev/null 2>&1 rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 4646be8a8..0dd489f86 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -55,11 +55,11 @@ $(GZIP_TARGET_BINARY): $(GZIP_BINARY) rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc (cd $(TARGET_DIR)/bin; \ - ln -sf gzip gunzip; \ - ln -sf gzip zcat; \ - ln -sf zdiff zcmp; \ - ln -sf zgrep zegrep; \ - ln -sf zgrep zfgrep;) + ln -snf gzip gunzip; \ + ln -snf gzip zcat; \ + ln -snf zdiff zcmp; \ + ln -snf zgrep zegrep; \ + ln -snf zgrep zfgrep;) gzip: uclibc $(GZIP_TARGET_BINARY) diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk index ed666344d..93587c6a8 100644 --- a/package/libfloat/libfloat.mk +++ b/package/libfloat/libfloat.mk @@ -40,12 +40,12 @@ $(LIBFLOAT_DIR)/libfloat.so.1: $(LIBFLOAT_DIR)/.unpacked $(TARGET_CC) $(STAGING_DIR)/lib/libfloat.so: $(LIBFLOAT_DIR)/libfloat.so.1 cp -a $(LIBFLOAT_DIR)/libfloat.a $(STAGING_DIR)/lib/libfloat.a cp -a $(LIBFLOAT_DIR)/libfloat.so.1 $(STAGING_DIR)/lib/libfloat.so.1 - (cd $(STAGING_DIR)/lib ; ln -sf libfloat.so.1 libfloat.so) + (cd $(STAGING_DIR)/lib ; ln -snf libfloat.so.1 libfloat.so) cp -a $(LIBFLOAT_DIR)/libfloat.a $(TARGET_DIR)/usr/lib/libfloat.a cp -a $(LIBFLOAT_DIR)/libfloat.so.1 $(TARGET_DIR)/lib/libfloat.so.1 $(STRIP) $(TARGET_DIR)/lib/libfloat.so.1 > /dev/null 2>&1 - (cd $(TARGET_DIR)/lib ; ln -sf libfloat.so.1 libfloat.so) - (cd $(TARGET_DIR)/usr/lib ; ln -sf /lib/libfloat.so libfloat.so) + (cd $(TARGET_DIR)/lib ; ln -snf libfloat.so.1 libfloat.so) + (cd $(TARGET_DIR)/usr/lib ; ln -snf /lib/libfloat.so libfloat.so) libfloat: $(STAGING_DIR)/lib/libfloat.so diff --git a/target/device/AMD/DBAu1500/linux.mk b/target/device/AMD/DBAu1500/linux.mk index ae202a1d8..4ca8e1adb 100644 --- a/target/device/AMD/DBAu1500/linux.mk +++ b/target/device/AMD/DBAu1500/linux.mk @@ -46,7 +46,6 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ -e 's/powerpc/ppc/' \ -e 's/sh[234]/sh/' \ ) -#LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT) LINUX_BINLOC=$(LINUX_FORMAT) LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION) LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2 @@ -61,7 +60,7 @@ $(DL_DIR)/$(LINUX_SOURCE): $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) -mkdir -p $(TOOL_BUILD_DIR) - -(cd $(TOOL_BUILD_DIR); ln -sf $(LINUX_DIR) linux) + -(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux) bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION)) # Rename the dir from the downloaded version to the AFTER patch version diff --git a/toolchain/gcc/gcc-uclibc-2.95.mk b/toolchain/gcc/gcc-uclibc-2.95.mk index e5a36e4cc..acc5a6ed9 100644 --- a/toolchain/gcc/gcc-uclibc-2.95.mk +++ b/toolchain/gcc/gcc-uclibc-2.95.mk @@ -79,7 +79,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched mkdir -p $(GCC_BUILD_DIR1) -mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include # Important! Required for limits.h to be fixed. - ln -sf include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include + ln -snf include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include (cd $(GCC_BUILD_DIR1); PATH=$(TARGET_PATH) \ $(GCC_DIR)/configure \ --prefix=$(STAGING_DIR) \ @@ -192,10 +192,10 @@ endif # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_DIR); \ - ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ + ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ cd bin; \ for app in $(REAL_GNU_TARGET_NAME)-* ; do \ - ln -sf $${app} \ + ln -snf $${app} \ $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ ); diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 5aae70940..8c8329274 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -151,7 +151,7 @@ GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_DIR)/lib/libc.a mkdir -p $(GCC_BUILD_DIR2) # Important! Required for limits.h to be fixed. - ln -sf ../include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include + ln -snf ../include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include (cd $(GCC_BUILD_DIR2); PATH=$(TARGET_PATH) \ $(GCC_DIR)/configure \ --prefix=$(STAGING_DIR) \ @@ -184,10 +184,10 @@ endif # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_DIR); \ - ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ + ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ cd bin; \ for app in $(REAL_GNU_TARGET_NAME)-* ; do \ - ln -sf $${app} \ + ln -snf $${app} \ $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ ); |