add missing piece from whiterussian image building makefile to trunk/

[openwrt.git] / openwrt / target / linux / imagebuilder / Makefile

diff --git a/openwrt/target/linux/imagebuilder/Makefile b/openwrt/target/linux/imagebuilder/Makefile
index bff3acf..c70fb11 100644 (file)
--- a/openwrt/target/linux/imagebuilder/Makefile
+++ b/openwrt/target/linux/imagebuilder/Makefile
@@ -40,6 +40,9 @@ build:
                $(IPKG_KERNEL) install `ls packages/$${package}_*`; \
        done
        if [ -d ./files ]; then \
                $(IPKG_KERNEL) install `ls packages/$${package}_*`; \
        done
        if [ -d ./files ]; then \

-               cp -fpR ./files/* $(LINUX_BUILD_DIR)/root; \
+               cp -a --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \
+       fi
+       if [ -d ./files.$(LIST) ]; then \
+               cp -a --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \

        fi
        $(MAKE) -S -C image KERNEL="$(KERNEL)" BOARD="$(BOARD)" BIN_DIR="$(BIN_DIR)/$(LIST)" install
        fi
        $(MAKE) -S -C image KERNEL="$(KERNEL)" BOARD="$(BOARD)" BIN_DIR="$(BIN_DIR)/$(LIST)" install