fonera-mp3: fix json-c dependency here as well

[openwrt.git] / target / imagebuilder / Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 3d830bb..ed051ec 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
 PKG_OS:=$(shell uname -s)
 include $(INCLUDE_DIR)/host.mk
 
 PKG_OS:=$(shell uname -s)

-PKG_CPU:=$(shell uname -m)
+PKG_CPU:=$(shell uname -m | sed "s/ //g")

 
 IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
 IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
 
 IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
 IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)


@@ -25,16 +25,16 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
                $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
                $(TOPDIR)/rules.mk $(TOPDIR)/.config \
                $(TMP_DIR)/.target.mk \
                $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
                $(TOPDIR)/rules.mk $(TOPDIR)/.config \
                $(TMP_DIR)/.target.mk \

-               $(TMP_DIR)/.pkginfo \
+               $(TMP_DIR)/.packageinfo \

                $(TMP_DIR)/.targetinfo \
                ./files/Makefile \
                $(IB_BUILD_DIR)/
                $(TMP_DIR)/.targetinfo \
                ./files/Makefile \
                $(IB_BUILD_DIR)/

-       $(CP) $(STAGING_DIR)/bin/* $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin
+       $(CP) $(TOOLCHAIN_DIR)/bin/* $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin

        $(CP) $(TOPDIR)/target/linux/* $(IB_BUILD_DIR)/target/linux
        rm -rf $(IB_BUILD_DIR)/target/linux/*/patches
        -cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/* $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) # don't copy subdirectories here
        $(CP) $(TOPDIR)/target/linux/* $(IB_BUILD_DIR)/target/linux
        rm -rf $(IB_BUILD_DIR)/target/linux/*/patches
        -cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/* $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) # don't copy subdirectories here

-       find $(IB_BUILD_DIR) -name .svn -exec rm -rf {} \;
-       find $(IB_BUILD_DIR) -name CVS -exec rm -rf  {} \;
+       find $(IB_BUILD_DIR) -name .svn | $(XARGS) rm -rf
+       find $(IB_BUILD_DIR) -name CVS | $(XARGS) rm -rf

        (cd $(BUILD_DIR); \
                tar cfj $@ $(IB_NAME); \
        )
        (cd $(BUILD_DIR); \
                tar cfj $@ $(IB_NAME); \
        )