From c05572c64a11c183a6d559db2254aea2802af798 Mon Sep 17 00:00:00 2001 From: Grische Date: Tue, 19 Dec 2023 20:39:21 +0100 Subject: [PATCH] site: regenerate site.mk --- contrib/genpkglist.py | 1 - site.mk | 19 +++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py index c591c70f..c6e328ca 100755 --- a/contrib/genpkglist.py +++ b/contrib/genpkglist.py @@ -282,7 +282,6 @@ def render(self): 'netgear-r6120', 'ravpower-rp-wd009'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \ exclude([ - 'tp-link-re305' ], pkglists=[PKGS_TLS]) for target in ['x86-64', 'x86-generic', 'x86-geode']: diff --git a/site.mk b/site.mk index 4d9a44f7..5ce9b39c 100644 --- a/site.mk +++ b/site.mk @@ -151,13 +151,21 @@ INCLUDE_PCI_NET := \ EXCLUDE_PCI_NET := \ -kmod-bnx2 +INCLUDE_VIRT := \ + qemu-ga + +EXCLUDE_VIRT := \ + -qemu-ga + INCLUDE_TLS := \ ca-bundle \ - libustream-openssl + libustream-openssl \ + openssh-sftp-server EXCLUDE_TLS := \ -ca-bundle \ - -libustream-openssl + -libustream-openssl \ + -openssh-sftp-server ifeq ($(GLUON_TARGET),ath79-generic) GLUON_SITE_PACKAGES += $(INCLUDE_TLS) @@ -175,6 +183,7 @@ ifeq ($(GLUON_TARGET),ath79-generic) GLUON_tp-link-archer-c59-v1_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) GLUON_tp-link-tl-wr842n-v3_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) GLUON_tp-link-tl-wr1043nd-v4_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) + GLUON_tp-link-tl-wr1043n-v5_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) GLUON_d-link-dir825b1_SITE_PACKAGES += $(EXCLUDE_TLS) endif @@ -274,9 +283,11 @@ ifeq ($(GLUON_TARGET),ramips-mt76x8) GLUON_gl.inet-microuter-n300_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) GLUON_netgear-r6120_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) GLUON_ravpower-rp-wd009_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) - GLUON_tp-link-re305_SITE_PACKAGES += $(EXCLUDE_TLS) endif +# no pkglists for target realtek-rtl838x + + ifeq ($(GLUON_TARGET),rockchip-armv8) GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) @@ -288,7 +299,7 @@ ifeq ($(GLUON_TARGET),sunxi-cortexa7) endif ifeq ($(GLUON_TARGET),x86-64) - GLUON_SITE_PACKAGES += $(INCLUDE_PCI) $(INCLUDE_PCI_NET) $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) + GLUON_SITE_PACKAGES += $(INCLUDE_PCI) $(INCLUDE_PCI_NET) $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) $(INCLUDE_VIRT) endif