diff --git a/1001-lorax-anolis-adjust-template.patch b/1001-lorax-anolis-adjust-template.patch deleted file mode 100644 index ce580deeddb597dbccf2beed06032bc3261b6b0f..0000000000000000000000000000000000000000 --- a/1001-lorax-anolis-adjust-template.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur lorax-19.7.25/share/runtime-install.tmpl lorax-19.7.25.new/share/runtime-install.tmpl ---- lorax-19.7.25/share/runtime-install.tmpl 2019-06-05 02:57:37.000000000 +0800 -+++ lorax-19.7.25.new/share/runtime-install.tmpl 2021-09-13 13:34:54.781224163 +0800 -@@ -56,12 +56,6 @@ - ## extra dracut modules - installpkg anaconda-dracut dracut-network dracut-config-generic dracut-fips - --## redhat-upgrade-dracut handles upgrades on RHEL --installpkg redhat-upgrade-dracut redhat-upgrade-dracut-plymouth --log "Looking for extra redhat-upgrade-dracut packages..." ---installpkg *-redhat-upgrade-dracut --installpkg redhat-release-eula -- - ## rpcbind or portmap needed by dracut nfs module - installpkg rpcbind - diff --git a/1002-lorax-anolis-remove-setfiles.patch b/1002-lorax-anolis-remove-setfiles.patch deleted file mode 100644 index e592229f928897d3e57e3a0b1c92f8fd0a4cb537..0000000000000000000000000000000000000000 --- a/1002-lorax-anolis-remove-setfiles.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur lorax-19.7.25/src/pylorax/imgutils.py lorax-19.7.25.new/src/pylorax/imgutils.py ---- lorax-19.7.25/src/pylorax/imgutils.py 2019-06-05 02:57:37.000000000 +0800 -+++ lorax-19.7.25.new/src/pylorax/imgutils.py 2021-09-16 18:57:46.965902631 +0800 -@@ -102,13 +102,6 @@ - fssize = None # Let mkext4img figure out the needed size - - mkext4img(rootdir, outfile, label=label, size=fssize) -- # Reset selinux context on new rootfs -- with LoopDev(outfile) as loopdev: -- with Mount(loopdev) as mnt: -- cmd = [ "setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/install", -- "/etc/selinux/targeted/contexts/files/file_contexts", "/"] -- root = join(mnt, sysroot.lstrip("/")) -- runcmd(cmd, root=root) - - def mkdiskfsimage(diskimage, fsimage, label="Anaconda"): - """ diff --git a/lorax-19.7.28-1.el7.centos.src.rpm b/lorax-19.7.28-1.el7.centos.src.rpm new file mode 100644 index 0000000000000000000000000000000000000000..57b4ea7d675d9f9376c84b4afe7a611eccf1db2f Binary files /dev/null and b/lorax-19.7.28-1.el7.centos.src.rpm differ diff --git a/lorax.spec b/lorax.spec index 256a7e71f091e423298b31a5526101111b264a81..2177b29a39d596408204a8cac3b441ae7a2e6bf0 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,9 +1,8 @@ -%define anolis_release .0.1 %define debug_package %{nil} Name: lorax Version: 19.7.28 -Release: 1%{anolis_release}%{?dist} +Release: 1%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -16,9 +15,6 @@ URL: https://github.com/weldr/lorax Source0: %{name}-%{version}.tar.gz Patch999: centos-lorax-19.7.26.branding.patch -Patch1001: 1001-lorax-anolis-adjust-template.patch -Patch1002: 1002-lorax-anolis-remove-setfiles.patch - BuildRequires: python2-devel BuildRequires: python-sphinx yum python-mako pykickstart @@ -52,8 +48,8 @@ Requires: fedup-dracut Requires: fedup-dracut-plymouth %endif -%if 0%{?el7} || 0%{?anolis7} -# RHEL 7 and ANOLIS 7 specific deps +%if 0%{?el7} +# RHEL 7 specific deps Requires: redhat-upgrade-dracut Requires: redhat-upgrade-dracut-plymouth %endif @@ -85,8 +81,6 @@ Anaconda's image install feature. %prep %setup -q -%patch1001 -p1 -%patch1002 -p1 %patch999 -p1 @@ -129,10 +123,6 @@ rm -f $RPM_BUILD_ROOT/%{_tmpfilesdir}/lorax-composer.conf %{_tmpfilesdir}/lorax.conf %changelog -* Mon Oct 18 2021 Hang Zhao <120917632@qq.com> 19.7.28-1.0.1 -- Rebrand for Anolis OS -- Remove setfiles from mkrootfsimage - * Thu May 14 2020 Brian C. Lane 19.7.28-1 - rhel7-livemedia: Increase the rootfilesystem size (bcl) Resolves: rhbz#1829204