contrib: add USB and TLS to ipq40xx/ath79-mikrotik

istrator2 · Dec 22, 2023 · 6ef3457 · 6ef3457
1 parent 752b99d
commit 6ef3457
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py
@@ -209,7 +209,19 @@ def render(self):
         'd-link-dir825b1',
     ], pkglists=[PKGS_TLS])
 
-for target in ['ath79-nand', 'ipq40xx-generic', 'ipq806x-generic', 'lantiq-xway', 'mpc85xx-p1010', 'mpc85xx-p1020', 'mvebu-cortexa9', 'rockchip-armv8', 'sunxi-cortexa7']:
+for target in [
+    "ath79-mikrotik",
+    "ath79-nand",
+    "ipq40xx-generic",
+    "ipq40xx-mikrotik",
+    "ipq806x-generic",
+    "lantiq-xway",
+    "mpc85xx-p1010",
+    "mpc85xx-p1020",
+    "mvebu-cortexa9",
+    "rockchip-armv8",
+    "sunxi-cortexa7",
+]:
     targets[target]. \
         add_pkglist(PKGS_USB). \
         add_pkglist(PKGS_USB_NET). \

diff --git a/site.mk b/site.mk
@@ -178,8 +178,10 @@ ifeq ($(GLUON_TARGET),ath79-generic)
     GLUON_d-link-dir825b1_SITE_PACKAGES += $(EXCLUDE_TLS)
 endif
 
-# no pkglists for target ath79-mikrotik
+ifeq ($(GLUON_TARGET),ath79-mikrotik)
+    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
 
+endif
 
 ifeq ($(GLUON_TARGET),ath79-nand)
     GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
@@ -211,8 +213,10 @@ ifeq ($(GLUON_TARGET),ipq40xx-generic)
 
 endif
 
-# no pkglists for target ipq40xx-mikrotik
+ifeq ($(GLUON_TARGET),ipq40xx-mikrotik)
+    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
 
+endif
 
 ifeq ($(GLUON_TARGET),ipq806x-generic)
     GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)