him411/gl-infra-builder-FUjr
1
0
Fork 0
mirror of https://github.com/FUjr/gl-infra-builder.git synced 2025-12-16 17:15:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix mt7981 append glinet private packages

Browse Source
This commit is contained in:
gl-luochongjun 2022-11-14 10:28:41 +08:00
parent 86ebf7bd90
commit 4800a6abb1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches-mt798x-7.6.6.1/0009-packages-support-append-glinet-private-packages.patch
View File

@ -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 <jianhui.zhao@gl-inet.com>
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

1
profiles/glinet_depends.yml
View File

@ -97,6 +97,7 @@ packages:
- wpad-openssl
- tor
- tor-geoip
- swconfig