|
@@ -1,6 +1,6 @@
|
|
|
--- a/include/image.mk
|
|
|
+++ b/include/image.mk
|
|
|
-@@ -623,7 +621,7 @@ define Device/Build/kernel
|
|
|
+@@ -717,7 +717,7 @@ define Device/Build/kernel
|
|
|
endef
|
|
|
|
|
|
define Device/Build/image
|
|
@@ -9,7 +9,15 @@
|
|
|
$$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
|
|
|
$(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
|
|
|
$(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
|
|
|
-@@ -761,6 +761,7 @@ define Device/DumpInfo
|
|
|
+@@ -755,6 +755,7 @@ define Device/Build/image
|
|
|
+ FILE_TYPE=$(word 1,$(subst ., ,$(2))) \
|
|
|
+ FILE_FILESYSTEM="$(1)" \
|
|
|
+ DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
|
|
|
++ IMAGE_SIZE="$(shell echo $$(($(call exp_units,$(IMAGE_SIZE)))))" \
|
|
|
+ DEVICE_VENDOR="$(DEVICE_VENDOR)" \
|
|
|
+ DEVICE_MODEL="$(DEVICE_MODEL)" \
|
|
|
+ DEVICE_VARIANT="$(DEVICE_VARIANT)" \
|
|
|
+@@ -861,6 +862,7 @@ define Device/DumpInfo
|
|
|
Target-Profile: DEVICE_$(1)
|
|
|
Target-Profile-Name: $(DEVICE_DISPLAY)
|
|
|
Target-Profile-Packages: $(DEVICE_PACKAGES)
|
|
@@ -18,6 +26,17 @@
|
|
|
Target-Profile-SupportedDevices: $(SUPPORTED_DEVICES)
|
|
|
$(if $(BROKEN),Target-Profile-Broken: $(BROKEN))
|
|
|
|
|
|
+--- a/scripts/json_add_image_info.py
|
|
|
++++ b/scripts/json_add_image_info.py
|
|
|
+@@ -72,6 +72,7 @@ def get_titles():
|
|
|
+ "device_packages": getenv("DEVICE_PACKAGES").split(),
|
|
|
+ "supported_devices": getenv("SUPPORTED_DEVICES").split(),
|
|
|
+ "titles": get_titles(),
|
|
|
++ "image_size": getenv("IMAGE_SIZE"),
|
|
|
+ }
|
|
|
+ },
|
|
|
+ }
|
|
|
+
|
|
|
--- a/scripts/target-metadata.pl
|
|
|
+++ b/scripts/target-metadata.pl
|
|
|
@@ -437,6 +437,7 @@ ()
|
|
@@ -71,7 +90,7 @@
|
|
|
|
|
|
--- a/target/imagebuilder/files/Makefile
|
|
|
+++ b/target/imagebuilder/files/Makefile
|
|
|
-@@ -142,6 +142,36 @@ BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
|
|
|
+@@ -142,6 +142,33 @@ BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
|
|
|
# "-pkgname" in the package list means remove "pkgname" from the package list
|
|
|
BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
|
|
|
BUILD_PACKAGES:=$(USER_PACKAGES) $(BUILD_PACKAGES)
|
|
@@ -90,14 +109,11 @@
|
|
|
+ endif
|
|
|
+endif
|
|
|
+ifeq ($(SMALL_FLASH),true)
|
|
|
-+ ifeq ($(XSMALL_FLASH),true)
|
|
|
-+ BUILD_PACKAGES += -coremark -htop -bash -openssh-sftp-server
|
|
|
-+ endif
|
|
|
+ ifeq ($(shell grep -q small_flash $(TOPDIR)/repositories.conf || echo "not_found"),not_found)
|
|
|
+ $(shell echo "`grep kwrt_kiddin9 $(TOPDIR)/repositories.conf | sed -e 's/kiddin9/small_flash/g'`" >>$(TOPDIR)/repositories.conf)
|
|
|
+ endif
|
|
|
+ ifneq ($(findstring /data/bcache/,$(BIN_DIR)),)
|
|
|
-+ BUILD_PACKAGES += -luci-app-homeproxy -luci-app-istorex -luci-theme-argon
|
|
|
++ BUILD_PACKAGES += -luci-app-homeproxy -luci-app-istorex -luci-theme-argon -htop -bash -openssh-sftp-server -luci-ssl-nginx luci-ssl
|
|
|
+ endif
|
|
|
+else
|
|
|
+ $(shell sed -i "/small_flash/d" $(TOPDIR)/repositories.conf)
|