Home Explore Help
Register Sign In
OpenWrt
/
OpenWrt_x86-r2s-r4s-r5s-N1
mirror of https://github.com/kiddin9/OpenWrt_x86-r2s-r4s-r5s-N1.git
2
0
Fork 0
Files Issues 0 Wiki
Tree: 7061922282
Branches Tags
OpenWrt_x86-r2s...
/
devices
/
common
/
patches
/
imagebuilder.patch

imagebuilder.patch 4.1 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990 
  1. --- a/target/imagebuilder/Makefile
    2. 

  2. +++ b/target/imagebuilder/Makefile
    3. 

  3. @@ -40,11 +40,9 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
    4. 

  4.  		$(TMP_DIR)/.packageinfo \
    5. 

  5.  		$(PKG_BUILD_DIR)/
    6. 

  6.  
    7. 

  7. -ifeq ($(CONFIG_IB_STANDALONE),)
    8. 

  8.  	echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf
    9. 

  9.  	$(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
    10. 

  10.  	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
    11. 

  11. -endif
    12. 

  12.  
    13. 

  13.  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
    14. 

  14.  	# create an empty package index so `opkg` doesn't report an error
    15. 

  15. 

  16. --- a/target/imagebuilder/files/Makefile
    17. 

  17. +++ b/target/imagebuilder/files/Makefile
    18. 

  18. @@ -113,6 +113,15 @@ BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(fi
    19. 

  19.  PACKAGES:=
    20. 

  20.  
    21. 

  21.  _call_image: staging_dir/host/.prereq-build
    22. 

  22. +	rm -rf $(KERNEL_BUILD_DIR)/tmp
    23. 

  23. +	[ "$(DATE)" ] && DATE="$(DATE).`date +'%Y'`" || DATE="`date +'%m.%d.%Y'`"; \
    24. 

  24. +	mkdir -p $(USER_FILES)/etc/uci-defaults || true; \
    25. 

  25. +	echo -e " \
    26. 

  26. +	sed -i \"s/[0-9]\+.[0-9]\+.[0-9]\{4\}/$$DATE/\" /etc/openwrt_release \n \
    27. 

  27. +	sed -i \"s/DISTRIB_ID=.*/DISTRIB_ID='$(PARTSIZE)'/\" /etc/openwrt_release \n \
    28. 

  28. +	sed -i \"s/OpenWrt .* by/OpenWrt $$DATE by/\" /etc/banner \n \
    29. 

  29. +	echo \"$$DATE\" >/etc/openwrt_version \n \
    30. 

  30. +	"> $(USER_FILES)/etc/uci-defaults/99-version; \
    31. 

  31.  	echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
    32. 

  32.  	echo 'Packages: $(BUILD_PACKAGES)'
    33. 

  33.  	echo
    34. 

  34. @@ -164,7 +174,14 @@ package_install: FORCE
    35. 

  35.  	@echo Installing packages...
    36. 

  36.  	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk))
    37. 

  37.  	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
    38. 

  38. -	$(OPKG) install $(BUILD_PACKAGES)
    39. 

  39. +	packages="$(BUILD_PACKAGES) luci-i18n-base-zh-cn luci-i18n-base-en"; \
    40. 

  40. +	for p in $(BUILD_PACKAGES); do \
    41. 

  41. +		if [[ $$p == luci-app-* && "`$(OPKG) list | grep luci-i18n-\`echo $$p | cut -d - -f 3-\`-zh-cn`" ]]; then \
    42. 

  42. +			packages="$$packages luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn"; \
    43. 

  43. +		fi \
    44. 

  44. +	done; \
    45. 

  45. +	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer $$packages
    46. 

  46. +	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer --force-reinstall my-default-settings
    47. 

  47.  
    48. 

  48.  prepare_rootfs: FORCE
    49. 

  49.  	@echo
    50. 

  50. @@ -183,7 +200,8 @@ build_image: FORCE
    51. 

  51.  	@echo
    52. 

  52.  	@echo Building images...
    53. 

  53.  	rm -rf $(BUILD_DIR)/json_info_files/
    54. 

  54. -	$(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
    55. 

  55. +	[ "$(PARTSIZE)" -ge 100 2>/dev/null ] && [ "$(PARTSIZE)" -le 3072 2>/dev/null ] && ROOT_PARTSIZE="$(PARTSIZE)"; \
    56. 

  56. +	nice $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" PARTSIZE="$$ROOT_PARTSIZE" FILESYSTEMS="$(FILESYSTEMS)" \
    57. 

  57.  		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
    58. 

  58.  
    59. 

  59.  $(BIN_DIR)/profiles.json: FORCE
    60. 

  60. 

  61. --- a/include/image.mk
    62. 

  62. +++ b/include/image.mk
    63. 

  63. @@ -33,6 +33,13 @@ KDIR=$(KERNEL_BUILD_DIR)
    64. 

  64.  KDIR_TMP=$(KDIR)/tmp
    65. 

  65.  DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
    66. 

  66.  
    67. 

  67. +ifneq ($(PARTSIZE),)
    68. 

  68. +  CONFIG_TARGET_ROOTFS_PARTSIZE:=$(PARTSIZE)
    69. 

  69. +endif
    70. 

  70. +ifeq ($(FILESYSTEMS),ext4)
    71. 

  71. +  CONFIG_TARGET_ROOTFS_EXT4FS := y
    72. 

  72. +  CONFIG_TARGET_ROOTFS_SQUASHFS := n
    73. 

  73. +endif
    74. 

  74.  IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-)
    75. 

  75.  IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
    76. 

  76.  IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-)
    77. 

  77. @@ -225,10 +232,11 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
    78. 

  78.  $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
    79. 

  79.  
    80. 

  80.  define Image/mkfs/squashfs-common
    81. 

  81. -	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
    82. 

  82. +	echo -998 > /proc/$$$$/oom_score_adj || true
    83. 

  83. +	nice $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
    84. 

  84.  		-nopad -noappend -root-owned \
    85. 

  85.  		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
    86. 

  86. -		-processors 1
    87. 

  87. +		-processors 1 -mem `expr $$(grep MemAvailable /proc/meminfo | awk '{print $$2}') / 1250`M
    88. 

  88.  endef
    89. 

  89.  
    90. 

  90.  ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y)
    91.