From 45c6c3628579e4a00c1104413f3364108137f571 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Wed, 8 Jun 2005 19:54:05 +0000 Subject: [PATCH] Always use -R flag with cp (to preserve symlinks) SVN-Revision: 1175 --- openwrt/package/libosip2/Makefile | 4 ++-- openwrt/package/libtool/Makefile | 6 +++--- openwrt/package/lua/Makefile | 12 ++++++------ openwrt/package/mysql/Makefile | 4 ++-- openwrt/package/net-snmp/Makefile | 4 ++-- openwrt/package/openssl/Makefile | 8 ++++---- openwrt/package/sablevm-classpath/Makefile | 6 +++--- openwrt/package/sablevm/Makefile | 4 ++-- openwrt/package/speex/Makefile | 6 +++--- openwrt/package/tcp_wrappers/Makefile | 8 ++++---- openwrt/package/usbutils/Makefile | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/openwrt/package/libosip2/Makefile b/openwrt/package/libosip2/Makefile index 82489fec06..d4e6d61518 100644 --- a/openwrt/package/libosip2/Makefile +++ b/openwrt/package/libosip2/Makefile @@ -76,9 +76,9 @@ $(STAGING_DIR)/usr/lib/libosip2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include cp -fpR $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fp $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libosip2.so diff --git a/openwrt/package/libtool/Makefile b/openwrt/package/libtool/Makefile index 79dca5f0ae..2342fb0b0c 100644 --- a/openwrt/package/libtool/Makefile +++ b/openwrt/package/libtool/Makefile @@ -60,15 +60,15 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBLTDL): install -m0755 -d $(IDIR_LIBLTDL)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(IDIR_LIBLTDL)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(IDIR_LIBLTDL)/usr/lib/ $(RSTRIP) $(IDIR_LIBLTDL) $(IPKG_BUILD) $(IDIR_LIBLTDL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libltdl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fp $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/ + cp -fpR $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/ mkdir -p $(I_LIBLTDL_DEV)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libltdl.so diff --git a/openwrt/package/lua/Makefile b/openwrt/package/lua/Makefile index a36c3acb23..95f5fec12a 100644 --- a/openwrt/package/lua/Makefile +++ b/openwrt/package/lua/Makefile @@ -57,19 +57,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBLUA): install -d -m0755 $(IDIR_LIBLUA)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(IDIR_LIBLUA)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(IDIR_LIBLUA)/usr/lib/ $(RSTRIP) $(IDIR_LIBLUA) $(IPKG_BUILD) $(IDIR_LIBLUA) $(PACKAGE_DIR) $(IPKG_LUA_INTERPRETER): install -d -m0755 $(IDIR_LUA_INTERPRETER)/usr/bin - cp -fp $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA_INTERPRETER)/usr/bin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA_INTERPRETER)/usr/bin/ $(RSTRIP) $(IDIR_LUA_INTERPRETER) $(IPKG_BUILD) $(IDIR_LUA_INTERPRETER) $(PACKAGE_DIR) $(IPKG_LUA_COMPILER): install -d -m0755 $(IDIR_LUA_COMPILER)/usr/bin - cp -fp $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUA_COMPILER)/usr/bin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUA_COMPILER)/usr/bin/ $(RSTRIP) $(IDIR_LUA_COMPILER) $(IPKG_BUILD) $(IDIR_LUA_COMPILER) $(PACKAGE_DIR) @@ -82,10 +82,10 @@ $(IPKG_LUA_EXAMPLES): $(STAGING_DIR)/usr/lib/liblua.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fp $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/ - cp -fp $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ + cp -fpR $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/ + cp -fpR $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/liblua.so diff --git a/openwrt/package/mysql/Makefile b/openwrt/package/mysql/Makefile index 64bb6de2e1..28d9314771 100644 --- a/openwrt/package/mysql/Makefile +++ b/openwrt/package/mysql/Makefile @@ -103,13 +103,13 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBMYSQLCLIENT): install -d -m0755 $(IDIR_LIBMYSQLCLIENT)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/ $(RSTRIP) $(IDIR_LIBMYSQLCLIENT) $(IPKG_BUILD) $(IDIR_LIBMYSQLCLIENT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fp $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include cp -fpR $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib diff --git a/openwrt/package/net-snmp/Makefile b/openwrt/package/net-snmp/Makefile index ba887482c8..166d9d3b0a 100644 --- a/openwrt/package/net-snmp/Makefile +++ b/openwrt/package/net-snmp/Makefile @@ -163,11 +163,11 @@ $(IPKG_SNMP_UTILS): $(STAGING_DIR)/usr/lib/libnetsnmp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fp $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include cp -fpR $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libnetsnmp.so diff --git a/openwrt/package/openssl/Makefile b/openwrt/package/openssl/Makefile index 84822060c5..f1e6c5ed90 100644 --- a/openwrt/package/openssl/Makefile +++ b/openwrt/package/openssl/Makefile @@ -65,18 +65,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOPENSSL): install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/ chmod 0644 $(IDIR_LIBOPENSSL)/usr/lib/* $(RSTRIP) $(IDIR_LIBOPENSSL) $(IPKG_BUILD) $(IDIR_LIBOPENSSL) $(PACKAGE_DIR) $(IPKG_OPENSSL_UTIL): install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl - cp -fp $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/ + cp -fpR $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/ install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/certs install -d -m0700 $(IDIR_OPENSSL_UTIL)/etc/ssl/private install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin - cp -fp $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSL_UTIL) $(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR) @@ -84,7 +84,7 @@ $(STAGING_DIR)/usr/lib/libssl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include cp -fpR $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fp $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libssl.so diff --git a/openwrt/package/sablevm-classpath/Makefile b/openwrt/package/sablevm-classpath/Makefile index 1a006cab0f..13fa555135 100644 --- a/openwrt/package/sablevm-classpath/Makefile +++ b/openwrt/package/sablevm-classpath/Makefile @@ -70,15 +70,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSABLEVM_CLASSPATH): install -d -m0755 $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath - cp -fp $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath/ install -d -m0755 $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security - cp -fp $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security/ $(RSTRIP) $(IDIR_LIBSABLEVM_CLASSPATH) $(IPKG_BUILD) $(IDIR_LIBSABLEVM_CLASSPATH) $(PACKAGE_DIR) $(IPKG_SABLEVM_CLASSPATH_FULL): install -d -m0755 $(IDIR_SABLEVM_CLASSPATH_FULL)/usr/share/sablevm-classpath - cp -fp $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \ + cp -fpR $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \ $(IDIR_SABLEVM_CLASSPATH_FULL)/usr/share/sablevm-classpath/ $(IPKG_BUILD) $(IDIR_SABLEVM_CLASSPATH_FULL) $(PACKAGE_DIR) diff --git a/openwrt/package/sablevm/Makefile b/openwrt/package/sablevm/Makefile index 66cb819c5a..e57fdb2256 100644 --- a/openwrt/package/sablevm/Makefile +++ b/openwrt/package/sablevm/Makefile @@ -61,8 +61,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SABLEVM): install -m0755 -d $(IDIR_SABLEVM)/usr/bin - cp -fp $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(IDIR_SABLEVM)/usr/bin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(IDIR_SABLEVM)/usr/bin/ install -m0755 -d $(IDIR_SABLEVM)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(IDIR_SABLEVM)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(IDIR_SABLEVM)/usr/lib/ $(RSTRIP) $(IDIR_SABLEVM) $(IPKG_BUILD) $(IDIR_SABLEVM) $(PACKAGE_DIR) diff --git a/openwrt/package/speex/Makefile b/openwrt/package/speex/Makefile index 5bacda30ee..57e7ed47cf 100644 --- a/openwrt/package/speex/Makefile +++ b/openwrt/package/speex/Makefile @@ -61,7 +61,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSPEEX): install -d -m0755 $(IDIR_LIBSPEEX)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(IDIR_LIBSPEEX)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(IDIR_LIBSPEEX)/usr/lib/ $(RSTRIP) $(IDIR_LIBSPEEX) $(IPKG_BUILD) $(IDIR_LIBSPEEX) $(PACKAGE_DIR) @@ -69,9 +69,9 @@ $(STAGING_DIR)/usr/lib/libspeex.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include cp -fpR $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fp $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libspeex.so diff --git a/openwrt/package/tcp_wrappers/Makefile b/openwrt/package/tcp_wrappers/Makefile index 17f8c29777..cb24ed5276 100644 --- a/openwrt/package/tcp_wrappers/Makefile +++ b/openwrt/package/tcp_wrappers/Makefile @@ -41,16 +41,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBWRAP): install -d -m0755 $(IDIR_LIBWRAP)/usr/lib - cp -fp $(PKG_BUILD_DIR)/shared/libwrap.so.* $(IDIR_LIBWRAP)/usr/lib/ + cp -fpR $(PKG_BUILD_DIR)/shared/libwrap.so.* $(IDIR_LIBWRAP)/usr/lib/ $(RSTRIP) $(IDIR_LIBWRAP) $(IPKG_BUILD) $(IDIR_LIBWRAP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libwrap.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fp $(PKG_BUILD_DIR)/tcpd.h $(STAGING_DIR)/usr/include/ + cp -fpR $(PKG_BUILD_DIR)/tcpd.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fp $(PKG_BUILD_DIR)/libwrap.a $(STAGING_DIR)/usr/lib/ -# cp -fp $(PKG_BUILD_DIR)/shared/libwrap.so* $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_BUILD_DIR)/libwrap.a $(STAGING_DIR)/usr/lib/ +# cp -fpR $(PKG_BUILD_DIR)/shared/libwrap.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libwrap.a diff --git a/openwrt/package/usbutils/Makefile b/openwrt/package/usbutils/Makefile index 9b86509bb5..8e6112cd97 100644 --- a/openwrt/package/usbutils/Makefile +++ b/openwrt/package/usbutils/Makefile @@ -60,8 +60,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LSUSB): install -d -m0755 $(IDIR_LSUSB)/usr/share - cp -fp $(PKG_INSTALL_DIR)/usr/share/usb.ids $(IDIR_LSUSB)/usr/share/ + cp -fpR $(PKG_INSTALL_DIR)/usr/share/usb.ids $(IDIR_LSUSB)/usr/share/ install -d -m0755 $(IDIR_LSUSB)/usr/sbin - cp -fp $(PKG_INSTALL_DIR)/usr/sbin/lsusb $(IDIR_LSUSB)/usr/sbin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/lsusb $(IDIR_LSUSB)/usr/sbin/ $(RSTRIP) $(IDIR_LSUSB) $(IPKG_BUILD) $(IDIR_LSUSB) $(PACKAGE_DIR) -- 2.30.2