From 4465b561b96dd1190c69e94320c8a7cced3fdefb Mon Sep 17 00:00:00 2001 From: Grische Date: Tue, 19 Dec 2023 20:29:39 +0100 Subject: [PATCH] contrib: add genpkglist improvements from FFAC - add package for zyxel-nwa55axe - aAdd qemu-ga to x86-64 target - add sftp server (for OpenSSH 9+) - add qemu-ga to x86 targets - remove usb for ex3700 Co-authored-by: Florian Maurer --- contrib/genpkglist.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py index 97e7ff98..c591c70f 100755 --- a/contrib/genpkglist.py +++ b/contrib/genpkglist.py @@ -178,9 +178,13 @@ def render(self): ]) pkglists.append(PKGS_PCI_NET) +PKGS_VIRT = PackageList('VIRT', ['qemu-ga']) +pkglists.append(PKGS_VIRT) + PKGS_TLS = PackageList('TLS', [ 'ca-bundle', - 'libustream-openssl' + 'libustream-openssl', + 'openssh-sftp-server' ]) pkglists.append(PKGS_TLS) @@ -203,7 +207,8 @@ def render(self): 'tp-link-archer-c7-v5', 'tp-link-archer-c59-v1', 'tp-link-tl-wr842n-v3', - 'tp-link-tl-wr1043nd-v4' + 'tp-link-tl-wr1043nd-v4', + 'tp-link-tl-wr1043n-v5' ], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \ exclude([ 'd-link-dir825b1', @@ -261,13 +266,13 @@ def render(self): 'ubiquiti-edgerouter-x-sfp'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]) targets.get('ramips-mt7620'). \ - add_pkglist(PKGS_USB). \ - add_pkglist(PKGS_USB_NET). \ - add_pkglist(PKGS_USB_SERIAL). \ - add_pkglist(PKGS_USB_STORAGE). \ - add_pkglist(PKGS_TLS). \ - exclude([ # devices without usb ports - 'netgear-ex3700'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]) + add_pkglist(PKGS_USB). \ + add_pkglist(PKGS_USB_NET). \ + add_pkglist(PKGS_USB_SERIAL). \ + add_pkglist(PKGS_USB_STORAGE). \ + add_pkglist(PKGS_TLS). \ + exclude([ # devices without usb ports + 'netgear-ex3700'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]) targets.get('ramips-mt76x8'). \ add_pkglist(PKGS_TLS). \ @@ -290,6 +295,7 @@ def render(self): add_pkglist(PKGS_PCI_NET). \ add_pkglist(PKGS_TLS) +targets.get('x86-64').add_pkglist(PKGS_VIRT) targets.get('x86-legacy').add_pkglist(PKGS_TLS) if __name__ == '__main__':