From 84d28df1b21bbd4691370422cdbac01d03d4795b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Wed, 17 Jun 2020 13:14:08 +0200
Subject: [PATCH] Include size in package lists, sort them

This is done so that it's easy spot large packages that are not
necessary and identify packages that have grown in size too much
by diffing the image compose logs.

  sed "s/rpm -qa/rpm -qa --qf '%{size}\\\\t%{name}-%{version}-%{release}.%{arch}\\\\n' |sort -rn/" -i *.ks
---
 fedora-arm-base.ks             | 2 +-
 fedora-cloud-base.ks           | 2 +-
 fedora-cloud-bigdata.ks        | 2 +-
 fedora-cloud-experimental.ks   | 2 +-
 fedora-disk-base.ks            | 2 +-
 fedora-iot.ks                  | 2 +-
 fedora-live-base.ks            | 2 +-
 fedora-modular-disk-minimal.ks | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index 439fd37..f4d02b1 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -57,7 +57,7 @@ releasever=$(rpm --eval '%{fedora}')
 basearch=armhfp
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this ARM disk image"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 4abe751..9e59d29 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -220,7 +220,7 @@ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 echo "Packages within this cloud image:"
 echo "-----------------------------------------------------------------------"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 1199cb4..822e492 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -187,7 +187,7 @@ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 echo "Packages within this cloud image:"
 echo "-----------------------------------------------------------------------"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index 02673c2..b616999 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -179,7 +179,7 @@ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 echo "Packages within this cloud image:"
 echo "-----------------------------------------------------------------------"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks
index 773ab76..aab028b 100644
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -65,7 +65,7 @@ cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 
diff --git a/fedora-iot.ks b/fedora-iot.ks
index 73370f3..083c6db 100644
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -81,7 +81,7 @@ rm -f /var/lib/systemd/random-seed
 
 echo "Packages within this iot image:"
 echo "-----------------------------------------------------------------------"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index a56d1cc..53c395e 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -302,7 +302,7 @@ releasever=$(rpm --eval '%{fedora}')
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 
diff --git a/fedora-modular-disk-minimal.ks b/fedora-modular-disk-minimal.ks
index a9a2842..63cf270 100644
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@@ -60,7 +60,7 @@ cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*