This commit is contained in:
Harald Hoyer 2019-04-05 15:07:05 +02:00
parent 329547340c
commit 29ff4e7851
2 changed files with 62 additions and 20 deletions

View file

@ -1,17 +1,8 @@
@Fonts ImageMagick
@GNOME exa
@c-development bat
@development-libs fd-find
@development-tools ripgrep
GeoIP-GeoLite-data
NetworkManager
NetworkManager-openvpn
NetworkManager-openvpn-gnome
NetworkManager-ssh
NetworkManager-ssh-gnome
NetworkManager-vpnc
NetworkManager-vpnc-gnome
NetworkManager-wifi
adwaita-cursor-theme adwaita-cursor-theme
adwaita-gtk2-theme adwaita-gtk2-theme
adwaita-icon-theme adwaita-icon-theme
@ -20,6 +11,7 @@ alsa-tools-firmware.x86_64
asciidoc asciidoc
asciinema asciinema
atmel-firmware atmel-firmware
atomic-registries
audit-libs-devel audit-libs-devel
authselect authselect
autofs autofs
@ -27,53 +19,74 @@ b43-openfwwf
bash-completion bash-completion
bfa-firmware bfa-firmware
bind-utils bind-utils
btrfs-progs-devel
bzip2
bzip2-devel bzip2-devel
ca-certificates ca-certificates
@c-development
clang-devel
cmake
conmon
container-selinux
cryptsetup-devel cryptsetup-devel
cups cups
cups-client cups-client
cups-ipptool cups-ipptool
dbus-devel dbus-devel
@development-libs
@development-tools
device-mapper-devel
dnf dnf
docbook-dtds docbook-dtds
docbook-style-xsl docbook-style-xsl
ebtables ebtables
elfutils-devel elfutils-devel
f29-backgrounds-gnome
f29-backgrounds-base f29-backgrounds-base
f29-backgrounds-gnome
fedora-gpg-keys fedora-gpg-keys
fedora-packager fedora-packager
fedora-release fedora-release
fedpkg fedpkg
findutils
firefox firefox
firewalld-filesystem firewalld-filesystem
flatpak flatpak
@Fonts
fwupd fwupd
fwupdate-efi fwupdate-efi
gawk gawk
gcc gcc
gcc-c++ gcc-c++
GeoIP-GeoLite-data
geolite2-city geolite2-city
geolite2-country geolite2-country
gettext gettext
git git
gtk3-devel
glib2-devel glib2-devel
glibc-static
@GNOME
gnome-initial-setup gnome-initial-setup
gnome-remote-desktop gnome-remote-desktop
gnu-efi gnu-efi
gnu-efi-devel gnu-efi-devel
gnupg
gnutls-devel gnutls-devel
gobject-introspection-devel gobject-introspection-devel
golang
golang-github-cpuguy83-go-md2man
gperf gperf
gpgme-devel
gstreamer1-plugin-openh264
gtk3-devel
help2man help2man
iptables
iptables-devel iptables-devel
iputils iputils
ipw2100-firmware ipw2100-firmware
ipw2200-firmware ipw2200-firmware
iscan-firmware iscan-firmware
iwl100-firmware
iwl1000-firmware iwl1000-firmware
iwl100-firmware
iwl105-firmware iwl105-firmware
iwl135-firmware iwl135-firmware
iwl2000-firmware iwl2000-firmware
@ -89,8 +102,10 @@ iwl6000g2b-firmware
iwl6050-firmware iwl6050-firmware
iwl7260-firmware iwl7260-firmware
java java
keybase
kmod-devel kmod-devel
libacl-devel libacl-devel
libassuan-devel
libblkid-devel libblkid-devel
libcap-devel libcap-devel
libcurl-devel libcurl-devel
@ -102,54 +117,75 @@ libgpg-error-devel
libidn2-devel libidn2-devel
libmicrohttpd-devel libmicrohttpd-devel
libmount-devel libmount-devel
libpng12
libseccomp-devel libseccomp-devel
libselinux-devel libselinux-devel
libvarlink-util
libvarlink-devel libvarlink-devel
libvarlink-util
libvirt-bash-completion libvirt-bash-completion
libvirt-client libvirt-client
libvirt-daemon-config-network libvirt-daemon-config-network
libvirt-daemon-kvm libvirt-daemon-kvm
libxkbcommon-devel libxkbcommon-devel
libxslt libxslt
libxslt
linux-firmware linux-firmware
lld
lsof
lz4 lz4
lz4-devel lz4-devel
make
man-db man-db
mc mc
meson meson
midisport-firmware midisport-firmware
mosh mosh
mozilla-openh264
nautilus nautilus
net-tools net-tools
NetworkManager
NetworkManager-openvpn
NetworkManager-openvpn-gnome
NetworkManager-ssh
NetworkManager-ssh-gnome
NetworkManager-vpnc
NetworkManager-vpnc-gnome
NetworkManager-wifi
nfs-utils nfs-utils
nmap-ncat
nss-mdns nss-mdns
nss-tools nss-tools
opensc opensc
openssh-server openssh-server
ostree-devel
pam-devel pam-devel
pam_yubico pam_yubico
perl-File-Slurp perl-File-Slurp
pesign pesign
pigz pigz
pkgconfig pkgconfig
procps-ng
psmisc psmisc
python2-future
python3-devel python3-devel
python3-future
python3-lxml python3-lxml
python3-wheel python3-wheel
qrencode-devel qrencode-devel
rpcbind rpcbind
rsync rsync
runc
screen screen
skopeo-containers
slirp4netns
systemd-devel
thunderbird thunderbird
tmux tmux
tree tree
usbutils usbutils
vim-enhanced vim-enhanced
virt-manager virt-manager
which
xclip xclip
xz xz
xz-devel xz-devel
zd1211-firmware zd1211-firmware

View file

@ -200,6 +200,8 @@ mount -o bind /sys "$sysroot/sys"
mount -t devtmpfs devtmpfs "$sysroot/dev" mount -t devtmpfs devtmpfs "$sysroot/dev"
mkdir -p "$sysroot"/var/cache/dnf mkdir -p "$sysroot"/var/cache/dnf
mkdir -p "$sysroot"/etc
cp /etc/os-release "$sysroot"/etc
mkdir -p "$STATEDIR"/dnf mkdir -p "$STATEDIR"/dnf
mount -o bind "$STATEDIR"/dnf "$sysroot"/var/cache/dnf mount -o bind "$STATEDIR"/dnf "$sysroot"/var/cache/dnf
@ -733,6 +735,10 @@ fi
if [[ -f "$sysroot"/etc/fwupd/uefi.conf ]]; then if [[ -f "$sysroot"/etc/fwupd/uefi.conf ]]; then
sed -i -e 's#RequireShimForSecureBoot=.*#RequireShimForSecureBoot=false#g' \ sed -i -e 's#RequireShimForSecureBoot=.*#RequireShimForSecureBoot=false#g' \
"$sysroot"/etc/fwupd/uefi.conf "$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 fi
#--------------- #---------------