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

fix a1300 support glinet private packages

Browse Source
This commit is contained in:
gl-yangweiping 2023-01-12 02:24:27 -05:00
parent 3d25ef3fe4
commit 1c5e5e17b5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches-21.02.2/0022-packages-support-append-glinet-private-packages.patch → patches-21.02.2/0022-add-packages-support-append-glinet-private-packages.patch
View File

@ -1,4 +1,4 @@
From 992762cb82e78b44199e30a7f13d82eba2131e1f Mon Sep 17 00:00:00 2001
From 012a61138ea8030c5315a6d6f1b36abaab1612d3 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
2.17.1

1
profiles/glinet_axt1800.yml
View File

@ -7,7 +7,6 @@ feeds:
revision: cdd5e917f28822810189966c9ab82d622979efbf
packages:
- kmod-gl-sdk4-fan
- gl-sdk4-led
- gl-sdk4-adguardhome
- gl-sdk4-ui-adguardhome

2
profiles/glinet_depends.yml
View File

@ -24,7 +24,6 @@ packages:
- kmod-fs-exfat
- kmod-gl-sdk4-hw-info
- kmod-gl-sdk4-tertf
- kmod-gl-sdk4-fan
- kmod-inet-diag
- iptables-mod-tproxy
- iptables-mod-filter
@ -52,6 +51,7 @@ packages:
- kmod-mtdoops
- smstools3
- comgt
- comgt-ncm
- chat
- uqmi
- usb-modeswitch

1
profiles/target_wlan_ap-gl-axt1800.yml
View File

@ -7,3 +7,4 @@ include:
packages:
- kmod-hwmon-pwmfan
- kmod-gl-sdk4-fan