From 23149dde487c1791e30d5315398fd861f16dc631 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 10 Dec 2024 12:21:43 +0300 Subject: [PATCH] Update to 10.0-55 --- .gitignore | 56 ++++++++++++++++++++++++++++++-- 80-rhel/aarch64.tmpl | 2 +- 80-rhel/ppc64le.tmpl | 2 +- 80-rhel/runtime-cleanup.tmpl | 12 +++---- 80-rhel/runtime-postinstall.tmpl | 7 ---- 80-rhel/s390.tmpl | 2 +- 80-rhel/x86.tmpl | 2 +- 80-rhel/x86_v2.tmpl | 2 +- SERIAL | 2 +- lorax-templates-almalinux.spec | 7 ++-- sources | 2 +- 11 files changed, 72 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 74383c5..29b083b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,54 @@ -SOURCES/lorax-templates-rhel-9.0-33.tar.gz -lorax-templates-rhel-10.0-52.tar.gz +clog-spec +clog +/lorax-templates-rhel-10.0-1.tar.gz +/lorax-templates-rhel-10.0-2.tar.gz +/lorax-templates-rhel-10.0-3.tar.gz +/lorax-templates-rhel-10.0-4.tar.gz +/lorax-templates-rhel-10.0-5.tar.gz +/lorax-templates-rhel-10.0-6.tar.gz +/lorax-templates-rhel-10.0-7.tar.gz +/lorax-templates-rhel-10.0-8.tar.gz +/lorax-templates-rhel-10.0-9.tar.gz +/lorax-templates-rhel-10.0-10.tar.gz +/lorax-templates-rhel-10.0-11.tar.gz +/lorax-templates-rhel-10.0-12.tar.gz +/lorax-templates-rhel-10.0-13.tar.gz +/lorax-templates-rhel-10.0-14.tar.gz +/lorax-templates-rhel-10.0-15.tar.gz +/lorax-templates-rhel-10.0-16.tar.gz +/lorax-templates-rhel-10.0-17.tar.gz +/lorax-templates-rhel-10.0-18.tar.gz +/lorax-templates-rhel-10.0-19.tar.gz +/lorax-templates-rhel-10.0-20.tar.gz +/lorax-templates-rhel-10.0-21.tar.gz +/lorax-templates-rhel-10.0-22.tar.gz +/lorax-templates-rhel-10.0-23.tar.gz +/lorax-templates-rhel-10.0-24.tar.gz +/lorax-templates-rhel-10.0-25.tar.gz +/lorax-templates-rhel-10.0-26.tar.gz +/lorax-templates-rhel-10.0-27.tar.gz +/lorax-templates-rhel-10.0-28.tar.gz +/lorax-templates-rhel-10.0-29.tar.gz +/lorax-templates-rhel-10.0-30.tar.gz +/lorax-templates-rhel-10.0-31.tar.gz +/lorax-templates-rhel-10.0-32.tar.gz +/lorax-templates-rhel-10.0-33.tar.gz +/lorax-templates-rhel-10.0-34.tar.gz +/lorax-templates-rhel-10.0-35.tar.gz +/lorax-templates-rhel-10.0-36.tar.gz +/lorax-templates-rhel-10.0-37.tar.gz +/lorax-templates-rhel-10.0-38.tar.gz +/lorax-templates-rhel-10.0-39.tar.gz +/lorax-templates-rhel-10.0-40.tar.gz +/lorax-templates-rhel-10.0-41.tar.gz +/lorax-templates-rhel-10.0-43.tar.gz +/lorax-templates-rhel-10.0-44.tar.gz +/lorax-templates-rhel-10.0-45.tar.gz +/lorax-templates-rhel-10.0-46.tar.gz +/lorax-templates-rhel-10.0-47.tar.gz +/lorax-templates-rhel-10.0-49.tar.gz +/lorax-templates-rhel-10.0-50.tar.gz +/lorax-templates-rhel-10.0-51.tar.gz +/lorax-templates-rhel-10.0-52.tar.gz +/lorax-templates-rhel-10.0-53.tar.gz +/lorax-templates-rhel-10.0-55.tar.gz diff --git a/80-rhel/aarch64.tmpl b/80-rhel/aarch64.tmpl index 14099d6..3f301a7 100644 --- a/80-rhel/aarch64.tmpl +++ b/80-rhel/aarch64.tmpl @@ -1,4 +1,4 @@ -<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/> +<%page args="kernels, runtime_img, runtime_base, basearch, libdir, inroot, outroot, product, isolabel"/> <% configdir="tmp/config_files/aarch64" PXEBOOTDIR="images/pxeboot" diff --git a/80-rhel/ppc64le.tmpl b/80-rhel/ppc64le.tmpl index 802ba9d..6d93370 100644 --- a/80-rhel/ppc64le.tmpl +++ b/80-rhel/ppc64le.tmpl @@ -1,4 +1,4 @@ -<%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product, isolabel"/> +<%page args="kernels, runtime_img, runtime_base, basearch, libdir, inroot, outroot, product, isolabel"/> <% configdir="tmp/config_files/ppc" BOOTDIR="ppc" diff --git a/80-rhel/runtime-cleanup.tmpl b/80-rhel/runtime-cleanup.tmpl index cdfbeb3..24d7f22 100644 --- a/80-rhel/runtime-cleanup.tmpl +++ b/80-rhel/runtime-cleanup.tmpl @@ -54,7 +54,7 @@ removepkg lvm2-libs removepkg mobile-broadband-provider-info removepkg rmt rpcbind squashfs-tools removepkg xml-common -removepkg mkfontscale fonttosfnt +removepkg mkfontscale # do not remove this, required for ppc64le and s390x !!! removepkg ncurses @@ -157,17 +157,17 @@ removefrom gdb-headless /usr/share/* /etc/gdbinit* removefrom gdk-pixbuf2 /usr/share/locale* removefrom glib2 /usr/bin/* /usr/share/locale/* removefrom glibc /etc/gai.conf /etc/rpc -removefrom glibc /${libdir}/libBrokenLocale* -removefrom glibc /${libdir}/libanl* -removefrom glibc /${libdir}/libnss_compat* +removefrom glibc */${libdir}/libBrokenLocale* +removefrom glibc */${libdir}/libanl* +removefrom glibc */${libdir}/libnss_compat* # python-pyudev uses ctypes.util.find_library, which uses /sbin/ldconfig -removefrom glibc /usr/libexec/* /usr/sbin/* +removefrom glibc /usr/libexec/* /usr/*bin/iconvconfig removefrom glibc-common /usr/bin/gencat removefrom glibc-common /usr/bin/getent removefrom glibc-common /usr/bin/locale /usr/bin/sprof # NB: we keep /usr/bin/localedef so anaconda can inspect payload locale info removefrom glibc-common /usr/bin/tzselect -removefrom glibc-common /usr/sbin/* +removefrom glibc-common /usr/*bin/zic removefrom gnutls /usr/share/locale/* removefrom google-noto-sans-cjk-fonts /usr/share/fonts/google-noto-sans-cjk-fonts/NotoSansCJK-{Black,Bold,*Light,Medium,Thin}.ttc removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf diff --git a/80-rhel/runtime-postinstall.tmpl b/80-rhel/runtime-postinstall.tmpl index 57e991a..9408c38 100644 --- a/80-rhel/runtime-postinstall.tmpl +++ b/80-rhel/runtime-postinstall.tmpl @@ -64,7 +64,6 @@ install ${configdir}/i18n etc/sysconfig install ${configdir}/rsyslog.conf etc install ${configdir}/bash_history root/.bash_history install ${configdir}/profile root/.profile -install ${configdir}/libuser.conf etc install ${configdir}/sysctl.conf etc/sysctl.d/anaconda.conf install ${configdir}/spice-vdagentd etc/sysconfig mkdir etc/NetworkManager/conf.d @@ -119,12 +118,6 @@ append etc/lvm/lvm.conf "global {\n\tuse_lvmetad = 1\n}\n" remove etc/nvme/hostid remove etc/nvme/hostnqn -## Record the package versions used to create the image -## rpm initializes nss, which requires /dev/urandom to be present, hence the mknod -runcmd chroot ${root} /usr/bin/mknod -m 666 /dev/random c 1 8 -runcmd chroot ${root} /usr/bin/mknod -m 666 /dev/urandom c 1 9 -runcmd chroot ${root} /usr/bin/rpm -qa --pipe "tee /root/lorax-packages.log" - ## TODO: we could run prelink here if we wanted? ## fix fonconfig cache containing timestamps diff --git a/80-rhel/s390.tmpl b/80-rhel/s390.tmpl index a2e9dd4..c664fcc 100644 --- a/80-rhel/s390.tmpl +++ b/80-rhel/s390.tmpl @@ -1,4 +1,4 @@ -<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, product, isolabel"/> +<%page args="kernels, runtime_img, runtime_base, basearch, libdir, inroot, outroot, product, isolabel"/> <% configdir="tmp/config_files/s390" BOOTDIR="images" diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl index 3945ce4..0100832 100644 --- a/80-rhel/x86.tmpl +++ b/80-rhel/x86.tmpl @@ -1,4 +1,4 @@ -<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, product, isolabel"/> +<%page args="kernels, runtime_img, runtime_base, basearch, libdir, inroot, outroot, product, isolabel"/> <% configdir="tmp/config_files/x86" PXEBOOTDIR="images/pxeboot" diff --git a/80-rhel/x86_v2.tmpl b/80-rhel/x86_v2.tmpl index 8b7e12b..3d1908c 100644 --- a/80-rhel/x86_v2.tmpl +++ b/80-rhel/x86_v2.tmpl @@ -1,4 +1,4 @@ -<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, product, isolabel"/> +<%page args="kernels, runtime_img, runtime_base, basearch, libdir, inroot, outroot, product, isolabel"/> <% configdir="tmp/config_files/x86" PXEBOOTDIR="images/pxeboot" diff --git a/SERIAL b/SERIAL index 0691f67..c3f407c 100644 --- a/SERIAL +++ b/SERIAL @@ -1 +1 @@ -52 +55 diff --git a/lorax-templates-almalinux.spec b/lorax-templates-almalinux.spec index 034bcd5..2c89bba 100644 --- a/lorax-templates-almalinux.spec +++ b/lorax-templates-almalinux.spec @@ -1,6 +1,6 @@ Name: lorax-templates-almalinux Version: 10.0 -Release: 52%{?dist}.alma.1 +Release: 55%{?dist}.alma.1 Summary: AlmaLinux 10 build templates for lorax and livemedia-creator License: GPLv2+ @@ -10,7 +10,7 @@ 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-52.tar.gz +Source0: lorax-templates-rhel-10.0-55.tar.gz # Required for the template branding support Requires: lorax >= 34.9.1 @@ -44,6 +44,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Tue Dec 10 2024 Eduard Abdullin - 10.0-55.alma.1 +- Update to 10.0-55 + * Fri Sep 13 2024 Eduard Abdullin - 10.0-52.alma.1 - Add configuration for AlmaLinux 10 x86_64_v2 diff --git a/sources b/sources index 96f0e60..62c1761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-templates-rhel-10.0-52.tar.gz) = ee4c5f6d4750b5ac4fb9c1e99f32aac4c7b7e85c4735551c4ce3309a8c4c2f0d72b8054a085518f514c0cd7b92ed8d3601738ac54e7fbcb1c689f0a7ac9fc275 +27a72fa57787410dbc489ebdde8ee44b33ee2f1c43d172c068ec8867ef5acec98638953dae790a5c45687e07f20d0f7e2befbf096165bdb30b0d70f1d3f7413f lorax-templates-rhel-10.0-55.tar.gz