From b86eac9aeb9728ec9cbbfea766ae3aa7a880c8b1 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Sun, 20 Nov 2022 10:28:23 -0700 Subject: [PATCH] try to fix mate for aarch64 --- .../aarch64/peridot/rocky-live-mate-common.ks | 135 ++++++++++++++++ live/9/aarch64/peridot/rocky-live-mate.ks | 63 ++++++++ live/9/aarch64/prod/rocky-live-mate-common.ks | 135 ++++++++++++++++ live/9/aarch64/prod/rocky-live-mate.ks | 63 ++++++++ .../9/aarch64/stage/rocky-live-mate-common.ks | 150 +++++++++++++----- live/9/aarch64/stage/rocky-live-mate.ks | 37 +++-- 6 files changed, 534 insertions(+), 49 deletions(-) create mode 100644 live/9/aarch64/peridot/rocky-live-mate-common.ks create mode 100644 live/9/aarch64/peridot/rocky-live-mate.ks create mode 100644 live/9/aarch64/prod/rocky-live-mate-common.ks create mode 100644 live/9/aarch64/prod/rocky-live-mate.ks diff --git a/live/9/aarch64/peridot/rocky-live-mate-common.ks b/live/9/aarch64/peridot/rocky-live-mate-common.ks new file mode 100644 index 0000000..1a433c5 --- /dev/null +++ b/live/9/aarch64/peridot/rocky-live-mate-common.ks @@ -0,0 +1,135 @@ +# mate +%packages +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-mate +f36-backgrounds-extras-mate + +NetworkManager-adsl +NetworkManager-bluetooth +NetworkManager-l2tp-gnome +NetworkManager-libreswan-gnome +NetworkManager-openconnect-gnome +NetworkManager-openvpn-gnome +NetworkManager-ovs +NetworkManager-ppp +NetworkManager-pptp-gnome +NetworkManager-team +NetworkManager-wifi +NetworkManager-wwan +atril +atril-caja +atril-thumbnailer +caja +caja-actions +dconf-editor +engrampa +eom +filezilla +firewall-config +gnome-disk-utility +gnome-epub-thumbnailer +gnome-logs +gnome-themes-extra +gparted +gstreamer1-plugins-ugly-free +gtk2-engines +gucharmap +gvfs-fuse +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +initial-setup-gui +libmatekbd +libmatemixer +libmateweather +libsecret +lightdm +lm_sensors +marco +mate-applets +mate-backgrounds +mate-calc +mate-control-center +mate-desktop +mate-dictionary +mate-disk-usage-analyzer +mate-icon-theme +mate-media +mate-menus +mate-menus-preferences-category-menu +mate-notification-daemon +mate-panel +mate-polkit +mate-power-manager +mate-screensaver +mate-screenshot +mate-search-tool +mate-session-manager +mate-settings-daemon +mate-system-log +mate-system-monitor +mate-terminal +mate-themes +mate-user-admin +mate-user-guide +mozo +network-manager-applet +nm-connection-editor +orca +p7zip +p7zip-plugins +parole +pavucontrol +pipewire-alsa +pipewire-pulseaudio +pluma +seahorse +seahorse-caja +setroubleshoot +slick-greeter-mate +usermode-gtk +vim-enhanced +wireplumber +xdg-user-dirs-gtk +xmodmap +xrdb +yelp + +firewall-applet +mate-menu +mate-sensors-applet +mate-utils +pluma-plugins +tigervnc + +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer + +-@3d-printing +-@admin-tools +-brasero +-fedora-icon-theme +-gnome-icon-theme +-gnome-icon-theme-symbolic +-gnome-logs +-gnome-software +-gnome-user-docs +-gnome-user-docs +-evolution-help +-telnet +-audacious +-systemd-oomd-defaults + +-xsane +-xane-gimp +-sane-backends +-mpage +-hplip +-isdn4k-utils +%end diff --git a/live/9/aarch64/peridot/rocky-live-mate.ks b/live/9/aarch64/peridot/rocky-live-mate.ks new file mode 100644 index 0000000..4b9edcb --- /dev/null +++ b/live/9/aarch64/peridot/rocky-live-mate.ks @@ -0,0 +1,63 @@ +# rocky-live-kde.ks +# BROKEN + +%include rocky-live-base-spin.ks +%include rocky-live-mate-common.ks + +part / --size 7168 + +%post +# mate configuration + +cat >> /etc/rc.d/init.d/livesys << EOF +# make the installer show up +if [ -f /usr/share/applications/liveinst.desktop ]; then + # Show harddisk install in shell dash + sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" +fi +mkdir /home/liveuser/Desktop +cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop +chmod +x /home/liveuser/Desktop/liveinst.desktop + +# move to anaconda - probably not required for MATE. +mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop + +if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then + mkdir -p ~liveuser/.config/autostart + cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ + cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ +fi + +# rebuild schema cache with any overrides we installed +glib-compile-schemas /usr/share/glib-2.0/schemas + +# set up lightdm autologin +sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf +sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf +sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf + +# set MATE as default session, otherwise login will fail +sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf + +# Turn off PackageKit-command-not-found while uninstalled +if [ -f /etc/PackageKit/CommandNotFound.conf ]; then + sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf +fi + +# The updater applet might or might not exist +rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop + +# reset selinux contexts +chown -R liveuser:liveuser /home/liveuser/ +restorecon -R /home/liveuser/ +#restorecon -R / + +EOF + +# this doesn't come up automatically. not sure why. +systemctl enable --force lightdm.service + +# CRB needs to be enabled for EPEL to function. +dnf config-manager --set-enabled crb + +%end diff --git a/live/9/aarch64/prod/rocky-live-mate-common.ks b/live/9/aarch64/prod/rocky-live-mate-common.ks new file mode 100644 index 0000000..1a433c5 --- /dev/null +++ b/live/9/aarch64/prod/rocky-live-mate-common.ks @@ -0,0 +1,135 @@ +# mate +%packages +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-mate +f36-backgrounds-extras-mate + +NetworkManager-adsl +NetworkManager-bluetooth +NetworkManager-l2tp-gnome +NetworkManager-libreswan-gnome +NetworkManager-openconnect-gnome +NetworkManager-openvpn-gnome +NetworkManager-ovs +NetworkManager-ppp +NetworkManager-pptp-gnome +NetworkManager-team +NetworkManager-wifi +NetworkManager-wwan +atril +atril-caja +atril-thumbnailer +caja +caja-actions +dconf-editor +engrampa +eom +filezilla +firewall-config +gnome-disk-utility +gnome-epub-thumbnailer +gnome-logs +gnome-themes-extra +gparted +gstreamer1-plugins-ugly-free +gtk2-engines +gucharmap +gvfs-fuse +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +initial-setup-gui +libmatekbd +libmatemixer +libmateweather +libsecret +lightdm +lm_sensors +marco +mate-applets +mate-backgrounds +mate-calc +mate-control-center +mate-desktop +mate-dictionary +mate-disk-usage-analyzer +mate-icon-theme +mate-media +mate-menus +mate-menus-preferences-category-menu +mate-notification-daemon +mate-panel +mate-polkit +mate-power-manager +mate-screensaver +mate-screenshot +mate-search-tool +mate-session-manager +mate-settings-daemon +mate-system-log +mate-system-monitor +mate-terminal +mate-themes +mate-user-admin +mate-user-guide +mozo +network-manager-applet +nm-connection-editor +orca +p7zip +p7zip-plugins +parole +pavucontrol +pipewire-alsa +pipewire-pulseaudio +pluma +seahorse +seahorse-caja +setroubleshoot +slick-greeter-mate +usermode-gtk +vim-enhanced +wireplumber +xdg-user-dirs-gtk +xmodmap +xrdb +yelp + +firewall-applet +mate-menu +mate-sensors-applet +mate-utils +pluma-plugins +tigervnc + +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer + +-@3d-printing +-@admin-tools +-brasero +-fedora-icon-theme +-gnome-icon-theme +-gnome-icon-theme-symbolic +-gnome-logs +-gnome-software +-gnome-user-docs +-gnome-user-docs +-evolution-help +-telnet +-audacious +-systemd-oomd-defaults + +-xsane +-xane-gimp +-sane-backends +-mpage +-hplip +-isdn4k-utils +%end diff --git a/live/9/aarch64/prod/rocky-live-mate.ks b/live/9/aarch64/prod/rocky-live-mate.ks new file mode 100644 index 0000000..4b9edcb --- /dev/null +++ b/live/9/aarch64/prod/rocky-live-mate.ks @@ -0,0 +1,63 @@ +# rocky-live-kde.ks +# BROKEN + +%include rocky-live-base-spin.ks +%include rocky-live-mate-common.ks + +part / --size 7168 + +%post +# mate configuration + +cat >> /etc/rc.d/init.d/livesys << EOF +# make the installer show up +if [ -f /usr/share/applications/liveinst.desktop ]; then + # Show harddisk install in shell dash + sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" +fi +mkdir /home/liveuser/Desktop +cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop +chmod +x /home/liveuser/Desktop/liveinst.desktop + +# move to anaconda - probably not required for MATE. +mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop + +if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then + mkdir -p ~liveuser/.config/autostart + cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ + cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ +fi + +# rebuild schema cache with any overrides we installed +glib-compile-schemas /usr/share/glib-2.0/schemas + +# set up lightdm autologin +sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf +sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf +sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf + +# set MATE as default session, otherwise login will fail +sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf + +# Turn off PackageKit-command-not-found while uninstalled +if [ -f /etc/PackageKit/CommandNotFound.conf ]; then + sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf +fi + +# The updater applet might or might not exist +rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop + +# reset selinux contexts +chown -R liveuser:liveuser /home/liveuser/ +restorecon -R /home/liveuser/ +#restorecon -R / + +EOF + +# this doesn't come up automatically. not sure why. +systemctl enable --force lightdm.service + +# CRB needs to be enabled for EPEL to function. +dnf config-manager --set-enabled crb + +%end diff --git a/live/9/aarch64/stage/rocky-live-mate-common.ks b/live/9/aarch64/stage/rocky-live-mate-common.ks index cfc4012..1a433c5 100644 --- a/live/9/aarch64/stage/rocky-live-mate-common.ks +++ b/live/9/aarch64/stage/rocky-live-mate-common.ks @@ -1,44 +1,116 @@ -# inherited from Fedora kickstarts F35 with minor changes - +# mate %packages -# install env-group to resolve RhBug:1891500 -@^mate-desktop-environment +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-mate +f36-backgrounds-extras-mate -compiz -compiz-plugins-main -compiz-plugins-extra -compiz-manager -compizconfig-python -compiz-plugins-experimental -libcompizconfig -compiz-plugins-main -ccsm -simple-ccsm -emerald-themes -emerald -fusion-icon +NetworkManager-adsl +NetworkManager-bluetooth +NetworkManager-l2tp-gnome +NetworkManager-libreswan-gnome +NetworkManager-openconnect-gnome +NetworkManager-openvpn-gnome +NetworkManager-ovs +NetworkManager-ppp +NetworkManager-pptp-gnome +NetworkManager-team +NetworkManager-wifi +NetworkManager-wwan +atril +atril-caja +atril-thumbnailer +caja +caja-actions +dconf-editor +engrampa +eom +filezilla +firewall-config +gnome-disk-utility +gnome-epub-thumbnailer +gnome-logs +gnome-themes-extra +gparted +gstreamer1-plugins-ugly-free +gtk2-engines +gucharmap +gvfs-fuse +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +initial-setup-gui +libmatekbd +libmatemixer +libmateweather +libsecret +lightdm +lm_sensors +marco +mate-applets +mate-backgrounds +mate-calc +mate-control-center +mate-desktop +mate-dictionary +mate-disk-usage-analyzer +mate-icon-theme +mate-media +mate-menus +mate-menus-preferences-category-menu +mate-notification-daemon +mate-panel +mate-polkit +mate-power-manager +mate-screensaver +mate-screenshot +mate-search-tool +mate-session-manager +mate-settings-daemon +mate-system-log +mate-system-monitor +mate-terminal +mate-themes +mate-user-admin +mate-user-guide +mozo +network-manager-applet +nm-connection-editor +orca +p7zip +p7zip-plugins +parole +pavucontrol +pipewire-alsa +pipewire-pulseaudio +pluma +seahorse +seahorse-caja +setroubleshoot +slick-greeter-mate +usermode-gtk +vim-enhanced +wireplumber +xdg-user-dirs-gtk +xmodmap +xrdb +yelp -# blacklist applications which breaks mate-desktop --audacious +firewall-applet +mate-menu +mate-sensors-applet +mate-utils +pluma-plugins +tigervnc -# see https://bugzilla.redhat.com/show_bug.cgi?id=2068699 -# and https://bugzilla.redhat.com/show_bug.cgi?id=1933494 -# use earlyoom instead of systemd-oomd-defaults -#earlyoom -#-systemd-oomd-defaults - -# libreoffice libreoffice-calc -#libreoffice-emailmerge +libreoffice-emailmerge libreoffice-graphicfilter libreoffice-impress libreoffice-writer -# FIXME; apparently the glibc maintainers dislike this, but it got put into the -# desktop image at some point. We won't touch this one for now. -nss-mdns - -# Drop things for size -@3d-printing -@admin-tools -brasero @@ -48,14 +120,16 @@ nss-mdns -gnome-logs -gnome-software -gnome-user-docs - --@mate-applications - -# Help and art can be big, too -gnome-user-docs -evolution-help - -# Legacy cmdline things we don't want -telnet +-audacious +-systemd-oomd-defaults +-xsane +-xane-gimp +-sane-backends +-mpage +-hplip +-isdn4k-utils %end diff --git a/live/9/aarch64/stage/rocky-live-mate.ks b/live/9/aarch64/stage/rocky-live-mate.ks index 735aae8..4b9edcb 100644 --- a/live/9/aarch64/stage/rocky-live-mate.ks +++ b/live/9/aarch64/stage/rocky-live-mate.ks @@ -1,15 +1,15 @@ -# inherited from Fedora kickstarts F35 +# rocky-live-kde.ks +# BROKEN -%include rocky-live-base.ks +%include rocky-live-base-spin.ks %include rocky-live-mate-common.ks -%include rocky-live-minimization.ks -part / --size 8192 +part / --size 7168 %post +# mate configuration + cat >> /etc/rc.d/init.d/livesys << EOF - - # make the installer show up if [ -f /usr/share/applications/liveinst.desktop ]; then # Show harddisk install in shell dash @@ -17,17 +17,24 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then fi mkdir /home/liveuser/Desktop cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop - -# and mark it as executable chmod +x /home/liveuser/Desktop/liveinst.desktop +# move to anaconda - probably not required for MATE. +mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop + +if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then + mkdir -p ~liveuser/.config/autostart + cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ + cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ +fi + # rebuild schema cache with any overrides we installed glib-compile-schemas /usr/share/glib-2.0/schemas # set up lightdm autologin sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf -#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf +sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf # set MATE as default session, otherwise login will fail sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf @@ -37,12 +44,20 @@ if [ -f /etc/PackageKit/CommandNotFound.conf ]; then sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf fi -# no updater applet in live environment +# The updater applet might or might not exist rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop -# make sure to set the right permissions and selinux contexts +# reset selinux contexts chown -R liveuser:liveuser /home/liveuser/ restorecon -R /home/liveuser/ +#restorecon -R / + EOF +# this doesn't come up automatically. not sure why. +systemctl enable --force lightdm.service + +# CRB needs to be enabled for EPEL to function. +dnf config-manager --set-enabled crb + %end