From 7e1f606a1333a97ad794de6b1d0cfbb7778086ab Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 5 Mar 2021 13:35:57 -0800 Subject: [PATCH 01/15] Add patch downstream to replace retired/blocked xorg-x11-server-utils package (cherry-picked from rawhide) --- lorax.spec | 8 +++++++- xorg-x11-server-utils-retire.patch | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 xorg-x11-server-utils-retire.patch diff --git a/lorax.spec b/lorax.spec index 30e3488..6d40f65 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,6 +14,7 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +Patch0: xorg-x11-server-utils-retire.patch BuildRequires: python3-devel BuildRequires: make @@ -146,6 +147,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build @@ -193,6 +195,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Tue Mar 09 2021 Peter Hutterer 34.9-2 +- Add patch downstream to replace retired/blocked xorg-x11-server-utils + package (cherry-picked from rawhide) + * Mon Feb 15 2021 Brian C. Lane 34.9-1 - Use inst.rescue to trigger rescue mode (awilliam@redhat.com) Resolves: rhbz#1928318 diff --git a/xorg-x11-server-utils-retire.patch b/xorg-x11-server-utils-retire.patch new file mode 100644 index 0000000..0e0084c --- /dev/null +++ b/xorg-x11-server-utils-retire.patch @@ -0,0 +1,23 @@ +diff --color -Nur lorax-35.0.orig/share/templates.d/99-generic/runtime-cleanup.tmpl lorax-35.0/share/templates.d/99-generic/runtime-cleanup.tmpl +--- lorax-35.0.orig/share/templates.d/99-generic/runtime-cleanup.tmpl 2021-03-03 16:41:28.000000000 -0800 ++++ lorax-35.0/share/templates.d/99-generic/runtime-cleanup.tmpl 2021-03-05 13:29:46.188665624 -0800 +@@ -304,7 +304,6 @@ + removefrom xorg-x11-drv-openchrome /usr/${libdir}/libchrome* + 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/bin/xrdb + removefrom ${product.name}-logos /etc/* + removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/* + removefrom ${product.name}-logos /usr/share/{firstboot,kde4,pixmaps}/* +diff --color -Nur lorax-35.0.orig/share/templates.d/99-generic/runtime-install.tmpl lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl +--- lorax-35.0.orig/share/templates.d/99-generic/runtime-install.tmpl 2021-03-03 16:41:28.000000000 -0800 ++++ lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl 2021-03-05 13:30:51.555815175 -0800 +@@ -90,7 +90,7 @@ + + ## xorg/GUI packages + installpkg xorg-x11-drivers xorg-x11-server-Xorg +-installpkg xorg-x11-server-utils xorg-x11-xauth ++installpkg xrandr xrdb xorg-x11-xauth + installpkg dbus-x11 metacity gsettings-desktop-schemas + installpkg nm-connection-editor + installpkg librsvg2 From 8808148b9d926f189bbd68593014446f3f8bdbac Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 18:49:22 -0800 Subject: [PATCH 02/15] Don't cleanup report-cli and fix text mode crash reporting --- ...ove-default-tmp-dir-to-var-tmp-lorax.patch | 222 ++++++++++++++++++ lorax.spec | 11 +- 2 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 0001-lorax-Move-default-tmp-dir-to-var-tmp-lorax.patch diff --git a/0001-lorax-Move-default-tmp-dir-to-var-tmp-lorax.patch b/0001-lorax-Move-default-tmp-dir-to-var-tmp-lorax.patch new file mode 100644 index 0000000..a75b999 --- /dev/null +++ b/0001-lorax-Move-default-tmp-dir-to-var-tmp-lorax.patch @@ -0,0 +1,222 @@ +From eb4b3fc8fd8456a17581eb9929fd42c416de0043 Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" +Date: Fri, 18 Jan 2019 12:06:18 -0800 +Subject: [PATCH] lorax: Move default tmp dir to /var/tmp/lorax + +If systemd's tmpfiles.d timer is executed while lorax is running it will +remove any files and directories older than 30 days. This is what has +been causing the occasional error where /proc/ would seem to vanish +during the install. + +Upstream has proposed this solution, https://github.com/systemd/systemd/pull/11482 +but until that is released we need a work-around to protect the lorax +files. + +This commit does several things: + +* Move the default tmpdir from /var/tmp/ to /var/tmp/lorax/ +* Add a lorax.conf tmpfiles.d file that prevents systemd-tmpfiles from + removing anything under /var/tmp/lorax/ +* Add an exit handler to lorax so that temporary directories are removed on + exit or on a python traceback. +* Use flock to lock access to the tempdir while lorax is running. +* Remove any unlocked tempdirs named /var/tmp/lorax/lorax.* at startup + +Note that the exit handler will not remove the tempdir if lorax is +killed with a signal -- those are being caught by dnf and prevent the +exit handler from running. + +systemd-tmpfiles cannot clean up the tempdirs at boot time because they +contain files labeled as shadow_t, so we have to remove those when lorax +runs. It uses the flock to prevent removing any directories created by +parallel instances of lorax and only removes ones that are unlocked. +Worst case they will be around until the first run of lorax after a +reboot. + +If you want to keep the working directory around for debugging purposes +use --workdir /var/tmp/lorax/my-workdir and it won't be removed by +lorax. +--- + lorax.spec | 1 + + setup.py | 3 +- + src/pylorax/cmdline.py | 4 +-- + src/sbin/lorax | 64 ++++++++++++++++++++++++++++++++++++++++-- + systemd/lorax.conf | 3 ++ + 5 files changed, 69 insertions(+), 6 deletions(-) + create mode 100644 systemd/lorax.conf + +diff --git a/lorax.spec b/lorax.spec +index ee3ee62c..ac677eda 100644 +--- a/lorax.spec ++++ b/lorax.spec +@@ -202,6 +202,7 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin + %config(noreplace) %{_sysconfdir}/lorax/lorax.conf + %dir %{_datadir}/lorax + %{_mandir}/man1/*.1* ++%{_tmpfilesdir}/lorax.conf + + %files lmc-virt + +diff --git a/setup.py b/setup.py +index 266c54d5..f2e4a033 100644 +--- a/setup.py ++++ b/setup.py +@@ -10,7 +10,8 @@ data_files = [("/etc/lorax", ["etc/lorax.conf"]), + ("/etc/lorax", ["etc/composer.conf"]), + ("/usr/lib/systemd/system", ["systemd/lorax-composer.service", + "systemd/lorax-composer.socket"]), +- ("/usr/lib/tmpfiles.d/", ["systemd/lorax-composer.conf"])] ++ ("/usr/lib/tmpfiles.d/", ["systemd/lorax-composer.conf", ++ "systemd/lorax.conf"])] + + # shared files + for root, dnames, fnames in os.walk("share"): +diff --git a/src/pylorax/cmdline.py b/src/pylorax/cmdline.py +index 738c6019..4e49fb1a 100644 +--- a/src/pylorax/cmdline.py ++++ b/src/pylorax/cmdline.py +@@ -75,12 +75,12 @@ def lorax_parser(dracut_default=""): + action="store_false", default=True, dest="doupgrade") + optional.add_argument("--logfile", default="./lorax.log", type=os.path.abspath, + help="Path to logfile") +- optional.add_argument("--tmp", default="/var/tmp", ++ optional.add_argument("--tmp", default="/var/tmp/lorax", + help="Top level temporary directory" ) + optional.add_argument("--cachedir", default=None, type=os.path.abspath, + help="DNF cache directory. Default is a temporary dir.") + optional.add_argument("--workdir", default=None, type=os.path.abspath, +- help="Work directory, overrides --tmp. Default is a temporary dir under /var/tmp") ++ help="Work directory, overrides --tmp. Default is a temporary dir under /var/tmp/lorax") + optional.add_argument("--force", default=False, action="store_true", + help="Run even when the destination directory exists") + optional.add_argument("--add-template", dest="add_templates", +diff --git a/src/sbin/lorax b/src/sbin/lorax +index 829f9e0a..d783cf9a 100755 +--- a/src/sbin/lorax ++++ b/src/sbin/lorax +@@ -24,6 +24,9 @@ log = logging.getLogger("lorax") + dnf_log = logging.getLogger("dnf") + + ++import atexit ++import fcntl ++from glob import glob + import sys + import os + import tempfile +@@ -37,6 +40,42 @@ from pylorax import DRACUT_DEFAULT, log_selinux_state + from pylorax.cmdline import lorax_parser + from pylorax.dnfbase import get_dnf_base_object + ++def exit_handler(tempdir): ++ """Handle cleanup of tmpdir, if it still exists ++ """ ++ if not tempdir: ++ return ++ if os.path.exists(tempdir): ++ log.info("Cleaning up tempdir - %s", tempdir) ++ shutil.rmtree(tempdir) ++ ++ ++def remove_tempdirs(): ++ """Delete all unlocked tempdirs under tempfile.gettempdir ++ ++ When lorax crashes it can leave behind tempdirs, which cannot be cleaned up by ++ systemd-tmpfiles (SELinux restricts a complete cleanup). ++ ++ So we lock them while in use and cleanup all the ones that are not locked ++ when lorax starts. ++ """ ++ for d in glob(os.path.join(tempfile.gettempdir(), "lorax.*")): ++ if not os.path.isdir(d): ++ continue ++ try: ++ dir_fd = os.open(d, os.O_RDONLY|os.O_DIRECTORY|os.O_CLOEXEC) ++ fcntl.flock(dir_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) ++ except OSError: ++ # lock failed, skip this directory ++ os.close(dir_fd) ++ continue ++ ++ # Lock succeeded, remove the directory ++ log.info("Removing old tempdir %s", d) ++ shutil.rmtree(d) ++ os.close(dir_fd) ++ ++ + def setup_logging(opts): + pylorax.setup_logging(opts.logfile, log) + +@@ -76,15 +115,28 @@ def main(): + log_selinux_state() + + if not opts.workdir: ++ if not os.path.exists(opts.tmp): ++ os.makedirs(opts.tmp) ++ + tempfile.tempdir = opts.tmp + ++ # Remove any orphaned lorax tempdirs ++ remove_tempdirs() ++ + # create the temporary directory for lorax +- tempdir = tempfile.mkdtemp(prefix="lorax.", dir=tempfile.gettempdir()) ++ tempdir = tempfile.mkdtemp(prefix="lorax.") ++ ++ # register an exit handler to cleanup the temporary directory ++ atexit.register(exit_handler, tempdir) + else: ++ # NOTE: workdir is not cleaned up on exit + tempdir = opts.workdir + if not os.path.exists(tempdir): + os.makedirs(tempdir) + ++ # Remove any orphaned lorax tempdirs ++ remove_tempdirs() ++ + installtree = os.path.join(tempdir, "installtree") + if not os.path.exists(installtree): + os.mkdir(installtree) +@@ -92,6 +144,10 @@ def main(): + if not os.path.exists(dnftempdir): + os.mkdir(dnftempdir) + ++ # Obtain an exclusive lock on the tempdir ++ dir_fd = os.open(tempdir, os.O_RDONLY|os.O_DIRECTORY|os.O_CLOEXEC) ++ fcntl.flock(dir_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) ++ + dnfbase = get_dnf_base_object(installtree, opts.source, opts.mirrorlist, opts.repos, + opts.enablerepos, opts.disablerepos, + dnftempdir, opts.proxy, opts.version, opts.cachedir, +@@ -99,9 +155,8 @@ def main(): + opts.dnfplugins) + + if dnfbase is None: ++ os.close(dir_fd) + print("error: unable to create the dnf base object", file=sys.stderr) +- if not opts.workdir: +- shutil.rmtree(tempdir) + sys.exit(1) + + parsed_add_template_vars = {} +@@ -140,5 +195,8 @@ def main(): + remove_temp=True, verify=opts.verify, + user_dracut_args=opts.dracut_args) + ++ # Release the lock on the tempdir ++ os.close(dir_fd) ++ + if __name__ == "__main__": + main() +diff --git a/systemd/lorax.conf b/systemd/lorax.conf +new file mode 100644 +index 00000000..f720ceb4 +--- /dev/null ++++ b/systemd/lorax.conf +@@ -0,0 +1,3 @@ ++# Prevent systemd from removing installtree files ++# This should eventually be fixed by - https://github.com/systemd/systemd/pull/11482 ++x /var/tmp/lorax 750 root root +-- +2.20.1 + diff --git a/lorax.spec b/lorax.spec index 6d40f65..bd48678 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -15,6 +15,10 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz Patch0: xorg-x11-server-utils-retire.patch +# runtime-cleanup: don't wipe report-cli, we need it to report crashes +# https://bugzilla.redhat.com/show_bug.cgi?id=1937550 +# https://github.com/weldr/lorax/pull/1121 +Patch1: 0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch BuildRequires: python3-devel BuildRequires: make @@ -148,6 +152,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -195,6 +200,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Mon Jun 15 2020 Adam Williamson - 34.9-3 +- Backport patch to not cleanup report-cli and fix text mode crash reporting + Resolves: rhbz#1937550 + * Tue Mar 09 2021 Peter Hutterer 34.9-2 - Add patch downstream to replace retired/blocked xorg-x11-server-utils package (cherry-picked from rawhide) From 511954f77150c0b9ee301513125ca5b5302ea719 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 18:53:20 -0800 Subject: [PATCH 03/15] Correct changelog date --- lorax.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index bd48678..9f9997a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -200,7 +200,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog -* Mon Jun 15 2020 Adam Williamson - 34.9-3 +* Wed Mar 10 2021 Adam Williamson - 34.9-3 - Backport patch to not cleanup report-cli and fix text mode crash reporting Resolves: rhbz#1937550 From a39fb3041a700845b04c7575c01640832482d0ea Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 18:57:45 -0800 Subject: [PATCH 04/15] Put the right damn patch file in I'm bad at this. Signed-off-by: Adam Williamson --- ...ove-default-tmp-dir-to-var-tmp-lorax.patch | 222 ------------------ ...don-t-wipe-usr-bin-report-cli-193755.patch | 27 +++ 2 files changed, 27 insertions(+), 222 deletions(-) delete mode 100644 0001-lorax-Move-default-tmp-dir-to-var-tmp-lorax.patch create mode 100644 0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch diff --git a/0001-lorax-Move-default-tmp-dir-to-var-tmp-lorax.patch b/0001-lorax-Move-default-tmp-dir-to-var-tmp-lorax.patch deleted file mode 100644 index a75b999..0000000 --- a/0001-lorax-Move-default-tmp-dir-to-var-tmp-lorax.patch +++ /dev/null @@ -1,222 +0,0 @@ -From eb4b3fc8fd8456a17581eb9929fd42c416de0043 Mon Sep 17 00:00:00 2001 -From: "Brian C. Lane" -Date: Fri, 18 Jan 2019 12:06:18 -0800 -Subject: [PATCH] lorax: Move default tmp dir to /var/tmp/lorax - -If systemd's tmpfiles.d timer is executed while lorax is running it will -remove any files and directories older than 30 days. This is what has -been causing the occasional error where /proc/ would seem to vanish -during the install. - -Upstream has proposed this solution, https://github.com/systemd/systemd/pull/11482 -but until that is released we need a work-around to protect the lorax -files. - -This commit does several things: - -* Move the default tmpdir from /var/tmp/ to /var/tmp/lorax/ -* Add a lorax.conf tmpfiles.d file that prevents systemd-tmpfiles from - removing anything under /var/tmp/lorax/ -* Add an exit handler to lorax so that temporary directories are removed on - exit or on a python traceback. -* Use flock to lock access to the tempdir while lorax is running. -* Remove any unlocked tempdirs named /var/tmp/lorax/lorax.* at startup - -Note that the exit handler will not remove the tempdir if lorax is -killed with a signal -- those are being caught by dnf and prevent the -exit handler from running. - -systemd-tmpfiles cannot clean up the tempdirs at boot time because they -contain files labeled as shadow_t, so we have to remove those when lorax -runs. It uses the flock to prevent removing any directories created by -parallel instances of lorax and only removes ones that are unlocked. -Worst case they will be around until the first run of lorax after a -reboot. - -If you want to keep the working directory around for debugging purposes -use --workdir /var/tmp/lorax/my-workdir and it won't be removed by -lorax. ---- - lorax.spec | 1 + - setup.py | 3 +- - src/pylorax/cmdline.py | 4 +-- - src/sbin/lorax | 64 ++++++++++++++++++++++++++++++++++++++++-- - systemd/lorax.conf | 3 ++ - 5 files changed, 69 insertions(+), 6 deletions(-) - create mode 100644 systemd/lorax.conf - -diff --git a/lorax.spec b/lorax.spec -index ee3ee62c..ac677eda 100644 ---- a/lorax.spec -+++ b/lorax.spec -@@ -202,6 +202,7 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin - %config(noreplace) %{_sysconfdir}/lorax/lorax.conf - %dir %{_datadir}/lorax - %{_mandir}/man1/*.1* -+%{_tmpfilesdir}/lorax.conf - - %files lmc-virt - -diff --git a/setup.py b/setup.py -index 266c54d5..f2e4a033 100644 ---- a/setup.py -+++ b/setup.py -@@ -10,7 +10,8 @@ data_files = [("/etc/lorax", ["etc/lorax.conf"]), - ("/etc/lorax", ["etc/composer.conf"]), - ("/usr/lib/systemd/system", ["systemd/lorax-composer.service", - "systemd/lorax-composer.socket"]), -- ("/usr/lib/tmpfiles.d/", ["systemd/lorax-composer.conf"])] -+ ("/usr/lib/tmpfiles.d/", ["systemd/lorax-composer.conf", -+ "systemd/lorax.conf"])] - - # shared files - for root, dnames, fnames in os.walk("share"): -diff --git a/src/pylorax/cmdline.py b/src/pylorax/cmdline.py -index 738c6019..4e49fb1a 100644 ---- a/src/pylorax/cmdline.py -+++ b/src/pylorax/cmdline.py -@@ -75,12 +75,12 @@ def lorax_parser(dracut_default=""): - action="store_false", default=True, dest="doupgrade") - optional.add_argument("--logfile", default="./lorax.log", type=os.path.abspath, - help="Path to logfile") -- optional.add_argument("--tmp", default="/var/tmp", -+ optional.add_argument("--tmp", default="/var/tmp/lorax", - help="Top level temporary directory" ) - optional.add_argument("--cachedir", default=None, type=os.path.abspath, - help="DNF cache directory. Default is a temporary dir.") - optional.add_argument("--workdir", default=None, type=os.path.abspath, -- help="Work directory, overrides --tmp. Default is a temporary dir under /var/tmp") -+ help="Work directory, overrides --tmp. Default is a temporary dir under /var/tmp/lorax") - optional.add_argument("--force", default=False, action="store_true", - help="Run even when the destination directory exists") - optional.add_argument("--add-template", dest="add_templates", -diff --git a/src/sbin/lorax b/src/sbin/lorax -index 829f9e0a..d783cf9a 100755 ---- a/src/sbin/lorax -+++ b/src/sbin/lorax -@@ -24,6 +24,9 @@ log = logging.getLogger("lorax") - dnf_log = logging.getLogger("dnf") - - -+import atexit -+import fcntl -+from glob import glob - import sys - import os - import tempfile -@@ -37,6 +40,42 @@ from pylorax import DRACUT_DEFAULT, log_selinux_state - from pylorax.cmdline import lorax_parser - from pylorax.dnfbase import get_dnf_base_object - -+def exit_handler(tempdir): -+ """Handle cleanup of tmpdir, if it still exists -+ """ -+ if not tempdir: -+ return -+ if os.path.exists(tempdir): -+ log.info("Cleaning up tempdir - %s", tempdir) -+ shutil.rmtree(tempdir) -+ -+ -+def remove_tempdirs(): -+ """Delete all unlocked tempdirs under tempfile.gettempdir -+ -+ When lorax crashes it can leave behind tempdirs, which cannot be cleaned up by -+ systemd-tmpfiles (SELinux restricts a complete cleanup). -+ -+ So we lock them while in use and cleanup all the ones that are not locked -+ when lorax starts. -+ """ -+ for d in glob(os.path.join(tempfile.gettempdir(), "lorax.*")): -+ if not os.path.isdir(d): -+ continue -+ try: -+ dir_fd = os.open(d, os.O_RDONLY|os.O_DIRECTORY|os.O_CLOEXEC) -+ fcntl.flock(dir_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) -+ except OSError: -+ # lock failed, skip this directory -+ os.close(dir_fd) -+ continue -+ -+ # Lock succeeded, remove the directory -+ log.info("Removing old tempdir %s", d) -+ shutil.rmtree(d) -+ os.close(dir_fd) -+ -+ - def setup_logging(opts): - pylorax.setup_logging(opts.logfile, log) - -@@ -76,15 +115,28 @@ def main(): - log_selinux_state() - - if not opts.workdir: -+ if not os.path.exists(opts.tmp): -+ os.makedirs(opts.tmp) -+ - tempfile.tempdir = opts.tmp - -+ # Remove any orphaned lorax tempdirs -+ remove_tempdirs() -+ - # create the temporary directory for lorax -- tempdir = tempfile.mkdtemp(prefix="lorax.", dir=tempfile.gettempdir()) -+ tempdir = tempfile.mkdtemp(prefix="lorax.") -+ -+ # register an exit handler to cleanup the temporary directory -+ atexit.register(exit_handler, tempdir) - else: -+ # NOTE: workdir is not cleaned up on exit - tempdir = opts.workdir - if not os.path.exists(tempdir): - os.makedirs(tempdir) - -+ # Remove any orphaned lorax tempdirs -+ remove_tempdirs() -+ - installtree = os.path.join(tempdir, "installtree") - if not os.path.exists(installtree): - os.mkdir(installtree) -@@ -92,6 +144,10 @@ def main(): - if not os.path.exists(dnftempdir): - os.mkdir(dnftempdir) - -+ # Obtain an exclusive lock on the tempdir -+ dir_fd = os.open(tempdir, os.O_RDONLY|os.O_DIRECTORY|os.O_CLOEXEC) -+ fcntl.flock(dir_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) -+ - dnfbase = get_dnf_base_object(installtree, opts.source, opts.mirrorlist, opts.repos, - opts.enablerepos, opts.disablerepos, - dnftempdir, opts.proxy, opts.version, opts.cachedir, -@@ -99,9 +155,8 @@ def main(): - opts.dnfplugins) - - if dnfbase is None: -+ os.close(dir_fd) - print("error: unable to create the dnf base object", file=sys.stderr) -- if not opts.workdir: -- shutil.rmtree(tempdir) - sys.exit(1) - - parsed_add_template_vars = {} -@@ -140,5 +195,8 @@ def main(): - remove_temp=True, verify=opts.verify, - user_dracut_args=opts.dracut_args) - -+ # Release the lock on the tempdir -+ os.close(dir_fd) -+ - if __name__ == "__main__": - main() -diff --git a/systemd/lorax.conf b/systemd/lorax.conf -new file mode 100644 -index 00000000..f720ceb4 ---- /dev/null -+++ b/systemd/lorax.conf -@@ -0,0 +1,3 @@ -+# Prevent systemd from removing installtree files -+# This should eventually be fixed by - https://github.com/systemd/systemd/pull/11482 -+x /var/tmp/lorax 750 root root --- -2.20.1 - diff --git a/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch b/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch new file mode 100644 index 0000000..d5a0c5c --- /dev/null +++ b/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch @@ -0,0 +1,27 @@ +From b9fa8ad1eb45c7df04c72dcf8585c3e79fa14303 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 10 Mar 2021 17:20:00 -0800 +Subject: [PATCH] runtime-cleanup: don't wipe /usr/bin/report-cli (#1937550) + +We need it for reporting things! + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 17ce1648..724c4592 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -282,7 +282,6 @@ removefrom psmisc /usr/share/locale/* + removefrom python3-kickstart /usr/lib/python*/site-packages/pykickstart/locale/* + removefrom readline /usr/${libdir}/libhistory* + removefrom libreport /usr/share/locale/* +-removefrom libreport-cli /usr/bin/* + removefrom rdma-core /etc/rdma/mlx4.conf + removefrom rpm /usr/bin/* /usr/share/locale/* + removefrom rsync /etc/* +-- +2.30.1 + From fa29e594eea69921b282fc9960196217d44b2e7c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 19:15:57 -0800 Subject: [PATCH 05/15] Disable the xorg-x11-server-utils patch for now --- lorax.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lorax.spec b/lorax.spec index 9f9997a..7010550 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,7 +14,9 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -Patch0: xorg-x11-server-utils-retire.patch +# Patch0 is disabled temporarily as the change it handles is stuck +# in updates-testing due to freeze +#Patch0: xorg-x11-server-utils-retire.patch # runtime-cleanup: don't wipe report-cli, we need it to report crashes # https://bugzilla.redhat.com/show_bug.cgi?id=1937550 # https://github.com/weldr/lorax/pull/1121 @@ -151,7 +153,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +#patch0 -p1 %patch1 -p1 %build @@ -200,6 +202,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Wed Mar 10 2021 Adam Williamson - 34.9-4 +- Disable the xorg-x11-server-utils patch for now (that split is stuck in u-t) + * Wed Mar 10 2021 Adam Williamson - 34.9-3 - Backport patch to not cleanup report-cli and fix text mode crash reporting Resolves: rhbz#1937550 From 76f3240a7804c2ecd69a5e8972de0241c3fb98e2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 19:44:10 -0800 Subject: [PATCH 06/15] Revert "Disable the xorg-x11-server-utils patch for now" This reverts commit fa29e594eea69921b282fc9960196217d44b2e7c, so we get a build with both the fix for report-cli and the changes for the xorg-x11-server-utils split. I will edit this build into that update. --- lorax.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lorax.spec b/lorax.spec index 7010550..9f9997a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.9 -Release: 4%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,9 +14,7 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Patch0 is disabled temporarily as the change it handles is stuck -# in updates-testing due to freeze -#Patch0: xorg-x11-server-utils-retire.patch +Patch0: xorg-x11-server-utils-retire.patch # runtime-cleanup: don't wipe report-cli, we need it to report crashes # https://bugzilla.redhat.com/show_bug.cgi?id=1937550 # https://github.com/weldr/lorax/pull/1121 @@ -153,7 +151,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} -#patch0 -p1 +%patch0 -p1 %patch1 -p1 %build @@ -202,9 +200,6 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog -* Wed Mar 10 2021 Adam Williamson - 34.9-4 -- Disable the xorg-x11-server-utils patch for now (that split is stuck in u-t) - * Wed Mar 10 2021 Adam Williamson - 34.9-3 - Backport patch to not cleanup report-cli and fix text mode crash reporting Resolves: rhbz#1937550 From e098b3fd326275fc3ca016a248f0a05c05aa47cc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 19:47:29 -0800 Subject: [PATCH 07/15] Bump rev, update changelog --- lorax.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 9f9997a..13ac918 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.9 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -200,6 +200,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Wed Mar 10 2021 Adam Williamson - 34.9-5 +- Re-enable the xorg-x11-server-utils patch again (to go to u-t) + +* Wed Mar 10 2021 Adam Williamson - 34.9-4 +- Disable the xorg-x11-server-utils patch for now (that split is stuck in u-t) + * Wed Mar 10 2021 Adam Williamson - 34.9-3 - Backport patch to not cleanup report-cli and fix text mode crash reporting Resolves: rhbz#1937550 From e59a8abdd5648ca89a6cbf2398890c025e448bd1 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 26 Apr 2021 17:22:52 -0700 Subject: [PATCH 08/15] - New lorax documentation - 34.10 (bcl@redhat.com) - composer-cli: Remove all traces of composer-cli (bcl@redhat.com) - runtime-cleanup: don't wipe /usr/bin/report-cli (#1937550) (awilliam@redhat.com) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 126d823..75d59d3 100644 --- a/.gitignore +++ b/.gitignore @@ -195,3 +195,4 @@ /lorax-34.7.tar.gz /lorax-34.8.tar.gz /lorax-34.9.tar.gz +/lorax-34.10.tar.gz diff --git a/sources b/sources index 2578a4f..48bdde8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.9.tar.gz) = 592a2fe3a4dbb7deb62745acc7b5874afa01dfbe89e74232d74e013954bac3a64d22353ff876b09b38d4b5fadb3a2762612a9f5ce7e340168f7a3ee8e9b7f900 +SHA512 (lorax-34.10.tar.gz) = 669582a9c88b546ffc46f5939841330be8dba8720595ef5b1aa42a718b90cd21ecbabb3ef072e49eeae8fd4d0544f88a7ce26cbc86efad1a6ee834c553ff7575 From ee62541f4804bfb99ded29ff41ffde04cf155266 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 26 Apr 2021 17:34:42 -0700 Subject: [PATCH 09/15] Add updated lorax.spec --- lorax.spec | 420 +---------------------------------------------------- 1 file changed, 7 insertions(+), 413 deletions(-) diff --git a/lorax.spec b/lorax.spec index 13ac918..6b6e4ef 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 34.9 -Release: 5%{?dist} +Version: 34.10 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,11 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -Patch0: xorg-x11-server-utils-retire.patch -# runtime-cleanup: don't wipe report-cli, we need it to report crashes -# https://bugzilla.redhat.com/show_bug.cgi?id=1937550 -# https://github.com/weldr/lorax/pull/1121 -Patch1: 0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch BuildRequires: python3-devel BuildRequires: make @@ -138,21 +133,8 @@ Provides: lorax-templates = %{version}-%{release} Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic -%package -n composer-cli -Summary: A command line tool for use with the lorax-composer API server - -# From Distribution -Requires: python3-urllib3 -Requires: python3-toml - -%description -n composer-cli -A command line tool for use with the lorax-composer API server. Examine blueprints, -build images, etc. from the command line. - %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 %build @@ -164,8 +146,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %defattr(-,root,root,-) %license COPYING %doc AUTHORS -%doc docs/composer-cli.rst docs/lorax.rst docs/livemedia-creator.rst docs/product-images.rst -%doc docs/lorax-composer.rst +%doc docs/lorax.rst docs/livemedia-creator.rst docs/product-images.rst %doc docs/*ks %{python3_sitelib}/pylorax %{python3_sitelib}/*.egg-info @@ -193,26 +174,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %dir %{_datadir}/lorax/templates.d %{_datadir}/lorax/templates.d/* -%files -n composer-cli -%{_bindir}/composer-cli -%{python3_sitelib}/composer/* -%{_sysconfdir}/bash_completion.d/composer-cli -%{_mandir}/man1/composer-cli.1* - %changelog -* Wed Mar 10 2021 Adam Williamson - 34.9-5 -- Re-enable the xorg-x11-server-utils patch again (to go to u-t) - -* Wed Mar 10 2021 Adam Williamson - 34.9-4 -- Disable the xorg-x11-server-utils patch for now (that split is stuck in u-t) - -* Wed Mar 10 2021 Adam Williamson - 34.9-3 -- Backport patch to not cleanup report-cli and fix text mode crash reporting - Resolves: rhbz#1937550 - -* Tue Mar 09 2021 Peter Hutterer 34.9-2 -- Add patch downstream to replace retired/blocked xorg-x11-server-utils - package (cherry-picked from rawhide) +* Mon Apr 26 2021 Brian C. Lane 34.10-1 +- New lorax documentation - 34.10 (bcl@redhat.com) +- composer-cli: Remove all traces of composer-cli (bcl@redhat.com) +- runtime-cleanup: don't wipe /usr/bin/report-cli (#1937550) (awilliam@redhat.com) * Mon Feb 15 2021 Brian C. Lane 34.9-1 - Use inst.rescue to trigger rescue mode (awilliam@redhat.com) @@ -353,375 +319,3 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - lorax: Update how the release package is chosen (bcl@redhat.com) - ltmpl: Fix package logging format (bcl@redhat.com) Resolves: rhbz#1815000 - - -* Mon Mar 16 2020 Brian C. Lane 32.7-1 -- lorax: Write package lists in run_transaction (bcl@redhat.com) -- Add dig and comm to the boot.iso (bcl@redhat.com) -- lorax-composer: Add 'weldr' to indicate it supports the weldr API (bcl@redhat.com) -- lorax: Cleanup the removefrom --allbut files (bcl@redhat.com) -- lorax: Add eject back into the boot.iso (bcl@redhat.com) - -* Wed Feb 12 2020 Brian C. Lane 32.6-1 -- New lorax documentation - 32.6 (bcl@redhat.com) -- Update mock documentation to remove --old-chroot (bcl@redhat.com) -- Use .tasks file to trigger removal of stale cloud resources (atodorov@redhat.com) -- tests: OpenStack - apply tags and delete by tags (atodorov@redhat.com) -- tests: Azure - apply tags and delete by tags (atodorov@redhat.com) -- tests: VMware - delete only VMs named Composer-Test-* (atodorov@redhat.com) -- tests: AWS - apply tags when creating resoures and delete by tags (atodorov@redhat.com) -- Reflect fonts packages from comps (akira@tagoh.org) -- lorax: Catch rootfs out of space failures (bcl@redhat.com) -- pylint: whitelist the rpm module (bcl@redhat.com) -- tests: Move the list of packages out of Dockerfile.test into a file (bcl@redhat.com) -- tests: remove ALI_DIR after we're done using the cli (atodorov@redhat.com) -- Test & cleanup script for Alibaba cloud (atodorov@redhat.com) -- tests: run ssh commands in batch mode (jrusz@redhat.com) -- lorax: Log dnf solver debug data in ./debugdata/ (bcl@redhat.com) -- tests: remove --test=2 from compose_sanity (jrusz@redhat.com) - -* Thu Jan 16 2020 Brian C. Lane 32.5-1 -- New lorax documentation - 32.5 (bcl@redhat.com) -- tests: Use mock from unittest (bcl@redhat.com) -- Add --dracut-conf cmdline argument to lorax and livemedia-creator (bcl@redhat.com) -- Add tests for metapackages and package name globs (bcl@redhat.com) -- executils: Drop bufsize=1 from execReadlines (bcl@redhat.com) -- tests: unittest and pytest expect functions to start with test_ (bcl@redhat.com) -- Update to_timeval usage to use format_iso8601 (bcl@redhat.com) -- ltmpl: Update to use collections.abc (bcl@redhat.com) -- test: Use pytest instead of nose (bcl@redhat.com) -- tests: Check for cloud-init presence in azure image (jrusz@redhat.com) -- tests: check for failed compose before trying to cancel (jrusz@redhat.com) -- tests: Enable Elastic Network Adapter support for AWS (atodorov@redhat.com) -- lorax-composer: Enable ami on aarch64 (bcl@redhat.com) - -* Fri Jan 10 2020 Brian C. Lane 32.4-1 -- livemedia-creator: workaround glibc limitation when starting anaconda (dan@danny.cz) -- AWS test: take into account different instance type for non x86 (atodorov@redhat.com) -- Add test for canceling a running compose (jrusz@redhat.com) -- composer-cli: Increase DELETE timeout to 120s (bcl@redhat.com) -- anaconda_cleanup: Remove anaconda.pid if it is left behind (bcl@redhat.com) -- New lorax documentation - 32.4 (bcl@redhat.com) -- docs: Add documentation for new mkksiso --volid feature (bcl@redhat.com) -- mkksiso: Add the option to set the ISO volume label (florian.achleitner@prime-sign.com) -- spec: Add missing BuildRequires: make (florian.achleitner@prime-sign.com) -- tests: Use wildcard versions for packages (bcl@redhat.com) -- composer-cli: Only display the available compose types (bcl@redhat.com) -- fix typo in api docstring (obudai@redhat.com) -- Remove all repo files & install composer-cli from host repos (atodorov@redhat.com) -- Always remove lorax-composer & composer-cli RPMs before installing them (atodorov@redhat.com) -- Always remove existing VM image before building new one (atodorov@redhat.com) -- Add git to Dockerfile.test (bcl@redhat.com) - -* Mon Nov 18 2019 Brian C. Lane 32.3-1 -- lorax-composer: Add cloud-init support to the vhd image (bcl@redhat.com) -- tests: add docker variable to .travis.yml (jrusz@redhat.com) -- tests: Changed Docker to podman in Makefile (jrusz@redhat.com) -- tests: fix blueprints tag test (jrusz@redhat.com) -- test: fix serializing repo_to_source test (jrusz@redhat.com) -- composer-cli: Return int from handle_api_result not bool (bcl@redhat.com) -- mkksiso: copy all the directories over to tmpdir (bcl@redhat.com) -- Add dmidecode on supported architectures (bcl@redhat.com) -- docs: Remove --title from list of lmc variables (bcl@redhat.com) -- Drop old lorax.spec changelog entries (pre-F31) (bcl@redhat.com) - -* Tue Nov 05 2019 Brian C. Lane 32.2-1 -- New lorax documentation - 32.2 (bcl@redhat.com) -- tests: Add 'test_mkksiso' tests (bcl@redhat.com) -- mkksiso: Add documentation (bcl@redhat.com) -- mkksiso: Add a tool to add a kickstart to an existing boot.iso (bcl@redhat.com) -- tests: Add a lorax boot.iso test (bcl@redhat.com) -- test: Add wait_boot method for root logins (bcl@redhat.com) -- tests: Ensure failure if beakerlib results file not found (atodorov@redhat.com) -- tests: Documentation updates (atodorov@redhat.com) -- tests: Use host repositories for make vm (atodorov@redhat.com) -- Remove unused make targets (atodorov@redhat.com) -- DRY when setting up, running & parsing results for beakerlib tests (atodorov@redhat.com) -- tests: Disable mirrors (atodorov@redhat.com) -- tests: Use journalctl -g to check for failed login (bcl@redhat.com) -- tests: Fix check_root_account when used with tar liveimg test (bcl@redhat.com) -- tests: Use the same asserts as before (atodorov@redhat.com) -- tests: switch to using podman instead of docker (atodorov@redhat.com) -- tests: Remove nested vm from tar liveimg kickstart test (bcl@redhat.com) -- tests: Use --http0.9 for curl ssh test (bcl@redhat.com) -- test: Boot the live-iso faster, and login using ssh key (bcl@redhat.com) -- test: Split up the test class to allow booting other images (bcl@redhat.com) -- tests: Split testing the image into a separate script (bcl@redhat.com) -- Add live iso support to s390 (bcl@redhat.com) -- docs: Override macboot/nomacboot documentation (bcl@redhat.com) -- Disable some compose types on other architectures (bcl@redhat.com) -- lorax: Drop unused --title option (bcl@redhat.com) -- tests: Document Azure setup (atodorov@redhat.com) -- tests: unskip Azure scenario (atodorov@redhat.com) - -* Wed Oct 16 2019 Brian C. Lane 32.1-1 -- Bump default platform and releasever to 32 (bcl@redhat.com) -- New lorax documentation - 32.1 (bcl@redhat.com) -- docs: Fix Sphinx errors in docstrings (bcl@redhat.com) -- vm.install: Turn on verbose output (bcl@redhat.com) -- tests: Switch the azure examples used in the lifted tests to use aws (bcl@redhat.com) -- Remove lifted azure support (bcl@redhat.com) -- composer-cli: Add providers info command (bcl@redhat.com) -- composer-cli: Fix error handling in providers push (bcl@redhat.com) -- composer-cli: Fix upload log output (bcl@redhat.com) -- Add list to bash completion for composer-cli upload (bcl@redhat.com) -- Update composer-cli documentation (bcl@redhat.com) -- Add composer and lifted to coverage report (bcl@redhat.com) -- composer-cli: Add starting an upload to compose start (bcl@redhat.com) -- composer-cli: Add providers template command (bcl@redhat.com) -- bash_completion: Add support for new composer-cli commands (bcl@redhat.com) -- composer-cli: Add support for providers command (bcl@redhat.com) -- composer-cli: Add support for upload command (bcl@redhat.com) -- Increase ansible verbosity to 2 (bcl@redhat.com) -- lifted: Add support for AWS upload (bcl@redhat.com) -- lifted: Improve logging for upload playbooks (bcl@redhat.com) -- Add upload status examples to compose route docstrings (bcl@redhat.com) -- tests: Add tests for deleting unknown upload and profile (bcl@redhat.com) -- Add docstrings to the new upload functions in pylorax.api.queue (bcl@redhat.com) -- Change /compose/uploads/delete to /upload/delete (bcl@redhat.com) -- tests: Add test for /compose/uploads/delete (bcl@redhat.com) -- tests: Add tests for /compose/uploads/schedule (bcl@redhat.com) -- Add profile support to /uploads/schedule/ (bcl@redhat.com) -- tests: Fix comments about V1 API results including uploads data (bcl@redhat.com) -- lifted: Make sure inputs cannot have path elements (bcl@redhat.com) -- Use consistent naming for upload uuids (bcl@redhat.com) -- tests: Add tests for new upload routes (bcl@redhat.com) -- Fix some docstrings in the v1 API (bcl@redhat.com) -- lifted: Make sure providers list is always sorted (bcl@redhat.com) -- Add /upload/providers/delete route (bcl@redhat.com) -- lifted: Add delete_profile function and tests (bcl@redhat.com) -- Add support for starting a compose upload with the profile (bcl@redhat.com) -- lifted: Add a function to load the settings for a provider's profile (bcl@redhat.com) -- Fix pylint errors in lifted.upload (bcl@redhat.com) -- tests: Add yamllint of the lifted playbooks (bcl@redhat.com) -- tests: Add tests for the new lifted module (bcl@redhat.com) -- All providers should have 'supported_types' (bcl@redhat.com) -- lifted directories should be under share_dir and lib_dir (bcl@redhat.com) -- tests: Add tests for API v1 (bcl@redhat.com) -- Make sure V0 API doesn't return uploads information (bcl@redhat.com) -- Automatically upload composed images to the cloud (egoode@redhat.com) -- Add load and dump to pylorax.api.toml (egoode@redhat.com) -- Support CI testing against a bots project PR (martin@piware.de) -- Makefile: Don't clobber an existing bots checkout (martin@piware.de) -- lorax-composer: Handle RecipeError in commit_recipe_directory (bcl@redhat.com) -- test: Disable pylint subprocess check check (bcl@redhat.com) - -* Mon Sep 30 2019 Brian C. Lane 32.0-1 -- aarch64: Fix live-iso creation on aarch64 (bcl@redhat.com) -- Add test for running composer with --no-system-repos option (jikortus@redhat.com) -- [tests] Use functions for starting and stopping lorax-composer (jikortus@redhat.com) -- Makefile: Update bots target for moved GitHub project (sanne.raymaekers@gmail.com) -- Keep the zramctl utility from util-linux on boot.iso (mkolman@redhat.com) -- Skip kickstart tar test for fedora-30/tar scenario (atodorov@redhat.com) -- Enable fedora-30/tar test scenario (atodorov@redhat.com) -- [tests] Collect compose logs after each build (atodorov@redhat.com) -- [tests] Use a function to wait for compose to finish (jikortus@redhat.com) -- When launching AWS instances wait for the one we just launched (atodorov@redhat.com) -- tests: Add kickstart tar installation test (jikortus@redhat.com) -- tests: add option to disable kernel command line parameters check (jikortus@redhat.com) -- tests: Use a loop to wait for VM and sshd to start (bcl@redhat.com) -- creator.py: include dmsquash-live-ntfs by default (gmt@be-evil.net) -- Skip Azure test b/c misconfigured infra & creds (atodorov@redhat.com) -- tests: Drop tito from the Dockerfile.test (bcl@redhat.com) -- tests: Drop sort from compose types test (bcl@redhat.com) -- Revert "tests: Fix the order of liveimg-tar live-iso" (atodorov@redhat.com) -- New test: assert toml files in git workspace (atodorov@redhat.com) - -* Tue Aug 20 2019 Brian C. Lane 31.10-1 -- tests: Update gpg key to fedora 32 (bcl@redhat.com) -- tests: Fix the order of liveimg-tar live-iso (bcl@redhat.com) -- tests: Use server-2.repo instead of single.repo (bcl@redhat.com) -- lorax-composer: Add support for dnf variables to repo sources (bcl@redhat.com) -- Use smarter multipath detection logic. (dlehman@redhat.com) -- tests: Expand test coverage of the v0 and v1 sources API (bcl@redhat.com) -- tests: Temporarily work around rpm and pylint issues (bcl@redhat.com) -- lorax-composer: Add v1 API for projects/source/ (bcl@redhat.com) -- Add /api/v1/ handler with no routes (bcl@redhat.com) -- Move common functions into pylorax.api.utils (bcl@redhat.com) -- Document the release process steps (bcl@redhat.com) -- lorax-composer: Add liveimg-tar image type (bcl@redhat.com) -- livemedia-creator: Use --compress-arg in mksquashfs (bcl@redhat.com) -- livemedia-creator: Remove unused --squashfs_args option (bcl@redhat.com) -- Only use repos with valid urls for test_server.py (bcl@redhat.com) -- lorax-composer: Clarify groups documentation (bcl@redhat.com) - -* Mon Jul 29 2019 Brian C. Lane 31.9-1 -- New lorax documentation - 31.9 (bcl@redhat.com) -- Remove .build-id from install media (riehecky@fnal.gov) -- lorax-composer: Add squashfs_only False to all image types (bcl@redhat.com) -- tests: Update test_creator.py (bcl@redhat.com) -- docs: Add anaconda-live to fedora-livemedia.ks example (bcl@redhat.com) -- livemedia-creator: Use make_runtime for all runtime creation (bcl@redhat.com) -- livemedia-creator: Add support for a squashfs only runtime image (bcl@redhat.com) -- Update rst formatting. Refs #815 (atodorov@redhat.com) -- don't skip Xorg packages on s390x to allow local GUI installation under KVM (dan@danny.cz) -- Use binary mode to tail the file (bcl@redhat.com) -- Return most relevant log file from /compose/log (egoode@redhat.com) -- Use passwd --status for locked root account check (jikortus@redhat.com) -- tests: Use liveuser account for live-iso boot check (bcl@redhat.com) -- Mention python3-magic in HACKING.md (egoode@redhat.com) -- tests: Add check to make sure the compose actually finished (bcl@redhat.com) -- test: check the number of tests that ran (atodorov@redhat.com) -- lorax: Add debug log of command line options (riehecky@fnal.gov) -- lorax: provide runtime lorax config in debug log (riehecky@fnal.gov) -- Remove whitespace in v0_blueprints_new (jacobdkozol@gmail.com) -- Add test for VALID_BLUEPRINT_NAME check (jacobdkozol@gmail.com) -- Add seperate validation for blueprint names (jacobdkozol@gmail.com) -- Leave lscpu in the image for additional debugging (riehecky@fnal.gov) -- tests: set skip_if_unavailable in test repos (lars@karlitski.net) -- test/README.md: Add section explaining GitHub integration (lars@karlitski.net) - -* Fri Jun 28 2019 Brian C. Lane 31.8-1 -- Also search for pxeboot kernel and initrd pairs (hadess@hadess.net) -- Assert that RuntimeErrors have correct messages (egoode@redhat.com) -- More descriptive error for a bad ref in repos.git (egoode@redhat.com) -- Remove unused shell script (atodorov@redhat.com) -- test: Output results for cockpit's log.html (lars@karlitski.net) -- Do not generate journal.xml from beakerlib (atodorov@redhat.com) -- tests: Add RUN_TESTS to Makefile so you can pass in targets (bcl@redhat.com) -- tests: Add tests for recipe checking functions (bcl@redhat.com) -- lorax-composer: Add basic case check to check_recipe_dict (bcl@redhat.com) -- lorax-composer: Add basic recipe checker function (bcl@redhat.com) -- Revert "test: Disable test_live_iso test" (lars@karlitski.net) -- test: Fix test_blueprint_sanity (lars@karlitski.net) -- tests: rpm now returns str, drop decode() call (bcl@redhat.com) -- tests: Drop libgit2 install from koji (bcl@redhat.com) - -* Tue Jun 18 2019 Brian C. Lane 31.7-1 -- New lorax documentation - 31.7 (bcl@redhat.com) -- Update qemu arguments to work correctly with nographic (bcl@redhat.com) -- Switch to new toml library (bcl@redhat.com) -- composer-cli: Update diff support for customizations and repos.git (bcl@redhat.com) -- Add support for customizations and repos.git to /blueprints/diff/ (bcl@redhat.com) -- tests: Update custom-base with customizations (bcl@redhat.com) -- Move the v0 API documentation into the functions (bcl@redhat.com) -- Update the /api/v0/ route handling to use the flask_blueprints Blueprint class (bcl@redhat.com) -- Extend Flask Blueprint class to allow skipping routes (bcl@redhat.com) -- Remove PR template (atodorov@redhat.com) -- Increase retry count/sleep times when waiting for lorax to start (atodorov@redhat.com) -- Revert "remove the check for qemu-kvm" (atodorov@redhat.com) -- Revert "remove the check for /usr/bin/docker in the setup phase" (atodorov@redhat.com) -- [tests] Define unbound variables in test scripts (atodorov@redhat.com) -- [tests] Handle blueprints in setup_tests/teardown_tests correctly (atodorov@redhat.com) -- [tests] grep|cut for IP address in a more robust way (atodorov@redhat.com) -- Remove quotes around file test in make vm (atodorov@redhat.com) -- test: Don't wait on --sit when test succeeds (lars@karlitski.net) -- Monkey-patch beakerlib to fail on first assert (lars@karlitski.net) -- test_cli.sh: Return beakerlib's exit code (lars@karlitski.net) -- Don't send CORS headers (lars@karlitski.net) -- tests: Set BLUEPRINTS_DIR in all cases (lars@karlitski.net) -- tests: Fail on script errors (lars@karlitski.net) -- Add API integration test (lars@karlitski.net) -- composer: Set up a custom HTTP error handler (lars@karlitski.net) -- Split live-iso and qcow2 and update test scenario execution (atodorov@redhat.com) -- Configure $PACKAGE for beakerlib reports (atodorov@redhat.com) -- Use cloud credentials during test if they exist (atodorov@redhat.com) -- Don't execute compose/blueprint sanity tests in Travis CI (atodorov@redhat.com) -- test: Add --list option to test/check* scripts (lars@karlitski.net) -- test: Add --sit argument to check-* scripts (lars@karlitski.net) -- test: Custom main() function (lars@karlitski.net) -- Use ansible instead of awscli (jstodola@redhat.com) -- Fix path to generic.prm (jstodola@redhat.com) -- Update example fedora-livemedia.ks (bcl@redhat.com) -- Update composer live-iso template (bcl@redhat.com) -- test: Disable test_live_iso test (lars@karlitski.net) -- tests: Source lib.sh from the right directory (lars@karlitski.net) -- Revert "Add rpmfluff temporarily" (bcl@redhat.com) -- tests: Update tmux version to 2.9a (bcl@redhat.com) -- test: Install beakerlib on non-RHEL images (martin@piware.de) -- tests: Fail immediately when image build fails (lars@karlitski.net) -- test: Install beakerlib wehn running on rhel (lars@karlitski.net) -- test: Generalize fs resizing in vm.install (lars@karlitski.net) -- tests: Re-enable kvm (lars@karlitski.net) -- test: Fix vm.install to be idempotent (lars@karlitski.net) -- tests: Don't depend on kvm for tar and qcow2 tests (lars@karlitski.net) -- test_compose_tar: Work around selinux policy change (lars@karlitski.net) -- test_compose_tar: Be less verbose (lars@karlitski.net) -- test_compose_tar: Fix docker test (lars@karlitski.net) -- tests: Extract images to /var/tmp, not /tmp (lars@karlitski.net) -- Use Cockpit's test images and infrastructure (lars@karlitski.net) -- pylint: Remove unused false positive (lars@karlitski.net) - -* Thu May 16 2019 Brian C. Lane 31.6-1 -- Add kernel to ext4-filesystem template (bcl@redhat.com) -- Create a lorax-docs package with the html docs (bcl@redhat.com) -- Add new documentation branches to index.rst (bcl@redhat.com) - -* Tue May 07 2019 Brian C. Lane 31.5-1 -- Add python3-pycdlib to Dockerfile.test (bcl@redhat.com) -- Replace isoinfo with pycdlib (bcl@redhat.com) -- Add test for passing custom option on kernel command line (jikortus@redhat.com) -- Use verify_image function as a helper for generic tests (jikortus@redhat.com) - -* Thu May 02 2019 Brian C. Lane 31.4-1 -- tests: Update openssh-server to v8.* (bcl@redhat.com) -- New lorax documentation - 31.4 (bcl@redhat.com) -- Change customizations.firewall to append items instead of replace (bcl@redhat.com) -- Update customizations.services documentation (bcl@redhat.com) -- lorax-composer: Add services support to blueprints (bcl@redhat.com) -- Add rpmfluff temporarily (bcl@redhat.com) -- lorax-composer: Add firewall support to blueprints (bcl@redhat.com) -- lorax-composer: Add locale support to blueprints (bcl@redhat.com) -- lorax-composer: Fix customizations when creating a recipe (bcl@redhat.com) -- Update docs for new timezone section (bcl@redhat.com) -- lorax-composer: Add timezone support to blueprint (bcl@redhat.com) -- Proposal for adding to the blueprint customizations (bcl@redhat.com) -- Add test for starting compose with deleted blueprint (jikortus@redhat.com) -- Update VMware info for VMware testing (chrobert@redhat.com) -- tests: Cleanup on failure of in_tempdir (bcl@redhat.com) -- Change [[modules]] to [[packages]] in tests (atodorov@redhat.com) -- Add new test to verify compose paths exist (atodorov@redhat.com) -- Add new sanity tests for blueprints (atodorov@redhat.com) -- Fixes for locked root account test (jikortus@redhat.com) - -* Fri Apr 05 2019 Brian C. Lane 31.3-1 -- Add -iso-level 3 when the install.img is > 4GiB (bcl@redhat.com) -- Correct "recipes" use to "blueprints" in composer-cli description (kwalker@redhat.com) -- Fix keeping files on Amazon s3 (jstodola@redhat.com) -- Allow to keep objects in AWS (jstodola@redhat.com) -- Fix the google cloud boot console settings (dshea@redhat.com) -- Add a compose type for alibaba. (dshea@redhat.com) -- Add a new compose type for Hyper-V (dshea@redhat.com) -- Add a compose check for google cloud images. (dshea@redhat.com) -- Add a compose type for Google Compute Engine (dshea@redhat.com) -- Add a new output type, tar-disk. (dshea@redhat.com) -- Support compressing single files. (dshea@redhat.com) -- Add an option to align the image size to a multiplier. (dshea@redhat.com) - -* Mon Apr 01 2019 Brian C. Lane 31.2-1 -- Add documentation references to lorax-composer service files (bcl@redhat.com) -- Add more tests for gitrpm.py (bcl@redhat.com) -- lorax-composer: Fix installing files from [[repos.git]] to / (bcl@redhat.com) -- New lorax documentation - 31.1 (bcl@redhat.com) -- Make it easier to generate docs for the next release (bcl@redhat.com) - -* Tue Mar 26 2019 Brian C. Lane 31.1-1 -- qemu wasn't restoring the terminal if it was terminated early (bcl@redhat.com) -- Switch the --virt-uefi method to use SecureBoot (bcl@redhat.com) -- pylorax.ltmpl: Add a test for missing quotes (bcl@redhat.com) -- Don't remove chmem and lsmem from install.img (bcl@redhat.com) -- lorax-composer: pass customization.kernel append to extra_boot_args (bcl@redhat.com) -- Improve logging for template syntax errors (bcl@redhat.com) -- Add extra boot args to the livemedia-creator iso templates (bcl@redhat.com) -- lorax-composer: Add the ability to append to the kernel command-line (bcl@redhat.com) -- Add checks for disabled root account (jikortus@redhat.com) -- Update datastore for VMware testing (chrobert@redhat.com) - -* Fri Mar 15 2019 Brian C. Lane 31.0-1 -- Add tests using repos.git in blueprints (bcl@redhat.com) -- Move git repo creation into tests/lib.py (bcl@redhat.com) -- rpmgit: catch potential errors while running git (bcl@redhat.com) -- tests: Add test for Recipe.freeze() function (bcl@redhat.com) -- Add repos.git support to lorax-composer builds (bcl@redhat.com) -- Add pylorax.api.gitrpm module and tests (bcl@redhat.com) -- Add support for [[repos.git]] section to blueprints (bcl@redhat.com) -- Update ppc64le isolabel to match x86_64 logic (bcl@redhat.com) -- Add blacklist_exceptions to multipath.conf (bcl@redhat.com) -- tests: Add python3-mock and python3-sphinx_rtd_theme (bcl@redhat.com) -- Use make ci inside test-in-copy target (atodorov@redhat.com) -- Allow overriding $CLI outside test scripts (atodorov@redhat.com) -- tests: Make it easier to update version globs (bcl@redhat.com) -- New test: Build live-iso and boot with KVM (atodorov@redhat.com) -- lorax-composer: Return UnknownBlueprint errors when using deleted blueprints (bcl@redhat.com) -- lorax-composer: Delete workspace copy when deleting blueprint (bcl@redhat.com) -- New test: Build qcow2 compose and test it with QEMU-KVM (atodorov@redhat.com) From a4a78258349362b6ede725f2281b671ee4e4431c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 4 May 2021 08:47:15 -0700 Subject: [PATCH 10/15] Remove unused patches --- ...don-t-wipe-usr-bin-report-cli-193755.patch | 27 ------------------- ...c89cda687f9689978eedb5482d041577577a.patch | 23 ---------------- xorg-x11-server-utils-retire.patch | 23 ---------------- 3 files changed, 73 deletions(-) delete mode 100644 0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch delete mode 100644 78eec89cda687f9689978eedb5482d041577577a.patch delete mode 100644 xorg-x11-server-utils-retire.patch diff --git a/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch b/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch deleted file mode 100644 index d5a0c5c..0000000 --- a/0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b9fa8ad1eb45c7df04c72dcf8585c3e79fa14303 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 10 Mar 2021 17:20:00 -0800 -Subject: [PATCH] runtime-cleanup: don't wipe /usr/bin/report-cli (#1937550) - -We need it for reporting things! - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 17ce1648..724c4592 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -282,7 +282,6 @@ removefrom psmisc /usr/share/locale/* - removefrom python3-kickstart /usr/lib/python*/site-packages/pykickstart/locale/* - removefrom readline /usr/${libdir}/libhistory* - removefrom libreport /usr/share/locale/* --removefrom libreport-cli /usr/bin/* - removefrom rdma-core /etc/rdma/mlx4.conf - removefrom rpm /usr/bin/* /usr/share/locale/* - removefrom rsync /etc/* --- -2.30.1 - diff --git a/78eec89cda687f9689978eedb5482d041577577a.patch b/78eec89cda687f9689978eedb5482d041577577a.patch deleted file mode 100644 index 4f9aa0c..0000000 --- a/78eec89cda687f9689978eedb5482d041577577a.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 78eec89cda687f9689978eedb5482d041577577a Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Wed, 18 Nov 2020 10:27:58 +0100 -Subject: [PATCH] Do not use '--loglevel' option when running Anaconda - -This option has been removed, see https://github.com/rhinstaller/anaconda/pull/2864 ---- - src/pylorax/installer.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pylorax/installer.py b/src/pylorax/installer.py -index b882ecfe6..9d0a8527b 100644 ---- a/src/pylorax/installer.py -+++ b/src/pylorax/installer.py -@@ -355,7 +355,7 @@ def novirt_install(opts, disk_img, disk_size, cancel_func=None, tar_img=None): - if os.path.isdir(path): - shutil.rmtree(path) - -- args = ["--kickstart", opts.ks[0], "--cmdline", "--loglevel", "debug"] -+ args = ["--kickstart", opts.ks[0], "--cmdline"] - if opts.anaconda_args: - for arg in opts.anaconda_args: - args += arg.split(" ", 1) diff --git a/xorg-x11-server-utils-retire.patch b/xorg-x11-server-utils-retire.patch deleted file mode 100644 index 0e0084c..0000000 --- a/xorg-x11-server-utils-retire.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --color -Nur lorax-35.0.orig/share/templates.d/99-generic/runtime-cleanup.tmpl lorax-35.0/share/templates.d/99-generic/runtime-cleanup.tmpl ---- lorax-35.0.orig/share/templates.d/99-generic/runtime-cleanup.tmpl 2021-03-03 16:41:28.000000000 -0800 -+++ lorax-35.0/share/templates.d/99-generic/runtime-cleanup.tmpl 2021-03-05 13:29:46.188665624 -0800 -@@ -304,7 +304,6 @@ - removefrom xorg-x11-drv-openchrome /usr/${libdir}/libchrome* - 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/bin/xrdb - removefrom ${product.name}-logos /etc/* - removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/* - removefrom ${product.name}-logos /usr/share/{firstboot,kde4,pixmaps}/* -diff --color -Nur lorax-35.0.orig/share/templates.d/99-generic/runtime-install.tmpl lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl ---- lorax-35.0.orig/share/templates.d/99-generic/runtime-install.tmpl 2021-03-03 16:41:28.000000000 -0800 -+++ lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl 2021-03-05 13:30:51.555815175 -0800 -@@ -90,7 +90,7 @@ - - ## xorg/GUI packages - installpkg xorg-x11-drivers xorg-x11-server-Xorg --installpkg xorg-x11-server-utils xorg-x11-xauth -+installpkg xrandr xrdb xorg-x11-xauth - installpkg dbus-x11 metacity gsettings-desktop-schemas - installpkg nm-connection-editor - installpkg librsvg2 From c1efe81296f8a706cdafb8d50711d59fe2404faf Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 3 May 2021 15:39:00 -0700 Subject: [PATCH 11/15] tests: Add gating tests --- gating.yaml | 7 +++++++ tests/.fmf/version | 1 + tests/provision.fmf | 5 +++++ tests/scripts/run_tests.sh | 13 +++++++++++++ tests/tests.yml | 15 +++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 gating.yaml create mode 100644 tests/.fmf/version create mode 100644 tests/provision.fmf create mode 100755 tests/scripts/run_tests.sh create mode 100644 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0c1cc35 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/tests/.fmf/version b/tests/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/provision.fmf b/tests/provision.fmf new file mode 100644 index 0000000..dd69f34 --- /dev/null +++ b/tests/provision.fmf @@ -0,0 +1,5 @@ +--- + +standard-inventory-qcow2: + qemu: + m: 4G diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh new file mode 100755 index 0000000..242d17c --- /dev/null +++ b/tests/scripts/run_tests.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -eux +# Gather up the list of system repo files and use them for lorax +REPOS=$(for f in /etc/yum.repos.d/*repo; do echo -n "--repo $f "; done) +if [ -z "$REPOS" ]; then + echo "No system repos found" + exit 1 +fi + +# NOTE: We must use --nomacboot because the test system doesn't have the hfsplus fs available +# Run lorax using the host's repository configuration file +lorax --product="Fedora" --version=34 --release=34 --volid="Fedora-34-test" \ + $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..d39d256 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,15 @@ +--- +# Run lorax with the new templates +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + + required_packages: + - lorax + + tests: + - simple: + dir: scripts + run: ./run_tests.sh From 89141e46ff6342ba522221686dad4b44557ab14e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 5 May 2021 15:08:08 -0700 Subject: [PATCH 12/15] - runtime-cleanup: Use branding package name instead of product.name (bcl@redhat.com) - treebuilder: Add branding package to template variables (bcl@redhat.com) - livemedia-creator: Use inst.ks on cmdline for virt (bcl@redhat.com) - Change khmeros-base-fonts to khmer-os-system-fonts. This font got renamed last year. (pnemade@fedoraproject.org) - xorg-x11-font-utils is now four packages, remove all of them (peter.hutterer@who-t.net) - xorg-x11-server-utils was split up in Fedora 34, so adjust templates (kevin@scrye.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75d59d3..961844c 100644 --- a/.gitignore +++ b/.gitignore @@ -196,3 +196,4 @@ /lorax-34.8.tar.gz /lorax-34.9.tar.gz /lorax-34.10.tar.gz +/lorax-34.11.tar.gz diff --git a/lorax.spec b/lorax.spec index 6b6e4ef..28e069f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.10 +Version: 34.11 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed May 05 2021 Brian C. Lane 34.11-1 +- runtime-cleanup: Use branding package name instead of product.name (bcl@redhat.com) +- treebuilder: Add branding package to template variables (bcl@redhat.com) +- livemedia-creator: Use inst.ks on cmdline for virt (bcl@redhat.com) +- Change khmeros-base-fonts to khmer-os-system-fonts. This font got renamed last year. (pnemade@fedoraproject.org) +- xorg-x11-font-utils is now four packages, remove all of them (peter.hutterer@who-t.net) +- xorg-x11-server-utils was split up in Fedora 34, so adjust templates (kevin@scrye.com) + * Mon Apr 26 2021 Brian C. Lane 34.10-1 - New lorax documentation - 34.10 (bcl@redhat.com) - composer-cli: Remove all traces of composer-cli (bcl@redhat.com) diff --git a/sources b/sources index 48bdde8..22d340d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.10.tar.gz) = 669582a9c88b546ffc46f5939841330be8dba8720595ef5b1aa42a718b90cd21ecbabb3ef072e49eeae8fd4d0544f88a7ce26cbc86efad1a6ee834c553ff7575 +SHA512 (lorax-34.11.tar.gz) = 5a4a7e84e11eff6ce11c7e09077946bba56bf875616231a469692cb6e19c4a0de74d5be761c87e6aa26076b5e86a0855ccf56e5b4e9a8fa71e10abf1801186e8 From c7d8c6a26eb4899a640eef040ed1674f8ccee6e3 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 1 Jun 2021 16:04:24 -0700 Subject: [PATCH 13/15] - Add a context manager for dracut (bcl@redhat.com) Resolves: rhbz#1962975 --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 961844c..1191cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -197,3 +197,4 @@ /lorax-34.9.tar.gz /lorax-34.10.tar.gz /lorax-34.11.tar.gz +/lorax-34.12.tar.gz diff --git a/lorax.spec b/lorax.spec index 28e069f..7d23a31 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.11 +Version: 34.12 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jun 01 2021 Brian C. Lane 34.12-1 +- Add a context manager for dracut (bcl@redhat.com) + Resolves: rhbz#1962975 * Wed May 05 2021 Brian C. Lane 34.11-1 - runtime-cleanup: Use branding package name instead of product.name (bcl@redhat.com) - treebuilder: Add branding package to template variables (bcl@redhat.com) diff --git a/sources b/sources index 22d340d..b985d42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.11.tar.gz) = 5a4a7e84e11eff6ce11c7e09077946bba56bf875616231a469692cb6e19c4a0de74d5be761c87e6aa26076b5e86a0855ccf56e5b4e9a8fa71e10abf1801186e8 +SHA512 (lorax-34.12.tar.gz) = 8c01900994eeb836fcd76413ad49be4c96636fe1d9ba074cadf67453eeba6259b5c7c8fc1325669b3ae51f830bff38a5634360a35be81dd170f7de7840ec6a00 From e46c86c313bb60d0a7117a76ca4c563fc7c79a10 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 8 Nov 2021 09:51:25 -0800 Subject: [PATCH 14/15] - Use fedora:34 for Dockerfile.test (bcl@redhat.com) - dnfbase: Handle defaults better (bcl@redhat.com) - ltmpl: Add version compare support to installpkg (bcl@redhat.com) - Install unicode.pf2 from new directory (bcl@redhat.com) - fedora-livemedia: Add anaconda-install-img-deps (bcl@redhat.com) - New lorax documentation - 34.12 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1191cf8..15cd560 100644 --- a/.gitignore +++ b/.gitignore @@ -198,3 +198,4 @@ /lorax-34.10.tar.gz /lorax-34.11.tar.gz /lorax-34.12.tar.gz +/lorax-34.13.tar.gz diff --git a/lorax.spec b/lorax.spec index 7d23a31..5e5ff5a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.12 +Version: 34.13 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Nov 08 2021 Brian C. Lane 34.13-1 +- Use fedora:34 for Dockerfile.test (bcl@redhat.com) +- dnfbase: Handle defaults better (bcl@redhat.com) +- ltmpl: Add version compare support to installpkg (bcl@redhat.com) +- Install unicode.pf2 from new directory (bcl@redhat.com) +- fedora-livemedia: Add anaconda-install-img-deps (bcl@redhat.com) +- New lorax documentation - 34.12 (bcl@redhat.com) + * Tue Jun 01 2021 Brian C. Lane 34.12-1 - Add a context manager for dracut (bcl@redhat.com) Resolves: rhbz#1962975 diff --git a/sources b/sources index b985d42..134298d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.12.tar.gz) = 8c01900994eeb836fcd76413ad49be4c96636fe1d9ba074cadf67453eeba6259b5c7c8fc1325669b3ae51f830bff38a5634360a35be81dd170f7de7840ec6a00 +SHA512 (lorax-34.13.tar.gz) = 05aead6242185ba62adf3bf5c9eded57332c39785fe92a60d8ff04b44e5f369f6a34eb109c91fe1c236e4871a3f53654a37aa0cce8de7db5248933cfda36b4e3 From 697f376595831203d9c1edaa80725c53bb7b3747 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Dec 2021 14:16:08 -0800 Subject: [PATCH 15/15] - cleanup: remove binaries from lilv (awilliam@redhat.com) - runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) - mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 15cd560..3d5ec2e 100644 --- a/.gitignore +++ b/.gitignore @@ -199,3 +199,4 @@ /lorax-34.11.tar.gz /lorax-34.12.tar.gz /lorax-34.13.tar.gz +/lorax-34.14.tar.gz diff --git a/lorax.spec b/lorax.spec index 5e5ff5a..7c42c3f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.13 +Version: 34.14 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -51,7 +51,7 @@ Requires: python3-mako Requires: python3-kickstart >= 3.19 Requires: python3-dnf >= 3.2.0 Requires: python3-librepo -Requires: python3-pycdlib +Requires: python3-pycdio %if 0%{?fedora} # Fedora specific deps @@ -175,6 +175,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 14 2021 Brian C. Lane 34.14-1 +- cleanup: remove binaries from lilv (awilliam@redhat.com) +- runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) +- mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) + * Mon Nov 08 2021 Brian C. Lane 34.13-1 - Use fedora:34 for Dockerfile.test (bcl@redhat.com) - dnfbase: Handle defaults better (bcl@redhat.com) diff --git a/sources b/sources index 134298d..2280cb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.13.tar.gz) = 05aead6242185ba62adf3bf5c9eded57332c39785fe92a60d8ff04b44e5f369f6a34eb109c91fe1c236e4871a3f53654a37aa0cce8de7db5248933cfda36b4e3 +SHA512 (lorax-34.14.tar.gz) = 16e95ac9cbc4bd63c3cacd8ec42e1dc96cf3d19ab24b842a56eb7d2c23ac40cc8650cc1ce8dcdb3b3d697ac0022e7b3eb2ae72c0175c96dbe50cdb0316cd288e