Commit 74ad4e12 authored by Eric Andersen's avatar Eric Andersen
Browse files

Change all instances of 'ln -sf' to 'ln -snf'

parent 3f7d89fe

Makefile

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

package/bzip2/bzip2.mk

+17 −17
Original line number Diff line number Diff line
@@ -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
@@ -36,8 +36,8 @@ $(STAGING_DIR)/lib/libbz2.so.1.0.2: $(BZIP2_DIR)/.unpacked 
	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) 

	(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,15 +52,15 @@ $(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

package/dhcp/dhcp.mk

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

package/dropbear_sshd/dropbear_sshd.mk

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

package/flex/flex.mk

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