Merge remote-tracking branch 'upstream/main'
This commit is contained in:
commit
52df7cb387
|
@ -11,6 +11,10 @@ fedora-release-budgie
|
|||
|
||||
# recommended apps
|
||||
@budgie-desktop-apps
|
||||
@libreoffice
|
||||
libreoffice-draw
|
||||
libreoffice-math
|
||||
thunderbird
|
||||
|
||||
# Exclude unwanted packages from @anaconda-tools group
|
||||
-gfs2-utils
|
||||
|
|
|
@ -34,8 +34,6 @@ firstboot --reconfig
|
|||
@hardware-support
|
||||
|
||||
kernel
|
||||
# on 32bit arm make sure we only install one kernel
|
||||
-kernel-lpae
|
||||
# remove this in %post
|
||||
dracut-config-generic
|
||||
-dracut-config-rescue
|
||||
|
@ -59,18 +57,9 @@ glibc-all-langpacks
|
|||
|
||||
# Find the architecture we are on
|
||||
arch=$(uname -m)
|
||||
|
||||
# Setup Raspberry Pi firmware
|
||||
if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
|
||||
if [[ $arch == "aarch64" ]]; then
|
||||
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
|
||||
else
|
||||
cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
|
||||
fi
|
||||
fi
|
||||
|
||||
releasever=$(rpm --eval '%{fedora}')
|
||||
|
@ -97,7 +86,7 @@ rm -f /var/lib/rpm/__db*
|
|||
# when you are using fedora via serial console as you do not get any output post grub
|
||||
# linux does a good job of knowing what consoles need to be enabled.
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2022757
|
||||
if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
|
||||
if [[ $arch == "aarch64" ]]; then
|
||||
sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
|
||||
fi
|
||||
|
||||
|
|
|
@ -113,13 +113,8 @@ subscription-manager-cockpit
|
|||
|
||||
# rh-amazon-rhui-client
|
||||
|
||||
# Exclude all langpacks for now
|
||||
-langpacks-*
|
||||
|
||||
# The langpacks-en package is pulled in by Anaconda and it seems filtering
|
||||
# it out using langpacks-* is not sufficient. It needs to be filtered
|
||||
# directly.
|
||||
-langpacks-en
|
||||
# Transitively required by grub2-tools-extra
|
||||
langpacks-core-font-en
|
||||
|
||||
# We are building Fedora-ELN
|
||||
fedora-release-eln
|
||||
|
|
|
@ -24,23 +24,12 @@ ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipk
|
|||
reboot
|
||||
|
||||
%post --erroronfail
|
||||
|
||||
# Find the architecture we are on
|
||||
arch=$(uname -m)
|
||||
if [[ $arch == "armv7l" ]]; then
|
||||
arch="armhfp"
|
||||
fi
|
||||
|
||||
# Setup Raspberry Pi firmware
|
||||
if [[ $arch == "aarch64" ]] || [[ $arch == "armhfp" ]]; then
|
||||
if [[ $arch == "aarch64" ]]; then
|
||||
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
|
||||
else
|
||||
cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
|
||||
fi
|
||||
fi
|
||||
|
||||
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
@firefox
|
||||
@kde-apps
|
||||
@kde-media
|
||||
@kde-pim
|
||||
@libreoffice
|
||||
# add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
|
||||
libreoffice-draw
|
||||
|
|
|
@ -57,7 +57,6 @@ freecol
|
|||
freedoom
|
||||
freedroidrpg
|
||||
frozen-bubble
|
||||
gl-117
|
||||
# glob2 - currently broken
|
||||
lincity-ng
|
||||
#tmw - currently broken
|
||||
|
|
|
@ -4,7 +4,6 @@ microdnf
|
|||
-initial-setup-gui
|
||||
-generic-release*
|
||||
-glibc-all-langpacks
|
||||
-xkeyboard-config
|
||||
# recommended by iproute, we don't want it in minimal
|
||||
-iproute-tc
|
||||
# recommended by gnutls, we don't want it in minimal
|
||||
|
|
|
@ -56,18 +56,9 @@ sssd-client
|
|||
|
||||
# Find the architecture we are on
|
||||
arch=$(uname -m)
|
||||
|
||||
# Setup Raspberry Pi firmware
|
||||
if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
|
||||
if [[ $arch == "aarch64" ]]; then
|
||||
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
|
||||
else
|
||||
cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
|
||||
fi
|
||||
fi
|
||||
|
||||
releasever=$(rpm --eval '%{fedora}')
|
||||
|
|
|
@ -133,7 +133,6 @@ tmux
|
|||
rlwrap
|
||||
hexchat
|
||||
fig2ps
|
||||
bibtex2html
|
||||
hevea
|
||||
|
||||
#Include Mozilla Firefox
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# fedora-server-vm-full.ks (rel. 1.01)
|
||||
# fedora-server-vm-full.ks (rel. 1.02)
|
||||
# Kickstart file to build a Fedora Server Edition VM disk image.
|
||||
# The image aims to resemble as close as technically possible the
|
||||
# full features of a Fedora Server Edition in a virtual machine.
|
||||
|
@ -174,6 +174,11 @@ touch /etc/machine-id
|
|||
##### begin custom post script (after base) #########################
|
||||
%post
|
||||
|
||||
# When we build the image /var/log gets populated.
|
||||
# Let's clean it up.
|
||||
echo "Cleanup leftover in /var/log"
|
||||
cd /var/log && find . -name \* -type f -delete
|
||||
|
||||
echo "Zeroing out empty space."
|
||||
# Create zeros file with nodatacow and no compression
|
||||
touch /var/tmp/zeros
|
||||
|
@ -192,10 +197,5 @@ rm -f /etc/systemd/system/default.target
|
|||
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
|
||||
echo .
|
||||
|
||||
# When we build the image /var/log gets populated.
|
||||
# Let's clean it up.
|
||||
echo "Cleanup leftover in /var/log"
|
||||
rm -rf /var/log/*
|
||||
|
||||
%end
|
||||
##### end custom post script ########################################
|
||||
|
|
Loading…
Reference in New Issue