From 702ce7ddfd1382ca5c3c6c8991767caa35688765 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 18 Feb 2021 17:59:24 +0000 Subject: [PATCH] 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 --- fedora-arm-base.ks | 76 --------------------------------- fedora-arm-kde.ks | 12 ------ fedora-arm-lxde.ks | 12 ------ fedora-arm-lxqt.ks | 17 -------- fedora-arm-mate.ks | 12 ------ fedora-arm-minimal.ks | 4 -- fedora-arm-python-classroom.ks | 30 ------------- fedora-arm-server.ks | 30 ------------- fedora-arm-soas.ks | 12 ------ fedora-arm-workstation.ks | 22 ---------- fedora-arm-xbase.ks | 17 -------- fedora-arm-xfce.ks | 12 ------ fedora-disk-base.ks | 9 ++-- fedora-disk-kde.ks | 12 ------ fedora-disk-python-classroom.ks | 20 +++++++++ fedora-disk-soas.ks | 5 +++ fedora-disk-workstation.ks | 8 ---- fedora-disk-xfce.ks | 12 ------ fedora-live-soas.ks | 3 +- fedora-soas-common.ks | 4 +- 20 files changed, 33 insertions(+), 296 deletions(-) delete mode 100644 fedora-arm-base.ks delete mode 100644 fedora-arm-kde.ks delete mode 100644 fedora-arm-lxde.ks delete mode 100644 fedora-arm-lxqt.ks delete mode 100644 fedora-arm-mate.ks delete mode 100644 fedora-arm-minimal.ks delete mode 100644 fedora-arm-python-classroom.ks delete mode 100644 fedora-arm-server.ks delete mode 100644 fedora-arm-soas.ks delete mode 100644 fedora-arm-workstation.ks delete mode 100644 fedora-arm-xbase.ks delete mode 100644 fedora-arm-xfce.ks create mode 100644 fedora-disk-python-classroom.ks create mode 100644 fedora-disk-soas.ks diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks deleted file mode 100644 index f499fe7..0000000 --- a/fedora-arm-base.ks +++ /dev/null @@ -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 diff --git a/fedora-arm-kde.ks b/fedora-arm-kde.ks deleted file mode 100644 index 3114a76..0000000 --- a/fedora-arm-kde.ks +++ /dev/null @@ -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 diff --git a/fedora-arm-lxde.ks b/fedora-arm-lxde.ks deleted file mode 100644 index 5cc17b1..0000000 --- a/fedora-arm-lxde.ks +++ /dev/null @@ -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 diff --git a/fedora-arm-lxqt.ks b/fedora-arm-lxqt.ks deleted file mode 100644 index 78f206c..0000000 --- a/fedora-arm-lxqt.ks +++ /dev/null @@ -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 diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks deleted file mode 100644 index c174bd7..0000000 --- a/fedora-arm-mate.ks +++ /dev/null @@ -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 diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks deleted file mode 100644 index d09423e..0000000 --- a/fedora-arm-minimal.ks +++ /dev/null @@ -1,4 +0,0 @@ -%include fedora-arm-base.ks -%include fedora-minimal-common.ks - -part / --size=1600 --fstype ext4 diff --git a/fedora-arm-python-classroom.ks b/fedora-arm-python-classroom.ks deleted file mode 100644 index 102bc0d..0000000 --- a/fedora-arm-python-classroom.ks +++ /dev/null @@ -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 - diff --git a/fedora-arm-server.ks b/fedora-arm-server.ks deleted file mode 100644 index c2c1ad1..0000000 --- a/fedora-arm-server.ks +++ /dev/null @@ -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 - diff --git a/fedora-arm-soas.ks b/fedora-arm-soas.ks deleted file mode 100644 index 0f5e466..0000000 --- a/fedora-arm-soas.ks +++ /dev/null @@ -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 diff --git a/fedora-arm-workstation.ks b/fedora-arm-workstation.ks deleted file mode 100644 index 31b95f5..0000000 --- a/fedora-arm-workstation.ks +++ /dev/null @@ -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 diff --git a/fedora-arm-xbase.ks b/fedora-arm-xbase.ks deleted file mode 100644 index ccd5875..0000000 --- a/fedora-arm-xbase.ks +++ /dev/null @@ -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 diff --git a/fedora-arm-xfce.ks b/fedora-arm-xfce.ks deleted file mode 100644 index 51fea46..0000000 --- a/fedora-arm-xfce.ks +++ /dev/null @@ -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 diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks index 5d78e8b..df003c5 100644 --- a/fedora-disk-base.ks +++ b/fedora-disk-base.ks @@ -74,8 +74,6 @@ releasever=$(rpm --eval '%{fedora}') rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary echo "Packages within this 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 @@ -85,12 +83,11 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0 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 rm -f /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 diff --git a/fedora-disk-kde.ks b/fedora-disk-kde.ks index 127e6be..2a71fca 100644 --- a/fedora-disk-kde.ks +++ b/fedora-disk-kde.ks @@ -2,16 +2,4 @@ %include fedora-disk-xbase.ks %include fedora-kde-common.ks -bootloader --append="cma=256MB" - -services --enabled=sshd,NetworkManager,chronyd - autopart --type=btrfs --noswap - -%packages - -%end - -%post - -%end diff --git a/fedora-disk-python-classroom.ks b/fedora-disk-python-classroom.ks new file mode 100644 index 0000000..2348827 --- /dev/null +++ b/fedora-disk-python-classroom.ks @@ -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 diff --git a/fedora-disk-soas.ks b/fedora-disk-soas.ks new file mode 100644 index 0000000..cd7139a --- /dev/null +++ b/fedora-disk-soas.ks @@ -0,0 +1,5 @@ +%include fedora-disk-base.ks +%include fedora-disk-xbase.ks +%include fedora-soas-common.ks + +autopart --type=btrfs --noswap diff --git a/fedora-disk-workstation.ks b/fedora-disk-workstation.ks index f61316c..b7805f0 100644 --- a/fedora-disk-workstation.ks +++ b/fedora-disk-workstation.ks @@ -2,10 +2,6 @@ %include fedora-disk-xbase.ks %include fedora-workstation-common.ks -bootloader --append="cma=256MB" - -services --enabled=sshd,NetworkManager,chronyd - autopart --type=btrfs --noswap %packages @@ -13,7 +9,3 @@ autopart --type=btrfs --noswap -initial-setup-gui %end - -%post - -%end diff --git a/fedora-disk-xfce.ks b/fedora-disk-xfce.ks index 4a3b616..1a3a7b5 100644 --- a/fedora-disk-xfce.ks +++ b/fedora-disk-xfce.ks @@ -2,16 +2,4 @@ %include fedora-disk-xbase.ks %include fedora-xfce-common.ks -bootloader --append="cma=192MB" - -services --enabled=sshd,NetworkManager,chronyd - autopart --type=btrfs --noswap - -%packages - -%end - -%post - -%end diff --git a/fedora-live-soas.ks b/fedora-live-soas.ks index 880a529..c3f3d81 100644 --- a/fedora-live-soas.ks +++ b/fedora-live-soas.ks @@ -4,7 +4,8 @@ # - A Sugar environment that you can carry in your pocket # # Maintainers: -# - Peter Robinson +# - Chihurumnaya Ibiam +# - Alex Perez %include fedora-live-base.ks %include fedora-live-minimization.ks diff --git a/fedora-soas-common.ks b/fedora-soas-common.ks index 822216c..18f4099 100644 --- a/fedora-soas-common.ks +++ b/fedora-soas-common.ks @@ -4,7 +4,8 @@ # - A Sugar environment that you can carry in your pocket # # Maintainers: -# - Peter Robinson +# - Chihurumnaya Ibiam +# - Alex Perez firewall --enabled --service=mdns,presence @@ -104,6 +105,7 @@ show-logout=false [org.sugarlabs.power] automatic=true EOF + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas %end