From 4800a6abb1573c79c74c2225a15a8e6f34d537b0 Mon Sep 17 00:00:00 2001 From: gl-luochongjun Date: Mon, 14 Nov 2022 10:28:41 +0800 Subject: [PATCH] fix mt7981 append glinet private packages --- ...ages-support-append-glinet-private-packages.patch | 12 ++++++------ profiles/glinet_depends.yml | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/patches-mt798x-7.6.6.1/0009-packages-support-append-glinet-private-packages.patch b/patches-mt798x-7.6.6.1/0009-packages-support-append-glinet-private-packages.patch index 0ba396a..abfb61d 100644 --- a/patches-mt798x-7.6.6.1/0009-packages-support-append-glinet-private-packages.patch +++ b/patches-mt798x-7.6.6.1/0009-packages-support-append-glinet-private-packages.patch @@ -1,4 +1,4 @@ -From 992762cb82e78b44199e30a7f13d82eba2131e1f Mon Sep 17 00:00:00 2001 +From f0c18ddf8edfa8c38a2cc06cd3219fb9f6286084 Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Wed, 13 Jul 2022 10:50:26 +0800 Subject: [PATCH] packages: support append glinet private packages @@ -24,7 +24,7 @@ index 0000000000..7501d73cfc + $(foreach pkg,$(shell ls $(GL_PKGDIR)/$(p)_*.ipk),$(pkg)$(call GetABISuffix,$(pkg)))) +endif diff --git a/package/Makefile b/package/Makefile -index 392d773622..4f56ea9193 100644 +index 209be34674..3b7d7ea892 100644 --- a/package/Makefile +++ b/package/Makefile @@ -9,6 +9,7 @@ curdir:=package @@ -36,15 +36,15 @@ index 392d773622..4f56ea9193 100644 -include $(TMP_DIR)/.packagedeps package-y += kernel/linux @@ -69,7 +70,8 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE - mkdir -p $(TARGET_DIR)/tmp $(file >$(TMP_DIR)/opkg_install_list,\ $(call opkg_package_files,\ -- $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))) -+ $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))) \ + $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))) +- $(call opkg,$(TARGET_DIR)) install $$(cat $(TMP_DIR)/opkg_install_list) ++ $(call opkg,$(TARGET_DIR)) install $$(cat $(TMP_DIR)/opkg_install_list) \ + $(GL_APPEND_IPKS) - $(call opkg,$(TARGET_DIR)) install $$(cat $(TMP_DIR)/opkg_install_list) @for file in $(PACKAGE_INSTALL_FILES); do \ [ -s $$file.flags ] || continue; \ + for flag in `cat $$file.flags`; do \ -- 2.25.1 diff --git a/profiles/glinet_depends.yml b/profiles/glinet_depends.yml index a850503..8c0c4d8 100644 --- a/profiles/glinet_depends.yml +++ b/profiles/glinet_depends.yml @@ -97,6 +97,7 @@ packages: - wpad-openssl - tor - tor-geoip + - swconfig