imagebuilder.patch 5.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091
  1. --- a/target/imagebuilder/Makefile
  2. +++ b/target/imagebuilder/Makefile
  3. @@ -38,13 +38,16 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
  4. ./files/repositories.conf \
  5. $(TMP_DIR)/.targetinfo \
  6. $(TMP_DIR)/.packageinfo \
  7. - $(PKG_BUILD_DIR)/
  8. + $(TOPDIR)/files \
  9. + $(PKG_BUILD_DIR)/ || true
  10. -ifeq ($(CONFIG_IB_STANDALONE),)
  11. echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf
  12. $(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
  13. $(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
  14. -endif
  15. + $(SED) 's/^src\/gz \(.*\) https.*top\/\(packages.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
  16. + $(SED) 's/^src\/gz \(.*\) https.*top\/\(targets.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/releases\/\2/' $(PKG_BUILD_DIR)/repositories.conf
  17. + $(SED) 's/\/kiddin9//' $(PKG_BUILD_DIR)/repositories.conf
  18. + $(SED) '/openwrt_core/d' $(PKG_BUILD_DIR)/repositories.conf
  19. $(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
  20. # create an empty package index so `opkg` doesn't report an error
  21. --- a/target/imagebuilder/files/Makefile
  22. +++ b/target/imagebuilder/files/Makefile
  23. @@ -115,17 +115,32 @@ BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(fi
  24. PACKAGES:=
  25. _call_image: staging_dir/host/.prereq-build
  26. + [ "$(DATE)" ] && DATE="$(DATE)" || DATE="`date +'%m.%d.%Y'`"; \
  27. + mkdir -p $(USER_FILES)/etc/uci-defaults || true; \
  28. + echo -e " \
  29. + sed -i \"s/[0-9]\+.[0-9]\+.[0-9]\{4\}/$$DATE/\" /etc/openwrt_release \n \
  30. + sed -i \"s/DISTRIB_ID=.*/DISTRIB_ID='$(ROOTFS_PARTSIZE)'/\" /etc/openwrt_release \n \
  31. + sed -i \"s/OpenWrt .* by/OpenWrt $$DATE by/\" /etc/banner \n \
  32. + echo \"$$DATE\" >/etc/openwrt_version \n \
  33. + "> $(USER_FILES)/etc/uci-defaults/99-version; \
  34. echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
  35. echo 'Packages: $(BUILD_PACKAGES)'
  36. echo
  37. rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
  38. mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
  39. + if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-4a-gigabit-v2|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban|DEVICE_zte_e8820v2) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
  40. + echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(TOPDIR)/repositories.conf; \
  41. + else \
  42. + sed -i "/smflash/d" $(TOPDIR)/repositories.conf; \
  43. + fi
  44. $(MAKE) package_reload
  45. $(MAKE) package_install
  46. $(MAKE) -s prepare_rootfs
  47. $(MAKE) -s build_image
  48. $(MAKE) -s json_overview_image_info
  49. $(MAKE) -s checksum
  50. + rm -rf $(KERNEL_BUILD_DIR)/tmp
  51. + rm -rf $(KERNEL_BUILD_DIR)/root.*
  52. _call_manifest: FORCE
  53. rm -rf $(TARGET_DIR)
  54. @@ -166,7 +181,14 @@ package_install: FORCE
  55. @echo Installing packages...
  56. $(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk))
  57. $(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
  58. - $(OPKG) install $(BUILD_PACKAGES)
  59. + for p in $(BUILD_PACKAGES); do \
  60. + if [[ $$p == luci-app-* && "`$(OPKG) list | grep luci-i18n-\`echo $$p | cut -d - -f 3-\`-zh-cn`" ]]; then \
  61. + packages+="luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn "; \
  62. + fi \
  63. + done; \
  64. + $(OPKG) install --force-overwrite --force-checksum --force-depends $(BUILD_PACKAGES) luci-i18n-base-zh-cn luci-i18n-base-en; \
  65. + $(OPKG) install $$packages || true
  66. + $(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer --force-reinstall my-default-settings
  67. prepare_rootfs: FORCE
  68. @echo
  69. @@ -180,12 +202,15 @@ prepare_rootfs: FORCE
  70. ) \
  71. )
  72. $(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES),$(DISABLED_SERVICES))
  73. + if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
  74. + echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(BUILD_DIR)/root-ramips/etc/opkg/distfeeds.conf; \
  75. + fi
  76. build_image: FORCE
  77. @echo
  78. @echo Building images...
  79. rm -rf $(BUILD_DIR)/json_info_files/
  80. - $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
  81. + nice -n 19 $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
  82. $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
  83. $(BIN_DIR)/profiles.json: FORCE