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: 8955684548
Branches Tags
OpenWrt_x86-r2s...
/
devices
/
common
/
patches
/
imagebuilder.patch

imagebuilder.patch 4.0 KB
History Raw

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

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

  3. @@ -38,13 +38,13 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
    4. 

  4.  		./files/repositories.conf \
    5. 

  5.  		$(TMP_DIR)/.targetinfo \
    6. 

  6.  		$(TMP_DIR)/.packageinfo \
    7. 

  7. +		$(TOPDIR)/files \
    8. 

  8.  		$(PKG_BUILD_DIR)/
    9. 

  9.  
    10. 

  10. -ifeq ($(CONFIG_IB_STANDALONE),)
    11. 

  11.  	echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf
    12. 

  12.  	$(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
    13. 

  13.  	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
    14. 

  14. -endif
    15. 

  15. +	$(SED) 's/^src\/gz openwrt_core/# src\/gz openwrt_core/' $(PKG_BUILD_DIR)/repositories.conf
    16. 

  16.  
    17. 

  17.  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
    18. 

  18.  	# create an empty package index so `opkg` doesn't report an error
    19. 

  19. 

  20. --- a/target/imagebuilder/files/Makefile
    21. 

  21. +++ b/target/imagebuilder/files/Makefile
    22. 

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

  23.  PACKAGES:=
    24. 

  24.  
    25. 

  25.  _call_image: staging_dir/host/.prereq-build
    26. 

  26. +	rm -rf $(KERNEL_BUILD_DIR)/tmp
    27. 

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

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

  29. +	echo -e " \
    30. 

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

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

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

  33. +	echo \"$$DATE\" >/etc/openwrt_version \n \
    34. 

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

  35.  	echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
    36. 

  36.  	echo 'Packages: $(BUILD_PACKAGES)'
    37. 

  37.  	echo
    38. 

  38. @@ -164,7 +173,15 @@ package_install: FORCE
    39. 

  39.  	@echo Installing packages...
    40. 

  40.  	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk))
    41. 

  41.  	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
    42. 

  42. -	$(OPKG) install $(BUILD_PACKAGES)
    43. 

  43. +	packages="luci-i18n-base-zh-cn luci-i18n-base-en"; \
    44. 

  44. +	for p in $(BUILD_PACKAGES); do \
    45. 

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

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

  47. +		fi \
    48. 

  48. +	done; \
    49. 

  49. +	$(OPKG) install --force-overwrite --force-checksum --force-depends $(BUILD_PACKAGES); \
    50. 

  50. +	$(OPKG) install $$packages || true
    51. 

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

  52.  
    53. 

  53.  prepare_rootfs: FORCE
    54. 

  54.  	@echo
    55. 

  55. @@ -183,7 +200,7 @@ build_image: FORCE
    56. 

  56.  	@echo
    57. 

  57.  	@echo Building images...
    58. 

  58.  	rm -rf $(BUILD_DIR)/json_info_files/
    59. 

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

  60. +	nice -n 19 $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
    61. 

  61.  		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
    62. 

  62.  
    63. 

  63.  $(BIN_DIR)/profiles.json: FORCE
    64. 

  64. 

  65. --- a/include/image.mk
    66. 

  66. +++ b/include/image.mk
    67. 

  67. @@ -225,10 +225,10 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
    68. 

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

  69.  
    70. 

  70.  define Image/mkfs/squashfs-common
    71. 

  71. +	echo -998 > /proc/$$$$/oom_score_adj || true
    72. 

  72.  	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
    73. 

  73.  		-nopad -noappend -root-owned \
    74. 

  74. -		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
    75. 

  75. -		-processors 1
    76. 

  76. +		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT)
    77. 

  77.  endef
    78. 

  78.  
    79. 

  79.  ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y)
    80. 

  80. 

  81. --- a/scripts/json_overview_image_info.py
    82. 

  82. +++ b/scripts/json_overview_image_info.py
    83. 

  83. @@ -47,7 +47,7 @@ def get_initial_output(image_info):
    84. 

  84.  
    85. 

  85.  
    86. 

  86.  if output:
    87. 

  87. -    default_packages, output["arch_packages"] = run(
    88. 

  88. +    default_packages, output["arch_packages"], output["kernel_version"] = run(
    89. 

  89.          [
    90. 

  90.              "make",
    91. 

  91.              "--no-print-directory",
    92. 

  92. @@ -55,6 +55,7 @@ def get_initial_output(image_info):
    93. 

  93.              "target/linux/",
    94. 

  94.              "val.DEFAULT_PACKAGES",
    95. 

  95.              "val.ARCH_PACKAGES",
    96. 

  96. +            "val.LINUX_VERSION",
    97. 

  97.          ],
    98. 

  98.          stdout=PIPE,
    99. 

  99.          stderr=PIPE,
    100.