| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182 |
- --- a/target/imagebuilder/Makefile
- +++ b/target/imagebuilder/Makefile
- @@ -40,11 +40,9 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
- $(TMP_DIR)/.packageinfo \
- $(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
-
- $(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
- # create an empty package index so `opkg` doesn't report an error
- --- a/target/imagebuilder/files/Makefile
- +++ b/target/imagebuilder/files/Makefile
- @@ -113,6 +113,15 @@ BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(fi
- PACKAGES:=
-
- _call_image: staging_dir/host/.prereq-build
- + rm -rf $(KERNEL_BUILD_DIR)/tmp
- + [ "$(DATE)" ] && DATE="$(DATE).`date +'%Y'`" || DATE="`date +'%m.%d.%Y'`"; \
- + mkdir -p $(USER_FILES)/etc/uci-defaults || true; \
- + echo -e " \
- + sed -i \"s/[0-9]\+.[0-9]\+.[0-9]\{4\}/$$DATE/\" /etc/openwrt_release \n \
- + sed -i \"s/DISTRIB_ID=.*/DISTRIB_ID='$(PARTSIZE)'/\" /etc/openwrt_release \n \
- + sed -i \"s/OpenWrt .* by/OpenWrt $$DATE by/\" /etc/banner \n \
- + echo \"$$DATE\" >/etc/openwrt_version \n \
- + "> $(USER_FILES)/etc/uci-defaults/99-version; \
- echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
- echo 'Packages: $(BUILD_PACKAGES)'
- echo
- @@ -164,7 +173,15 @@ 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="luci-i18n-base-zh-cn luci-i18n-base-en"; \
- + 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="luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn $$packages"; \
- + fi \
- + done; \
- + $(OPKG) install --force-overwrite --force-checksum --force-depends $(BUILD_PACKAGES); \
- + $(OPKG) install $$packages || true
- + $(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer --force-reinstall my-default-settings
-
- prepare_rootfs: FORCE
- @echo
- @@ -183,7 +200,7 @@ build_image: FORCE
- @echo
- @echo Building images...
- rm -rf $(BUILD_DIR)/json_info_files/
- - $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
- + nice $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" VIP=$(VIP) \
- $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
-
- $(BIN_DIR)/profiles.json: FORCE
- --- a/include/image.mk
- +++ b/include/image.mk
- @@ -225,10 +225,17 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
- $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
-
- define Image/mkfs/squashfs-common
- - $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
- + echo -998 > /proc/$$$$/oom_score_adj || true
- + if [ $(VIP) == True ] ; then \
- + nice $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
- + -nopad -noappend -root-owned \
- + -comp $(SQUASHFSCOMP) $(SQUASHFSOPT); \
- + else \
- + nice $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
- -nopad -noappend -root-owned \
- -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
- - -processors 1
- + -processors 1; \
- + fi
- endef
-
- ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y)
|
