Merge remote-tracking branch 'cs/c9s' into eln

.gitignore

@@ -1 +1,2 @@
 /lorax-templates-rhel-10.0-1.tar.gz
+/lorax-templates-rhel-10.0-2.tar.gz

80-rhel/runtime-cleanup.tmpl

@@ -1,5 +1,5 @@
 ## lorax template file: cleanup for the ramdisk (runtime image)
-<%page args="libdir, product, root"/>
+<%page args="libdir, branding, root"/>
 
 ## remove the sources
 remove usr/share/i18n
@@ -14,7 +14,6 @@ removepkg flac gstreamer-tools libsndfile pulseaudio* sound-theme-freedesktop
 ## we don't create new initramfs/bootloader conf inside anaconda
 ## (that happens inside the target system after we install dracut/grubby)
 removepkg dracut-network grubby anaconda-dracut
-removefrom ${product.name}-logos /usr/share/plymouth/*
 ## In order to execute the /usr move on upgrades we need convertfs from dracut
 ## We also need dracut-shutdown.service and dracut-initramfs-restore to reboot
 removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \
@@ -114,7 +113,6 @@ removefrom gtk2-engines --allbut /usr/${libdir}/*/libclearlooks.so \
                                  /usr/share/themes/Clearlooks/*
 removefrom gtk3 /usr/${libdir}/gtk-3.0/*/printbackends/*
 removefrom gtk3 /usr/share/themes/*
-removefrom metacity --allbut /usr/bin/* /usr/${libdir}/* /etc/*
 
 ## filesystem tools
 removefrom e2fsprogs /usr/share/locale/*
@@ -185,7 +183,6 @@ removefrom gawk /usr/bin/{igawk,pgawk} /usr/libexec/* /usr/share/*
 removefrom gdb /usr/share/* /usr/include/* /etc/gdbinit*
 removefrom gdisk /usr/share/*
 removefrom gdk-pixbuf2 /usr/share/locale*
-removefrom gfs2-utils /usr/sbin/*
 removefrom glib2 /etc/* /usr/bin/* /usr/share/locale/*
 removefrom glibc /etc/gai.conf /etc/localtime /etc/rpc
 removefrom glibc /lib/*/nosegneg/* /${libdir}/libBrokenLocale*
@@ -325,9 +322,13 @@ removefrom xorg-x11-drv-wacom /usr/bin/*
 removefrom xorg-x11-fonts-misc --allbut /usr/share/X11/fonts/misc/{6x13,encodings,fonts,*cursor}*
 removefrom xorg-x11-server-utils --allbut /usr/bin/xrandr /usr/share/X11/rgb.txt /usr/bin/xrdb
 removefrom yum /etc/* /usr/share/locale/* /usr/share/yum-cli/*
-removefrom ${product.name}-logos /etc/*
-removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/*
-removefrom ${product.name}-logos /usr/share/{firstboot,gnome-screensaver,kde4,pixmaps}/*
+
+%if branding.release:
+    removefrom ${branding.logos} /usr/share/plymouth/*
+    removefrom ${branding.logos} /etc/*
+    removefrom ${branding.logos} /usr/share/icons/{Bluecurve,oxygen}/*
+    removefrom ${branding.logos} /usr/share/{firstboot,gnome-screensaver,kde4,pixmaps}/*
+%endif
 
 ## cleanup_python_files()
 runcmd find ${root} -name "*.pyo" -type f -delete
@@ -360,5 +361,5 @@ removepkg geoclue2
 removepkg cdparanoia-libs opus libtheora libvisual flac-libs gsm avahi-glib avahi-libs \
           ModemManager-glib
 
-## metacity requires libvorbis and libvorbisfile, but enc/dec are no longer needed
+## gnome-kiosk dependencies require libvorbis and libvorbisfile, but enc/dec are no longer needed
 removefrom libvorbis --allbut /usr/${libdir}/libvorbisfile.* /usr/${libdir}/libvorbis.*

80-rhel/runtime-install.tmpl

@@ -88,13 +88,14 @@ installpkg rsyslog
 %if basearch != "s390x":
 installpkg xorg-x11-drivers xorg-x11-server-Xorg
 %endif
-installpkg xorg-x11-server-utils xorg-x11-xauth
-installpkg dbus-x11 metacity gsettings-desktop-schemas
+installpkg xorg-x11-xauth
+installpkg dbus-x11 gsettings-desktop-schemas
 installpkg nm-connection-editor
 installpkg librsvg2
+installpkg gnome-kiosk
 
 ## filesystem tools
-installpkg xfsprogs gfs2-utils
+installpkg xfsprogs
 installpkg device-mapper-persistent-data
 installpkg xfsdump
 installpkg libblockdev-plugins-all libblockdev
@@ -122,7 +123,8 @@ installpkg tigervnc-server-module
 installpkg net-tools
 # TODO: uncomment
 # installpkg nmap-ncat
-# installpkg prefixdevname
+installpkg prefixdevname
+installpkg ipcalc
 
 ## hardware utilities/libraries
 installpkg pciutils usbutils ipmitool

SERIAL

@@ -1 +1 @@
-1
+2

lorax-templates-rhel.spec

@@ -1,6 +1,6 @@
 Name:           lorax-templates-rhel
 Version:        10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RHEL build templates for lorax and livemedia-creator
 
 License:        GPLv2+
@@ -10,7 +10,10 @@ BuildArch:      noarch
 # This tarball is generated from the contents of this dist-git repository
 # by running the command `make tar`.
 # See README for full details of how to update this package
-Source0:        lorax-templates-rhel-10.0-1.tar.gz
+Source0:        lorax-templates-rhel-10.0-2.tar.gz
+
+# Required for the template branding support
+Requires:       lorax >= 34.9.1
 
 # Where are these supposed to end up?
 %define templatedir %{_datadir}/lorax/templates.d/80-rhel
@@ -26,6 +29,7 @@ placed in %{templatedir}
 # nothing to build
 
 %install
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{templatedir}
 cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 
@@ -34,6 +38,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Wed Jul 14 2021 Stephen Gallagher <sgallagh@redhat.com> - 10.0-2
+- Re-sync from CentOS Stream 9
+
 * Mon May 10 2021 Stephen Gallagher <sgallagh@redhat.com> - 10.0-1
 - First release of lorax-templates-rhel for ELN
 

sources

@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-10.0-1.tar.gz) = 7be5bbb59913c985aefc4dadc8375cb740d161fa326f1fd047415fa5300e770331235366d96fd1dc11db620bacb2550b3c5ef1bb03564585dec64fdb6cbc122d
+SHA512 (lorax-templates-rhel-10.0-2.tar.gz) = e46f8e1a4222eef66bf630324c26d9fe3da1b80147ebda876ae83a3f513604f35ae6c49f40ee484d070f7820335cc716fc2ad7682205bb1629454c6bffa7b3b0