Always use -R flag with cp (to preserve symlinks)

[openwrt.git] / openwrt / package / sdk / Makefile

diff --git a/openwrt/package/sdk/Makefile b/openwrt/package/sdk/Makefile
index dba08ca..c0ab922 100644 (file)
--- a/openwrt/package/sdk/Makefile
+++ b/openwrt/package/sdk/Makefile
@@ -28,6 +28,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
        cp ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile
        cp ./files/README.SDK $(SDK_BUILD_DIR)/
        cp ./files/depend.mk $(SDK_BUILD_DIR)/package/
+       cp $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/
        egrep '^BR2_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config
        find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf 
        (cd $(BUILD_DIR); \
@@ -47,8 +48,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
        mkdir -p $(IB_BUILD_DIR)/include
        mkdir -p $(IB_BUILD_DIR)/packages
        (cd $(PACKAGE_DIR); \
-               cp busybox_* kmod-brcm-* kmod-wlcompat* dnsmasq_* iptables_* dropbear_* kmod-diag_* \
-                  wireless-tools_* zlib* bridge_* ppp_* ppp-pppoe* kmod-ppp* openwrt-utils* $(IB_BUILD_DIR)/packages/; \
+               cp ipkg_* busybox_* kmod-brcm-* kmod-wlcompat* dnsmasq_* iptables_* dropbear_* kmod-diag_* \
+                  wireless-tools_* zlib* bridge_* ppp_* ppp*pppoe* kmod-ppp* openwrt-utils* $(IB_BUILD_DIR)/packages/; \
        )
        egrep '^[^(include|prepare|compile|install)]' < $(TOPDIR)/target/jffs2/Makefile > $(IB_BUILD_DIR)/include/jffs2.mk
        egrep '^[^(include|prepare|compile|install)]' < $(TOPDIR)/target/squashfs-lzma/Makefile > $(IB_BUILD_DIR)/include/squashfs-lzma.mk
@@ -74,7 +75,9 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
 
 source:
 prepare:
-compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2 $(BIN_DIR)/$(IB_NAME).tar.bz2
+compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
+# FIXME: image builder disabled for now. need to find a way to make it work cleanly with the new kernel structure
+# $(BIN_DIR)/$(IB_NAME).tar.bz2
 install:
 
 clean: