From 29ff4e785147bfc194e273d50c5599e1a17e6c58 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 5 Apr 2019 15:07:05 +0200
Subject: [PATCH] iii

---
 pkglist.txt     | 76 ++++++++++++++++++++++++++++++++++++-------------
 prepare-root.sh |  6 ++++
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/pkglist.txt b/pkglist.txt
index b93ed5a..c712b5a 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -1,17 +1,8 @@
-@Fonts
-@GNOME
-@c-development
-@development-libs
-@development-tools
-GeoIP-GeoLite-data
-NetworkManager
-NetworkManager-openvpn
-NetworkManager-openvpn-gnome
-NetworkManager-ssh
-NetworkManager-ssh-gnome
-NetworkManager-vpnc
-NetworkManager-vpnc-gnome
-NetworkManager-wifi
+ImageMagick
+exa
+bat
+fd-find
+ripgrep
 adwaita-cursor-theme
 adwaita-gtk2-theme
 adwaita-icon-theme
@@ -20,6 +11,7 @@ alsa-tools-firmware.x86_64
 asciidoc
 asciinema
 atmel-firmware
+atomic-registries
 audit-libs-devel
 authselect
 autofs
@@ -27,53 +19,74 @@ b43-openfwwf
 bash-completion
 bfa-firmware
 bind-utils
+btrfs-progs-devel
+bzip2
 bzip2-devel
 ca-certificates
+@c-development
+clang-devel
+cmake
+conmon
+container-selinux
 cryptsetup-devel
 cups
 cups-client
 cups-ipptool
 dbus-devel
+@development-libs
+@development-tools
+device-mapper-devel
 dnf
 docbook-dtds
 docbook-style-xsl
 ebtables
 elfutils-devel
-f29-backgrounds-gnome
 f29-backgrounds-base
+f29-backgrounds-gnome
 fedora-gpg-keys
 fedora-packager
 fedora-release
 fedpkg
+findutils
 firefox
 firewalld-filesystem
 flatpak
+@Fonts
 fwupd
 fwupdate-efi
 gawk
 gcc
 gcc-c++
+GeoIP-GeoLite-data
 geolite2-city
 geolite2-country
 gettext
 git
-gtk3-devel
 glib2-devel
+glibc-static
+@GNOME
 gnome-initial-setup
 gnome-remote-desktop
 gnu-efi
 gnu-efi-devel
+gnupg
 gnutls-devel
 gobject-introspection-devel
+golang
+golang-github-cpuguy83-go-md2man
 gperf
+gpgme-devel
+gstreamer1-plugin-openh264
+gtk3-devel
 help2man
+iptables
 iptables-devel
 iputils
 ipw2100-firmware
 ipw2200-firmware
 iscan-firmware
-iwl100-firmware
 iwl1000-firmware
+iwl100-firmware
 iwl105-firmware
 iwl135-firmware
 iwl2000-firmware
@@ -89,8 +102,10 @@ iwl6000g2b-firmware
 iwl6050-firmware
 iwl7260-firmware
 java
+keybase
 kmod-devel
 libacl-devel
+libassuan-devel
 libblkid-devel
 libcap-devel
 libcurl-devel
@@ -102,54 +117,75 @@ libgpg-error-devel
 libidn2-devel
 libmicrohttpd-devel
 libmount-devel
+libpng12
 libseccomp-devel
 libselinux-devel
-libvarlink-util
 libvarlink-devel
+libvarlink-util
 libvirt-bash-completion
 libvirt-client
 libvirt-daemon-config-network
 libvirt-daemon-kvm
 libxkbcommon-devel
 libxslt
-libxslt
 linux-firmware
+lld
+lsof
 lz4
 lz4-devel
+make
 man-db
 mc
 meson
 midisport-firmware
 mosh
+mozilla-openh264
 nautilus
 net-tools
+NetworkManager
+NetworkManager-openvpn
+NetworkManager-openvpn-gnome
+NetworkManager-ssh
+NetworkManager-ssh-gnome
+NetworkManager-vpnc
+NetworkManager-vpnc-gnome
+NetworkManager-wifi
 nfs-utils
+nmap-ncat
 nss-mdns
 nss-tools
 opensc
 openssh-server
+ostree-devel
 pam-devel
 pam_yubico
 perl-File-Slurp
 pesign
 pigz
 pkgconfig
+procps-ng
 psmisc
+python2-future
 python3-devel
+python3-future
 python3-lxml
 python3-wheel
 qrencode-devel
 rpcbind
 rsync
+runc
 screen
+skopeo-containers
+slirp4netns
+systemd-devel
 thunderbird
 tmux
 tree
 usbutils
 vim-enhanced
 virt-manager
+which
 xclip
 xz
 xz-devel
 zd1211-firmware
-
diff --git a/prepare-root.sh b/prepare-root.sh
index 018ad9b..2f2f94d 100755
--- a/prepare-root.sh
+++ b/prepare-root.sh
@@ -200,6 +200,8 @@ mount -o bind /sys "$sysroot/sys"
 mount -t devtmpfs devtmpfs "$sysroot/dev"
 
 mkdir -p "$sysroot"/var/cache/dnf
+mkdir -p "$sysroot"/etc
+cp /etc/os-release "$sysroot"/etc
 mkdir -p "$STATEDIR"/dnf
 mount -o bind "$STATEDIR"/dnf "$sysroot"/var/cache/dnf
 
@@ -733,6 +735,10 @@ fi
 if [[ -f "$sysroot"/etc/fwupd/uefi.conf ]]; then
     sed -i -e 's#RequireShimForSecureBoot=.*#RequireShimForSecureBoot=false#g' \
         "$sysroot"/etc/fwupd/uefi.conf
+    CRT=${CRT:-${BASEDIR}/${NAME}.crt}
+    KEY=${KEY:-${BASEDIR}/${NAME}.key}
+
+    sbsign --key "$KEY" --cert "$CRT" --output "$sysroot"/usr/libexec/fwupd/efi/fwupdx64.efi.signed "$sysroot"/usr/libexec/fwupd/efi/fwupdx64.efi
 fi
 
 #---------------