arm: changes for the UEFI on ARMv7

Primarily changes for UEFI on ARMv7 but also some cleanups/updates
for the arm/aarch64 images.

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson 2021-02-18 17:59:24 +00:00 committed by mohanboddu
parent 9f36177559
commit aa32bc6bb0
20 changed files with 33 additions and 296 deletions

View File

@ -1,76 +0,0 @@
#keyboard us
lang en_US.UTF-8
selinux --enforcing
firewall --enabled --service=mdns,ssh
bootloader --extlinux --location=mbr
part /boot/efi --size=80 --fstype vfat --asprimary
part /boot --size=512 --fstype ext4 --asprimary
# make sure that initial-setup runs and lets us do all the configuration bits
firstboot --reconfig
services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup
%include fedora-repo.ks
%packages
@core
@standard
@hardware-support
kernel
# remove this in %post
dracut-config-generic
-dracut-config-rescue
# install tools needed to manage and boot arm systems
@arm-tools
-uboot-images-armv8
chrony
extlinux-bootloader
bcm283x-firmware
initial-setup
initial-setup-gui
-iwl*
-ipw*
-usb_modeswitch
#lets resize / on first boot
# dracut-modules-growroot
# make sure all the locales are available for inital0-setup and anaconda to work
glibc-all-langpacks
%end
%post
# Setup Raspberry Pi firmware
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
# work around for poor key import UI in PackageKit
rm -f /var/lib/rpm/__db*
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 --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*
# remove random seed, the newly installed instance should make it's own
rm -f /var/lib/systemd/random-seed
# Because memory is scarce resource in most arm systems we are differing from the Fedora
# default of having /tmp on tmpfs.
echo "Disabling tmpfs for /tmp."
systemctl mask tmp.mount
dnf -y remove dracut-config-generic
# Remove machine-id on pre generated images
rm -f /etc/machine-id
touch /etc/machine-id
%end

View File

@ -1,12 +0,0 @@
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-kde-common.ks
part btrfs.007 --fstype="btrfs" --size=6300
btrfs none --label=fedora btrfs.007
btrfs /home --subvol --name=home LABEL=fedora
btrfs / --subvol --name=root LABEL=fedora
%post
%end

View File

@ -1,12 +0,0 @@
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-lxde-common.ks
part btrfs.007 --fstype="btrfs" --size=4300
btrfs none --label=fedora btrfs.007
btrfs /home --subvol --name=home LABEL=fedora
btrfs / --subvol --name=root LABEL=fedora
%post
%end

View File

@ -1,17 +0,0 @@
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-lxqt-common.ks
part btrfs.007 --fstype="btrfs" --size=4400
btrfs none --label=fedora btrfs.007
btrfs /home --subvol --name=home LABEL=fedora
btrfs / --subvol --name=root LABEL=fedora
%packages
# trojita not available on non-x86 platforms
-trojita
%end
%post
%end

View File

@ -1,12 +0,0 @@
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-mate-common.ks
part btrfs.007 --fstype="btrfs" --size=7168
btrfs none --label=fedora btrfs.007
btrfs /home --subvol --name=home LABEL=fedora
btrfs / --subvol --name=root LABEL=fedora
%post
%end

View File

@ -1,4 +0,0 @@
%include fedora-arm-base.ks
%include fedora-minimal-common.ks
part / --size=1600 --fstype ext4

View File

@ -1,30 +0,0 @@
# Maintained by the Fedora Python SIG:
# http://fedoraproject.org/wiki/SIGs/Python
# mailto:python-devel@lists.fedoraproject.org
# The ARM Workstion based Python Classroom Lab
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-workstation-common.ks
%include fedora-python-classroom-gnome-common.ks
part btrfs.007 --fstype="btrfs" --size=7000
btrfs none --label=fedora btrfs.007
btrfs /home --subvol --name=home LABEL=fedora
btrfs / --subvol --name=root LABEL=fedora
%packages
-initial-setup
-initial-setup-gui
-libvirt*
-gnome-boxes
%end
%post
# Most of the ARM X accelerated drivers need some level of CMA allocation
sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
%end

View File

@ -1,30 +0,0 @@
%include fedora-arm-base.ks
# server defaults to xfs for / so lets do so on arm also
part / --size=2500 --fstype xfs
%packages
fedora-release-server
# install the default groups for the server environment since installing the environment is not working
@server-product
@standard
@headless-management
@hardware-support
@networkmanager-submodules
@container-management
@domain-client
-initial-setup-gui
-generic-release*
%end
%post
# setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
%end

View File

@ -1,12 +0,0 @@
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-soas-common.ks
part btrfs.007 --fstype="btrfs" --size=3400
btrfs none --label=fedora btrfs.007
btrfs /home --subvol --name=home LABEL=fedora
btrfs / --subvol --name=root LABEL=fedora
%post
%end

View File

@ -1,22 +0,0 @@
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-workstation-common.ks
part btrfs.007 --fstype="btrfs" --size=6200
btrfs none --label=fedora btrfs.007
btrfs /home --subvol --name=home LABEL=fedora
btrfs / --subvol --name=root LABEL=fedora
%packages
-initial-setup
-initial-setup-gui
-libvirt*
-gnome-boxes
%end
%post
# Most of the ARM X accelerated drivers need some level of CMA allocation
sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
%end

View File

@ -1,17 +0,0 @@
%packages
@base-x
@fonts
@input-methods
@multimedia
@printing
epiphany
%end
%post
# Most of the ARM X accelerated drivers need some level of CMA allocation
sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf
# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
%end

View File

@ -1,12 +0,0 @@
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-xfce-common.ks
part btrfs.007 --fstype="btrfs" --size=6000
btrfs none --label=fedora btrfs.007
btrfs /home --subvol --name=home LABEL=fedora
btrfs / --subvol --name=root LABEL=fedora
%post
%end

View File

@ -74,8 +74,6 @@ releasever=$(rpm --eval '%{fedora}')
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "Packages within this disk image" echo "Packages within this disk image"
rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn 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*
# remove random seed, the newly installed instance should make it's own # remove random seed, the newly installed instance should make it's own
rm -f /var/lib/systemd/random-seed rm -f /var/lib/systemd/random-seed
@ -85,12 +83,11 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
dnf -y remove dracut-config-generic dnf -y remove dracut-config-generic
# Disable network service here, as doing it in the services line
# fails due to RHBZ #1369794
/sbin/chkconfig network off
# Remove machine-id on pre generated images # Remove machine-id on pre generated images
rm -f /etc/machine-id rm -f /etc/machine-id
touch /etc/machine-id touch /etc/machine-id
# Note that running rpm recreates the rpm db files which aren't needed or wanted
rm -f /var/lib/rpm/__db*
%end %end

View File

@ -2,16 +2,4 @@
%include fedora-disk-xbase.ks %include fedora-disk-xbase.ks
%include fedora-kde-common.ks %include fedora-kde-common.ks
bootloader --append="cma=256MB"
services --enabled=sshd,NetworkManager,chronyd
autopart --type=btrfs --noswap autopart --type=btrfs --noswap
%packages
%end
%post
%end

View File

@ -0,0 +1,20 @@
# Maintained by the Fedora Python SIG:
# http://fedoraproject.org/wiki/SIGs/Python
# mailto:python-devel@lists.fedoraproject.org
# The Workstion based Python Classroom Lab
%include fedora-disk-base.ks
%include fedora-disk-xbase.ks
%include fedora-workstation-common.ks
%include fedora-python-classroom-gnome-common.ks
autopart --type=btrfs --noswap
%packages
-initial-setup
-initial-setup-gui
-libvirt*
-gnome-boxes
%end

5
fedora-disk-soas.ks Normal file
View File

@ -0,0 +1,5 @@
%include fedora-disk-base.ks
%include fedora-disk-xbase.ks
%include fedora-soas-common.ks
autopart --type=btrfs --noswap

View File

@ -2,10 +2,6 @@
%include fedora-disk-xbase.ks %include fedora-disk-xbase.ks
%include fedora-workstation-common.ks %include fedora-workstation-common.ks
bootloader --append="cma=256MB"
services --enabled=sshd,NetworkManager,chronyd
autopart --type=btrfs --noswap autopart --type=btrfs --noswap
%packages %packages
@ -13,7 +9,3 @@ autopart --type=btrfs --noswap
-initial-setup-gui -initial-setup-gui
%end %end
%post
%end

View File

@ -2,16 +2,4 @@
%include fedora-disk-xbase.ks %include fedora-disk-xbase.ks
%include fedora-xfce-common.ks %include fedora-xfce-common.ks
bootloader --append="cma=192MB"
services --enabled=sshd,NetworkManager,chronyd
autopart --type=btrfs --noswap autopart --type=btrfs --noswap
%packages
%end
%post
%end

View File

@ -4,7 +4,8 @@
# - A Sugar environment that you can carry in your pocket # - A Sugar environment that you can carry in your pocket
# #
# Maintainers: # Maintainers:
# - Peter Robinson <pbrobinson AT gmail DOT com> # - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
# - Alex Perez <aperez AT alexperez DOT com>
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks

View File

@ -4,7 +4,8 @@
# - A Sugar environment that you can carry in your pocket # - A Sugar environment that you can carry in your pocket
# #
# Maintainers: # Maintainers:
# - Peter Robinson <pbrobinson AT gmail DOT com> # - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
# - Alex Perez <aperez AT alexperez DOT com>
firewall --enabled --service=mdns,presence firewall --enabled --service=mdns,presence
@ -104,6 +105,7 @@ show-logout=false
[org.sugarlabs.power] [org.sugarlabs.power]
automatic=true automatic=true
EOF EOF
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
%end %end