From 21b10ed2f3e231223565dd115585c58f6ec086f6 Mon Sep 17 00:00:00 2001
From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com>
Date: Mon, 15 Jul 2024 11:22:49 +0200
Subject: [PATCH 1/6] experiment: trim package-imports

throw out all packages from the import set that do not match any entry in a pkg.include file in gardenlinux
---
 package-imports | 63 -------------------------------------------------
 1 file changed, 63 deletions(-)

diff --git a/package-imports b/package-imports
index 6cbd715..a29f1ec 100644
--- a/package-imports
+++ b/package-imports
@@ -5,137 +5,78 @@ amazon-ec2-utils
 apparmor
 arptables
 auditd
-awscli
 binutils
-bird2
 bsdextrautils
 btrfs-progs
-bubblewrap
-build-essential
 ca-certificates
-ceph
 chrony
 cifs-utils
 clamav
-cloud-guest-utils
 cloud-init
 conntrack
 containerd
 containerd
-containernetworking-plugins
 cryptsetup
 curl
-devscripts
-dkms
-dnsmasq
 dnsutils
-docker.io
-docker.io
 dosfstools
 dracut
 dracut-live
 dracut-network
-dwarves
 ebtables
 efibootmgr
 efitools
 ethtool
-flex
-gcc
-gdisk
-gettext
 git
 gnupg
 google-compute-engine-oslogin
 google-guest-agent
-haveged
 hdparm
 ipmitool
 iptables
-iputils-arping
 ipvsadm
 jq
-kernel-wedge
 kexec-tools
-keyutils
-libengine-pkcs11-openssl
 libpam-passwdqc
 libpam-pwquality
 libvirt-clients
 libvirt-daemon-system
-libxi6
-libxtst6
-linux-base
 lsb-release
-lsof
 lvm2
-lz4
-lzip
-lzop
-make
-man-db
 mdadm
-multipath-tools
 neofetch
 net-tools
 netplan.io
 netcat-openbsd
 nfs-common
-nftables
 nodejs
-npm
-nullmailer
 numactl
 nvme-cli
 open-vm-tools
 openssh-server
-openssl
-openssl
-ostree
-ovmf
-patchelf
 pciutils
 podman
 pkexec
 polkitd
-pristine-lfs
 python3-apt
 python3-cffi-backend
-python3-click
-python3-debian
-python3-distutils
-python3-networkx
-python3-novaclient
 python3-pefile
-python3-pip
-python3-pip-whl
-python3-setuptools-whl
 python3-systemd
-python3.11
 qemu-block-extra
-qemu-efi-aarch64
 qemu-guest-agent
-qemu-system
 qemu-utils
-quilt
 quota
 rng-tools5
 rootlesskit
-rsync
 rsyslog-relp
 rsyslog-relp
-runc
-sbsigntool
 selinux-basics
 selinux-policy-default
-sg3-utils
-sgml-base
 smartmontools
 slirp4netns
 socat
 sosreport
 sssd
-strace
 sudo
 swtpm
 #amd64 syslinux
@@ -147,10 +88,6 @@ tcpdump
 tpm2-tools
 traceroute
 usbutils
-usr-is-merged
 vim
-waagent
 wget
 xfsprogs
-yq
-zstd

From 3e11ad4f04d30dec83aaf2250d20f10faed847a7 Mon Sep 17 00:00:00 2001
From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com>
Date: Tue, 16 Jul 2024 09:47:35 +0200
Subject: [PATCH 2/6] re-add patchelf

---
 package-imports | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-imports b/package-imports
index a29f1ec..042dba4 100644
--- a/package-imports
+++ b/package-imports
@@ -1,3 +1,5 @@
+#amd64 syslinux
+#amd64 syslinux-common
 acl
 aide
 aide-common
@@ -46,17 +48,18 @@ lvm2
 mdadm
 neofetch
 net-tools
-netplan.io
 netcat-openbsd
+netplan.io
 nfs-common
 nodejs
 numactl
 nvme-cli
 open-vm-tools
 openssh-server
+patchelf
 pciutils
-podman
 pkexec
+podman
 polkitd
 python3-apt
 python3-cffi-backend
@@ -72,15 +75,13 @@ rsyslog-relp
 rsyslog-relp
 selinux-basics
 selinux-policy-default
-smartmontools
 slirp4netns
+smartmontools
 socat
 sosreport
 sssd
 sudo
 swtpm
-#amd64 syslinux
-#amd64 syslinux-common
 sysstat
 systemd-cron
 tcpd

From 7a89cffdc4d2350133368cc501f1b312f3bf9822 Mon Sep 17 00:00:00 2001
From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com>
Date: Tue, 16 Jul 2024 13:11:47 +0200
Subject: [PATCH 3/6] re-add vhost qemu packages

---
 package-imports | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package-imports b/package-imports
index 042dba4..27579b6 100644
--- a/package-imports
+++ b/package-imports
@@ -20,6 +20,7 @@ containerd
 containerd
 cryptsetup
 curl
+dnsmasq
 dnsutils
 dosfstools
 dracut
@@ -56,6 +57,7 @@ numactl
 nvme-cli
 open-vm-tools
 openssh-server
+ovmf
 patchelf
 pciutils
 pkexec
@@ -66,7 +68,10 @@ python3-cffi-backend
 python3-pefile
 python3-systemd
 qemu-block-extra
+qemu-efi-aarch64
 qemu-guest-agent
+qemu-system-arm
+qemu-system-x86
 qemu-utils
 quota
 rng-tools5

From 18c40ed622f44be63b55b019e25cec47156340f1 Mon Sep 17 00:00:00 2001
From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com>
Date: Tue, 16 Jul 2024 13:46:58 +0200
Subject: [PATCH 4/6] re-add vhost qemu packages

---
 package-imports | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package-imports b/package-imports
index 27579b6..9c8df37 100644
--- a/package-imports
+++ b/package-imports
@@ -40,8 +40,10 @@ iptables
 ipvsadm
 jq
 kexec-tools
+libgoogle-perftools4
 libpam-passwdqc
 libpam-pwquality
+libtcmalloc-minimal4
 libvirt-clients
 libvirt-daemon-system
 lsb-release

From fab43c8b3c7ac742480089a267ddb5433db27d27 Mon Sep 17 00:00:00 2001
From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com>
Date: Tue, 16 Jul 2024 13:52:39 +0200
Subject: [PATCH 5/6] re-add vhost qemu packages

---
 package-imports | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package-imports b/package-imports
index 9c8df37..d7d14c1 100644
--- a/package-imports
+++ b/package-imports
@@ -34,16 +34,15 @@ git
 gnupg
 google-compute-engine-oslogin
 google-guest-agent
+google-perftools
 hdparm
 ipmitool
 iptables
 ipvsadm
 jq
 kexec-tools
-libgoogle-perftools4
 libpam-passwdqc
 libpam-pwquality
-libtcmalloc-minimal4
 libvirt-clients
 libvirt-daemon-system
 lsb-release

From d7d298970ab4ff97a41ed6fdeb2ab694fe969b80 Mon Sep 17 00:00:00 2001
From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com>
Date: Thu, 30 Jan 2025 16:08:55 +0100
Subject: [PATCH 6/6] re-add packages for ccloud

---
 package-imports | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/package-imports b/package-imports
index d7d14c1..13b51dc 100644
--- a/package-imports
+++ b/package-imports
@@ -1,5 +1,3 @@
-#amd64 syslinux
-#amd64 syslinux-common
 acl
 aide
 aide-common
@@ -17,10 +15,8 @@ clamav
 cloud-init
 conntrack
 containerd
-containerd
 cryptsetup
 curl
-dnsmasq
 dnsutils
 dosfstools
 dracut
@@ -28,17 +24,20 @@ dracut-live
 dracut-network
 ebtables
 efibootmgr
+efi-shell-aa64
+efi-shell-x64
 efitools
 ethtool
+gdisk
 git
 gnupg
 google-compute-engine-oslogin
 google-guest-agent
-google-perftools
 hdparm
 ipmitool
 iptables
 ipvsadm
+isolinux
 jq
 kexec-tools
 libpam-passwdqc
@@ -48,46 +47,61 @@ libvirt-daemon-system
 lsb-release
 lvm2
 mdadm
+multipath-tools
 neofetch
-net-tools
 netcat-openbsd
 netplan.io
+net-tools
 nfs-common
 nodejs
 numactl
 nvme-cli
-open-vm-tools
+open-iscsi
 openssh-server
+openssl
+open-vm-tools
+openvswitch-switch
+ostree
 ovmf
-patchelf
+passt
 pciutils
 pkexec
 podman
 polkitd
 python3-apt
 python3-cffi-backend
+python3-click
+python3-debian
+python3-networkx
+python3-novaclient
 python3-pefile
+python3-pip
+python3-pip-whl
+python3-setuptools-whl
 python3-systemd
 qemu-block-extra
 qemu-efi-aarch64
 qemu-guest-agent
-qemu-system-arm
-qemu-system-x86
 qemu-utils
 quota
 rng-tools5
 rootlesskit
+rsync
 rsyslog-relp
-rsyslog-relp
+runc
+sbsigntool
 selinux-basics
 selinux-policy-default
 slirp4netns
 smartmontools
 socat
 sosreport
+sshguard
 sssd
 sudo
 swtpm
+#amd64 syslinux
+#amd64 syslinux-common
 sysstat
 systemd-cron
 tcpd
@@ -95,6 +109,7 @@ tcpdump
 tpm2-tools
 traceroute
 usbutils
+usr-is-merged
 vim
 wget
 xfsprogs