--- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -38,13 +38,12 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean ./files/repositories.conf \ $(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.packageinfo \ + $(TOPDIR)/files \ $(PKG_BUILD_DIR)/ -ifeq ($(CONFIG_IB_STANDALONE),) echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf $(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf) $(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf -endif ifeq ($(CONFIG_BUILDBOT),) $(INSTALL_DIR) $(PKG_BUILD_DIR)/packages @@ -31,6 +31,7 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean -cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config $(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER is not set/' $(PKG_BUILD_DIR)/.config $(SED) 's/^CONFIG_DOWNLOAD_FOLDER=.*/# CONFIG_DOWNLOAD_FOLDER is not set/' $(PKG_BUILD_DIR)/.config + $(SED) 's/^CONFIG_TARGET_ROOTFS_TARGZ=.*/# CONFIG_TARGET_ROOTFS_TARGZ is not set/' $(PKG_BUILD_DIR)/.config $(CP) -L \ $(INCLUDE_DIR) $(SCRIPT_DIR) \ $(TOPDIR)/rules.mk \ --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -124,6 +124,7 @@ _call_image: staging_dir/host/.prereq-build $(MAKE) -s build_image $(MAKE) -s json_overview_image_info $(MAKE) -s checksum + rm -rf $(KERNEL_BUILD_DIR)/tmp/*$(EXTRA_IMAGE_NAME)* _call_manifest: FORCE rm -rf $(TARGET_DIR) @@ -164,7 +165,13 @@ package_install: FORCE @echo Installing packages... $(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk)) $(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk)) - $(OPKG) install $(BUILD_PACKAGES) + packages="$(BUILD_PACKAGES) luci-i18n-base-zh-cn"; \ + for p in $(BUILD_PACKAGES); do \ + if [[ $$p == luci-app-* && "`$(OPKG) list | grep luci-i18n-\`echo $$p | cut -d - -f 3-\`-zh-cn`" ]]; then \ + packages="$$packages luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn"; \ + fi \ + done; \ + $(OPKG) install --force-overwrite --force-checksum --force-depends $$packages prepare_rootfs: FORCE @echo