From ec2546109911c0d9ef5d6bb2c77970458d78f374 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 29 Oct 2020 09:42:30 -0700 Subject: [PATCH] - Drop unused proc/mount patch - lorax: Strip ' from product cmdline argument temporary fix for pungi bug: https://pagure.io/pungi/pull-request/1463 --- ...ts-before-trying-to-touch-proc-modul.patch | 45 ------------------- ...-Strip-from-product-cmdline-argument.patch | 28 ++++++++++++ lorax.spec | 12 +++-- 3 files changed, 37 insertions(+), 48 deletions(-) delete mode 100644 0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch create mode 100644 0002-lorax-Strip-from-product-cmdline-argument.patch diff --git a/0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch b/0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch deleted file mode 100644 index c346175..0000000 --- a/0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6ba02f734c481dfb7fa3feab11b6831b449d82cb Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Mon, 15 Jun 2020 17:05:02 -0700 -Subject: [PATCH] Ensure /proc exists before trying to touch /proc/modules - -The last few Rawhide composes failed because, when we try to -touch /proc/modules here (in treebuilder.py), /proc does not -exist in the inroot. I tried and failed all afternoon to figure -out *why* it suddenly doesn't exist; I'd still like to know, but -this at least should make it not an issue. `exist_ok=True` means -that if the dir already exists we'll do nothing and carry on. - -Signed-off-by: Adam Williamson ---- - src/pylorax/creator.py | 1 + - src/pylorax/treebuilder.py | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/pylorax/creator.py b/src/pylorax/creator.py -index 7075d325..fc090a26 100644 ---- a/src/pylorax/creator.py -+++ b/src/pylorax/creator.py -@@ -256,6 +256,7 @@ def rebuild_initrds_for_live(opts, sys_root_dir, results_dir): - raise Exception("No initrds found, cannot rebuild_initrds") - - # Hush some dracut warnings. TODO: bind-mount proc in place? -+ os.makedirs(joinpaths(sys_root_dir, "/proc"), exist_ok=True) - open(joinpaths(sys_root_dir,"/proc/modules"),"w") - - if opts.ostree: -diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py -index cbb8872f..c30df638 100644 ---- a/src/pylorax/treebuilder.py -+++ b/src/pylorax/treebuilder.py -@@ -309,6 +309,7 @@ class TreeBuilder(object): - raise Exception("No kernels found, cannot rebuild_initrds") - - # Hush some dracut warnings. TODO: bind-mount proc in place? -+ os.makedirs(joinpaths(self.vars.inroot, "/proc"), exist_ok=True) - open(joinpaths(self.vars.inroot,"/proc/modules"),"w") - for kernel in self.kernels: - if prefix: --- -2.27.0 - diff --git a/0002-lorax-Strip-from-product-cmdline-argument.patch b/0002-lorax-Strip-from-product-cmdline-argument.patch new file mode 100644 index 0000000..5e95dbb --- /dev/null +++ b/0002-lorax-Strip-from-product-cmdline-argument.patch @@ -0,0 +1,28 @@ +From fe44b3013b732c6523f673cd65e6ab2bf83760b7 Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" +Date: Thu, 29 Oct 2020 09:00:16 -0700 +Subject: [PATCH] lorax: Strip ' from product cmdline argument + +Temporary work around pungi issue: +https://pagure.io/pungi/pull-request/1463 +--- + src/sbin/lorax | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/sbin/lorax b/src/sbin/lorax +index 5f8fb882..ea3ba28a 100755 +--- a/src/sbin/lorax ++++ b/src/sbin/lorax +@@ -97,6 +97,9 @@ def main(): + parser = lorax_parser(DRACUT_DEFAULT) + opts = parser.parse_args() + ++ # XXX Temporary workaround for https://pagure.io/pungi/pull-request/1463 ++ opts.product = opts.product.strip("'") ++ + log.info("Lorax v%s", pylorax.vernum) + + if not opts.source and not opts.repos: +-- +2.26.2 + diff --git a/lorax.spec b/lorax.spec index 37a68c2..e50cc22 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -17,6 +17,8 @@ Source0: %{name}-%{version}.tar.gz # Increase boot.iso rootfs to 3GiB rhbz#1661169 Patch0000: 0001-Change-rootfs-default-size-to-3GiB.patch +# Work around pungi bug https://pagure.io/pungi/pull-request/1463 +Patch0001: 0002-lorax-Strip-from-product-cmdline-argument.patch BuildRequires: python3-devel BuildRequires: make @@ -150,8 +152,7 @@ A command line tool for use with the lorax-composer API server. Examine blueprin build images, etc. from the command line. %prep -%setup -q -n %{name}-%{version} -%patch0000 -p1 +%autosetup -n %{name}-%{version} -p1 %build @@ -200,6 +201,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Thu Oct 29 2020 Brian C. Lane - 34.3-4 +- Drop unused proc/mount patch +- lorax: Strip ' from product cmdline argument + temporary fix for pungi bug: https://pagure.io/pungi/pull-request/1463 + * Wed Oct 28 2020 Stephen Gallagher - 34.3-3 - Increase boot.iso rootfs to 3GiB