From 7788d2f7773a0a9b93feaea844ec8167a41b10f6 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 29 Aug 2018 15:49:51 -0700 Subject: [PATCH 001/203] - Update the example blueprints for rawhide (bcl@redhat.com) - Bump required dnf version to 3.2.0 for module_platform_id support (bcl@redhat.com) - Add support for DNF 3.2 module_platform_id config value (bcl@redhat.com) - lorax: Only run depmod on the installed kernels (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c8324b0..83ce971 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ /lorax-29.10.tar.gz /lorax-29.11.tar.gz /lorax-29.12.tar.gz +/lorax-29.13.tar.gz diff --git a/lorax.spec b/lorax.spec index 35f1ff2..0264589 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 29.12 +Version: 29.13 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -46,7 +46,7 @@ Requires: kpartx Requires: libselinux-python3 Requires: python3-mako Requires: python3-kickstart -Requires: python3-dnf >= 2.0.0 +Requires: python3-dnf >= 3.2.0 %if 0%{?fedora} @@ -230,6 +230,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Wed Aug 29 2018 Brian C. Lane 29.13-1 +- Update the example blueprints for rawhide (bcl@redhat.com) +- Bump required dnf version to 3.2.0 for module_platform_id support (bcl@redhat.com) +- Add support for DNF 3.2 module_platform_id config value (bcl@redhat.com) +- lorax: Only run depmod on the installed kernels (bcl@redhat.com) + * Tue Aug 28 2018 Brian C. Lane 29.12-1 - Minor package fixes for aarch64/ARMv7 (pbrobinson@gmail.com) diff --git a/sources b/sources index 6886bc2..dea3cda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-29.12.tar.gz) = f81e9556400cb1348b969d7407c51694649efddf9376f59906fd3310d24def8be7a41eb72b7b9198b7739547e8bd2556f5bd53a8dd9c70d7e2da3ba3904213f4 +SHA512 (lorax-29.13.tar.gz) = 16a7188c0c0630a3e2415fcdf307140c998a9d7a1f60b5ceb88038028773ca598db91ed115b7c843f8369102c0ed517551c2b500778138cd76ad2eb516a0b4de From 3e4ca33b71244b2491738c0bdf50991e0750df3e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 30 Aug 2018 12:14:08 -0700 Subject: [PATCH 002/203] Backport PR#451 to avoid undeclared pyanaconda dependency --- ...all-use-of-pyanaconda-s-simpleconfig.patch | 166 ++++++++++++++++++ lorax.spec | 8 +- 2 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch diff --git a/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch b/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch new file mode 100644 index 0000000..dba642d --- /dev/null +++ b/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch @@ -0,0 +1,166 @@ +From a7c1245430597bcfaf595ffce70d16630ef4bfbe Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 30 Aug 2018 11:31:55 -0700 +Subject: [PATCH] Ditch all use of pyanaconda's simpleconfig + +lorax uses pyanaconda's SimpleConfigParser in three different +places (twice with a copy that's been dumped into pylorax, once +by importing it), just to do a fairly simple job: read some +values out of /etc/os-release. The only value SimpleConfigParser +is adding over Python's own ConfigParser here is to read a file +with no section headers, and to unquote the values. The cost is +either a dependency on pyanaconda, or needing to copy the whole +of simpleparser plus some other utility bits from pyanaconda +into lorax. This seems like a bad trade-off. + +This changes the approach: we copy one very simple utility +function from pyanaconda (`unquote`), and do some very simple +wrapping of ConfigParser to handle reading a file without any +section headers, and returning unquoted values. This way we can +read what we need out of os-release without needing a dep on +pyanaconda or to copy lots of things from it into pylorax. + +Resolves: #449 +Resolves: #450 + +Signed-off-by: Adam Williamson +--- + src/pylorax/api/compose.py | 15 ++++++--------- + src/pylorax/api/dnfbase.py | 7 +++---- + src/pylorax/sysutils.py | 23 +++++++++++++++++++++++ + src/sbin/lorax | 7 +++---- + 4 files changed, 35 insertions(+), 17 deletions(-) + +diff --git a/src/pylorax/api/compose.py b/src/pylorax/api/compose.py +index c0ed3b7d..816ea535 100644 +--- a/src/pylorax/api/compose.py ++++ b/src/pylorax/api/compose.py +@@ -40,8 +40,6 @@ import pytoml as toml + import shutil + from uuid import uuid4 + +-from pyanaconda.simpleconfig import SimpleConfigFile +- + # Use pykickstart to calculate disk image size + from pykickstart.parser import KickstartParser + from pykickstart.version import makeVersion +@@ -51,7 +49,7 @@ from pylorax.api.projects import ProjectsError + from pylorax.api.recipes import read_recipe_and_id + from pylorax.api.timestamp import TS_CREATED, write_timestamp + from pylorax.imgutils import default_image_name +-from pylorax.sysutils import joinpaths ++from pylorax.sysutils import joinpaths, flatconfig + + + def test_templates(dbo, share_dir): +@@ -356,14 +354,13 @@ def start_build(cfg, dnflock, gitlock, branch, recipe_name, compose_type, test_m + # Get the title, project, and release version from the host + if not os.path.exists("/etc/os-release"): + log.error("/etc/os-release is missing, cannot determine product or release version") +- os_release = SimpleConfigFile("/etc/os-release") +- os_release.read() ++ os_release = flatconfig("/etc/os-release") + +- log.debug("os_release = %s", os_release) ++ log.debug("os_release = %s", dict(os_release.items())) + +- cfg_args["title"] = os_release.get("PRETTY_NAME") +- cfg_args["project"] = os_release.get("NAME") +- cfg_args["releasever"] = os_release.get("VERSION_ID") ++ cfg_args["title"] = os_release.get("PRETTY_NAME", "") ++ cfg_args["project"] = os_release.get("NAME", "") ++ cfg_args["releasever"] = os_release.get("VERSION_ID", "") + cfg_args["volid"] = "" + + cfg_args.update({ +diff --git a/src/pylorax/api/dnfbase.py b/src/pylorax/api/dnfbase.py +index df4444dc..b7a4d1c6 100644 +--- a/src/pylorax/api/dnfbase.py ++++ b/src/pylorax/api/dnfbase.py +@@ -26,7 +26,7 @@ import os + import shutil + + from pylorax import DEFAULT_PLATFORM_ID +-from pylorax.simpleconfig import SimpleConfigFile ++from pylorax.sysutils import flatconfig + + def get_base_object(conf): + """Get the DNF object with settings from the config file +@@ -76,9 +76,8 @@ def get_base_object(conf): + log.warning("/etc/os-release is missing, cannot determine platform id, falling back to %s", DEFAULT_PLATFORM_ID) + platform_id = DEFAULT_PLATFORM_ID + else: +- os_release = SimpleConfigFile("/etc/os-release") +- os_release.read() +- platform_id = os_release.get("PLATFORM_ID") or DEFAULT_PLATFORM_ID ++ os_release = flatconfig("/etc/os-release") ++ platform_id = os_release.get("PLATFORM_ID", DEFAULT_PLATFORM_ID) + log.info("Using %s for module_platform_id", platform_id) + dbc.module_platform_id = platform_id + +diff --git a/src/pylorax/sysutils.py b/src/pylorax/sysutils.py +index c2f46f1e..1ecbac67 100644 +--- a/src/pylorax/sysutils.py ++++ b/src/pylorax/sysutils.py +@@ -30,6 +30,8 @@ import pwd + import grp + import glob + import shutil ++import shlex ++from configparser import ConfigParser + + from pylorax.executils import runcmd + +@@ -106,3 +108,24 @@ def remove(target): + + def linktree(src, dst): + runcmd(["/bin/cp", "-alx", src, dst]) ++ ++def unquote(s): ++ return ' '.join(shlex.split(s)) ++ ++class UnquotingConfigParser(ConfigParser): ++ """A ConfigParser, only with unquoting of the values.""" ++ def get(self, *args, **kwargs): ++ ret = super().get(*args, **kwargs) ++ if ret: ++ ret = unquote(ret) ++ return ret ++ ++def flatconfig(filename): ++ """Use UnquotingConfigParser to read a flat config file (without ++ section headers) by adding a section header. ++ """ ++ with open (filename, 'r') as conffh: ++ conftext = "[main]\n" + conffh.read() ++ config = ConfigParser() ++ config.read_string(conftext) ++ return config['main'] +diff --git a/src/sbin/lorax b/src/sbin/lorax +index ce21d8f5..30b9cadc 100755 +--- a/src/sbin/lorax ++++ b/src/sbin/lorax +@@ -35,7 +35,7 @@ import librepo + import pylorax + from pylorax import DRACUT_DEFAULT, DEFAULT_PLATFORM_ID + from pylorax.cmdline import lorax_parser +-from pylorax.simpleconfig import SimpleConfigFile ++from pylorax.sysutils import flatconfig + import selinux + + def setup_logging(opts): +@@ -225,9 +225,8 @@ def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, + log.warning("/etc/os-release is missing, cannot determine platform id, falling back to %s", DEFAULT_PLATFORM_ID) + platform_id = DEFAULT_PLATFORM_ID + else: +- os_release = SimpleConfigFile("/etc/os-release") +- os_release.read() +- platform_id = os_release.get("PLATFORM_ID") or DEFAULT_PLATFORM_ID ++ os_release = flatconfig("/etc/os-release") ++ platform_id = os_release.get("PLATFORM_ID", DEFAULT_PLATFORM_ID) + log.info("Using %s for module_platform_id", platform_id) + conf.module_platform_id = platform_id + +-- +2.17.1 + diff --git a/lorax.spec b/lorax.spec index 0264589..9a8fef6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 29.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -15,6 +15,8 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Hopefully make lorax actually work without pyanaconda +Patch0: 0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch BuildRequires: python3-devel @@ -156,6 +158,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build @@ -230,6 +233,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Thu Aug 30 2018 Adam Williamson - 29.13-2 +- Backport upstream PR#451 to avoid undeclared pyanaconda dependency + * Wed Aug 29 2018 Brian C. Lane 29.13-1 - Update the example blueprints for rawhide (bcl@redhat.com) - Bump required dnf version to 3.2.0 for module_platform_id support (bcl@redhat.com) From 9ce2f293e712411d2afceaeeed6ec849af2b82ae Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 30 Aug 2018 15:17:20 -0700 Subject: [PATCH 003/203] Correct a bug in the patch from -2 --- 0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch | 6 +++--- lorax.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch b/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch index dba642d..cd0d987 100644 --- a/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch +++ b/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch @@ -1,4 +1,4 @@ -From a7c1245430597bcfaf595ffce70d16630ef4bfbe Mon Sep 17 00:00:00 2001 +From 3f4759a58ba87ed434dc0093bda817002ee2400d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 30 Aug 2018 11:31:55 -0700 Subject: [PATCH] Ditch all use of pyanaconda's simpleconfig @@ -99,7 +99,7 @@ index df4444dc..b7a4d1c6 100644 dbc.module_platform_id = platform_id diff --git a/src/pylorax/sysutils.py b/src/pylorax/sysutils.py -index c2f46f1e..1ecbac67 100644 +index c2f46f1e..9735a7ff 100644 --- a/src/pylorax/sysutils.py +++ b/src/pylorax/sysutils.py @@ -30,6 +30,8 @@ import pwd @@ -133,7 +133,7 @@ index c2f46f1e..1ecbac67 100644 + """ + with open (filename, 'r') as conffh: + conftext = "[main]\n" + conffh.read() -+ config = ConfigParser() ++ config = UnquotingConfigParser() + config.read_string(conftext) + return config['main'] diff --git a/src/sbin/lorax b/src/sbin/lorax diff --git a/lorax.spec b/lorax.spec index 9a8fef6..59996ba 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 29.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -233,6 +233,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Thu Aug 30 2018 Adam Williamson - 29.13-3 +- Correct a bug in the patch from -2 + * Thu Aug 30 2018 Adam Williamson - 29.13-2 - Backport upstream PR#451 to avoid undeclared pyanaconda dependency From d1ca11561e184ed3bfded69140b2ccaf709d0ae3 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 6 Sep 2018 10:02:33 -0700 Subject: [PATCH 004/203] - Add the create ISO component for ARMv7 (pbrobinson@gmail.com) - Don't activate default auto connections after switchroot (rvykydal@redhat.com) - Ignore a pylint warning about UnquotingConfigParser get args (bcl@redhat.com) - Ditch all use of pyanaconda's simpleconfig (awilliam@redhat.com) --- .gitignore | 1 + ...all-use-of-pyanaconda-s-simpleconfig.patch | 166 ------------------ lorax.spec | 17 +- sources | 2 +- 4 files changed, 9 insertions(+), 177 deletions(-) delete mode 100644 0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch diff --git a/.gitignore b/.gitignore index 83ce971..b050477 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,4 @@ /lorax-29.11.tar.gz /lorax-29.12.tar.gz /lorax-29.13.tar.gz +/lorax-29.14.tar.gz diff --git a/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch b/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch deleted file mode 100644 index cd0d987..0000000 --- a/0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 3f4759a58ba87ed434dc0093bda817002ee2400d Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 30 Aug 2018 11:31:55 -0700 -Subject: [PATCH] Ditch all use of pyanaconda's simpleconfig - -lorax uses pyanaconda's SimpleConfigParser in three different -places (twice with a copy that's been dumped into pylorax, once -by importing it), just to do a fairly simple job: read some -values out of /etc/os-release. The only value SimpleConfigParser -is adding over Python's own ConfigParser here is to read a file -with no section headers, and to unquote the values. The cost is -either a dependency on pyanaconda, or needing to copy the whole -of simpleparser plus some other utility bits from pyanaconda -into lorax. This seems like a bad trade-off. - -This changes the approach: we copy one very simple utility -function from pyanaconda (`unquote`), and do some very simple -wrapping of ConfigParser to handle reading a file without any -section headers, and returning unquoted values. This way we can -read what we need out of os-release without needing a dep on -pyanaconda or to copy lots of things from it into pylorax. - -Resolves: #449 -Resolves: #450 - -Signed-off-by: Adam Williamson ---- - src/pylorax/api/compose.py | 15 ++++++--------- - src/pylorax/api/dnfbase.py | 7 +++---- - src/pylorax/sysutils.py | 23 +++++++++++++++++++++++ - src/sbin/lorax | 7 +++---- - 4 files changed, 35 insertions(+), 17 deletions(-) - -diff --git a/src/pylorax/api/compose.py b/src/pylorax/api/compose.py -index c0ed3b7d..816ea535 100644 ---- a/src/pylorax/api/compose.py -+++ b/src/pylorax/api/compose.py -@@ -40,8 +40,6 @@ import pytoml as toml - import shutil - from uuid import uuid4 - --from pyanaconda.simpleconfig import SimpleConfigFile -- - # Use pykickstart to calculate disk image size - from pykickstart.parser import KickstartParser - from pykickstart.version import makeVersion -@@ -51,7 +49,7 @@ from pylorax.api.projects import ProjectsError - from pylorax.api.recipes import read_recipe_and_id - from pylorax.api.timestamp import TS_CREATED, write_timestamp - from pylorax.imgutils import default_image_name --from pylorax.sysutils import joinpaths -+from pylorax.sysutils import joinpaths, flatconfig - - - def test_templates(dbo, share_dir): -@@ -356,14 +354,13 @@ def start_build(cfg, dnflock, gitlock, branch, recipe_name, compose_type, test_m - # Get the title, project, and release version from the host - if not os.path.exists("/etc/os-release"): - log.error("/etc/os-release is missing, cannot determine product or release version") -- os_release = SimpleConfigFile("/etc/os-release") -- os_release.read() -+ os_release = flatconfig("/etc/os-release") - -- log.debug("os_release = %s", os_release) -+ log.debug("os_release = %s", dict(os_release.items())) - -- cfg_args["title"] = os_release.get("PRETTY_NAME") -- cfg_args["project"] = os_release.get("NAME") -- cfg_args["releasever"] = os_release.get("VERSION_ID") -+ cfg_args["title"] = os_release.get("PRETTY_NAME", "") -+ cfg_args["project"] = os_release.get("NAME", "") -+ cfg_args["releasever"] = os_release.get("VERSION_ID", "") - cfg_args["volid"] = "" - - cfg_args.update({ -diff --git a/src/pylorax/api/dnfbase.py b/src/pylorax/api/dnfbase.py -index df4444dc..b7a4d1c6 100644 ---- a/src/pylorax/api/dnfbase.py -+++ b/src/pylorax/api/dnfbase.py -@@ -26,7 +26,7 @@ import os - import shutil - - from pylorax import DEFAULT_PLATFORM_ID --from pylorax.simpleconfig import SimpleConfigFile -+from pylorax.sysutils import flatconfig - - def get_base_object(conf): - """Get the DNF object with settings from the config file -@@ -76,9 +76,8 @@ def get_base_object(conf): - log.warning("/etc/os-release is missing, cannot determine platform id, falling back to %s", DEFAULT_PLATFORM_ID) - platform_id = DEFAULT_PLATFORM_ID - else: -- os_release = SimpleConfigFile("/etc/os-release") -- os_release.read() -- platform_id = os_release.get("PLATFORM_ID") or DEFAULT_PLATFORM_ID -+ os_release = flatconfig("/etc/os-release") -+ platform_id = os_release.get("PLATFORM_ID", DEFAULT_PLATFORM_ID) - log.info("Using %s for module_platform_id", platform_id) - dbc.module_platform_id = platform_id - -diff --git a/src/pylorax/sysutils.py b/src/pylorax/sysutils.py -index c2f46f1e..9735a7ff 100644 ---- a/src/pylorax/sysutils.py -+++ b/src/pylorax/sysutils.py -@@ -30,6 +30,8 @@ import pwd - import grp - import glob - import shutil -+import shlex -+from configparser import ConfigParser - - from pylorax.executils import runcmd - -@@ -106,3 +108,24 @@ def remove(target): - - def linktree(src, dst): - runcmd(["/bin/cp", "-alx", src, dst]) -+ -+def unquote(s): -+ return ' '.join(shlex.split(s)) -+ -+class UnquotingConfigParser(ConfigParser): -+ """A ConfigParser, only with unquoting of the values.""" -+ def get(self, *args, **kwargs): -+ ret = super().get(*args, **kwargs) -+ if ret: -+ ret = unquote(ret) -+ return ret -+ -+def flatconfig(filename): -+ """Use UnquotingConfigParser to read a flat config file (without -+ section headers) by adding a section header. -+ """ -+ with open (filename, 'r') as conffh: -+ conftext = "[main]\n" + conffh.read() -+ config = UnquotingConfigParser() -+ config.read_string(conftext) -+ return config['main'] -diff --git a/src/sbin/lorax b/src/sbin/lorax -index ce21d8f5..30b9cadc 100755 ---- a/src/sbin/lorax -+++ b/src/sbin/lorax -@@ -35,7 +35,7 @@ import librepo - import pylorax - from pylorax import DRACUT_DEFAULT, DEFAULT_PLATFORM_ID - from pylorax.cmdline import lorax_parser --from pylorax.simpleconfig import SimpleConfigFile -+from pylorax.sysutils import flatconfig - import selinux - - def setup_logging(opts): -@@ -225,9 +225,8 @@ def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, - log.warning("/etc/os-release is missing, cannot determine platform id, falling back to %s", DEFAULT_PLATFORM_ID) - platform_id = DEFAULT_PLATFORM_ID - else: -- os_release = SimpleConfigFile("/etc/os-release") -- os_release.read() -- platform_id = os_release.get("PLATFORM_ID") or DEFAULT_PLATFORM_ID -+ os_release = flatconfig("/etc/os-release") -+ platform_id = os_release.get("PLATFORM_ID", DEFAULT_PLATFORM_ID) - log.info("Using %s for module_platform_id", platform_id) - conf.module_platform_id = platform_id - --- -2.17.1 - diff --git a/lorax.spec b/lorax.spec index 59996ba..2c88830 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 29.13 -Release: 3%{?dist} +Version: 29.14 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -15,8 +15,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Hopefully make lorax actually work without pyanaconda -Patch0: 0001-Ditch-all-use-of-pyanaconda-s-simpleconfig.patch BuildRequires: python3-devel @@ -158,7 +156,6 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build @@ -233,11 +230,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog -* Thu Aug 30 2018 Adam Williamson - 29.13-3 -- Correct a bug in the patch from -2 - -* Thu Aug 30 2018 Adam Williamson - 29.13-2 -- Backport upstream PR#451 to avoid undeclared pyanaconda dependency +* Thu Sep 06 2018 Brian C. Lane 29.14-1 +- Add the create ISO component for ARMv7 (pbrobinson@gmail.com) +- Don't activate default auto connections after switchroot (rvykydal@redhat.com) +- Ignore a pylint warning about UnquotingConfigParser get args (bcl@redhat.com) +- Ditch all use of pyanaconda's simpleconfig (awilliam@redhat.com) * Wed Aug 29 2018 Brian C. Lane 29.13-1 - Update the example blueprints for rawhide (bcl@redhat.com) diff --git a/sources b/sources index dea3cda..2980978 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-29.13.tar.gz) = 16a7188c0c0630a3e2415fcdf307140c998a9d7a1f60b5ceb88038028773ca598db91ed115b7c843f8369102c0ed517551c2b500778138cd76ad2eb516a0b4de +SHA512 (lorax-29.14.tar.gz) = 8634cbd960960cbae763b4b71c6a64c64bc59f3c4c8239c4b4a554bfe0fd6c5b525537edbbfbe9c7f2f0f75447ec085b1d38eec38e0902b3001c6f527504e055 From b97aa3bf95d285d6cffc0192ec891b839682e381 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 7 Sep 2018 10:11:25 -0700 Subject: [PATCH 005/203] - Add a Makefile target for building html docs using a rawhide environment (bcl@redhat.com) - Revert "Don't activate default auto connections after switchroot" (rvykydal@redhat.com) - Need to explicitly require python3-librepo (#1626413) (bcl@redhat.com) - New lorax documentation - 29.14 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b050477..1975dbf 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,4 @@ /lorax-29.12.tar.gz /lorax-29.13.tar.gz /lorax-29.14.tar.gz +/lorax-29.15.tar.gz diff --git a/lorax.spec b/lorax.spec index 2c88830..f4ef13f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 29.14 +Version: 29.15 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -47,7 +47,7 @@ Requires: libselinux-python3 Requires: python3-mako Requires: python3-kickstart Requires: python3-dnf >= 3.2.0 - +Requires: python3-librepo %if 0%{?fedora} # Fedora specific deps @@ -230,6 +230,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Fri Sep 07 2018 Brian C. Lane 29.15-1 +- Add a Makefile target for building html docs using a rawhide environment (bcl@redhat.com) +- Revert "Don't activate default auto connections after switchroot" (rvykydal@redhat.com) +- Need to explicitly require python3-librepo (#1626413) (bcl@redhat.com) +- New lorax documentation - 29.14 (bcl@redhat.com) + * Thu Sep 06 2018 Brian C. Lane 29.14-1 - Add the create ISO component for ARMv7 (pbrobinson@gmail.com) - Don't activate default auto connections after switchroot (rvykydal@redhat.com) diff --git a/sources b/sources index 2980978..707fc58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-29.14.tar.gz) = 8634cbd960960cbae763b4b71c6a64c64bc59f3c4c8239c4b4a554bfe0fd6c5b525537edbbfbe9c7f2f0f75447ec085b1d38eec38e0902b3001c6f527504e055 +SHA512 (lorax-29.15.tar.gz) = 2e398b4bb5b25c43a26ebe5d11eb17c5472532d512908e5d1f0d301b1f142ddb3788f916c517d714f38fb9b507307a1d496de4f3c42a3cd0aff891aa2ee6dc1a From d924be0c9ee29c06903042bd3b714ffafaf35b5e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 26 Sep 2018 19:40:37 -0700 Subject: [PATCH 006/203] Backport PR #480 for DNF 3.6 compatibility (RHBZ #1595917) --- ...end-to-DNF-config-value-that-can-t-t.patch | 68 +++++++++++++++++++ lorax.spec | 10 ++- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch diff --git a/0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch b/0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch new file mode 100644 index 0000000..67bf97d --- /dev/null +++ b/0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch @@ -0,0 +1,68 @@ +From a7c2d7d66b1a4df5b06a0c5b401558531199f791 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 26 Sep 2018 18:14:06 -0700 +Subject: [PATCH] Don't try to append to DNF config value that can't take it + +See https://bugzilla.redhat.com/show_bug.cgi?id=1595917 and +https://github.com/rpm-software-management/dnf/pull/1200 for +more on this. Briefly, DNF before 3.0 presented this config +value as a list...and mutating it worked. DNF from 3.0 until +3.6 presented it as a list...mutating it didn't work, but also +didn't *fail*, so this has actually not been doing anything on +DNF 3.x but we haven't noticed. + +In DNF 3.6 values like this are presented as tuples instead of +lists, to try and catch usages like this, and it worked! We +need to change this one. + +There is an additional weirdness here. tsflags is actually, in +libdnf terms, an OptionStringListAppend option: that means that +when something tries to *set* its value, the new value is just +appended to the existing list of values. This is very weird +behaviour when you're interacting with it like this, but +happens to be quite useful, as we can just 'set' the value to +a list like this and it will actually get appended (which is +what we want), and this one syntax happens to work correctly in +DNF 2.x, 3.0 through 3.5.1, and 3.6. + +Signed-off-by: Adam Williamson +--- + src/pylorax/api/dnfbase.py | 5 ++++- + src/sbin/lorax | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/pylorax/api/dnfbase.py b/src/pylorax/api/dnfbase.py +index b7a4d1c6..1d7f32cc 100644 +--- a/src/pylorax/api/dnfbase.py ++++ b/src/pylorax/api/dnfbase.py +@@ -56,7 +56,10 @@ def get_base_object(conf): + dbc.reposdir = [repodir] + dbc.install_weak_deps = False + dbc.prepend_installroot('persistdir') +- dbc.tsflags.append('nodocs') ++ # this is a weird 'AppendOption' thing that, when you set it, ++ # actually appends. Doing this adds 'nodocs' to the existing list ++ # of values, over in libdnf, it does not replace the existing values. ++ dbc.tsflags = ['nodocs'] + + if conf.get_default("dnf", "proxy", None): + dbc.proxy = conf.get("dnf", "proxy") +diff --git a/src/sbin/lorax b/src/sbin/lorax +index 30b9cadc..2729757d 100755 +--- a/src/sbin/lorax ++++ b/src/sbin/lorax +@@ -212,7 +212,10 @@ def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, + conf.releasever = releasever + conf.installroot = installroot + conf.prepend_installroot('persistdir') +- conf.tsflags.append('nodocs') ++ # this is a weird 'AppendOption' thing that, when you set it, ++ # actually appends. Doing this adds 'nodocs' to the existing list ++ # of values, over in libdnf, it does not replace the existing values. ++ conf.tsflags = ['nodocs'] + + if proxy: + conf.proxy = proxy +-- +2.19.0 + diff --git a/lorax.spec b/lorax.spec index f4ef13f..a2f11ba 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 29.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -15,6 +15,10 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# More DNF config interface shenanigans... +# https://github.com/weldr/lorax/pull/480 +# https://bugzilla.redhat.com/show_bug.cgi?id=1595917 +Patch0: 0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch BuildRequires: python3-devel @@ -156,6 +160,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build @@ -230,6 +235,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Wed Sep 26 2018 Adam Williamson - 29.15-2 +- Backport PR #480 for DNF 3.6 compatibility (RHBZ #1595917) + * Fri Sep 07 2018 Brian C. Lane 29.15-1 - Add a Makefile target for building html docs using a rawhide environment (bcl@redhat.com) - Revert "Don't activate default auto connections after switchroot" (rvykydal@redhat.com) From a8de4ffe832f10e8505fd2b7c70e59ba4578a5d0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 2 Oct 2018 16:44:40 -0700 Subject: [PATCH 007/203] - Add beakerlib to Dockerfile.test (bcl@redhat.com) - Adjust the new templates for locked root (bcl@redhat.com) - Adjust projects test for DNF 3.6.1 tuple issue (bcl@redhat.com) - Don't try to append to DNF config value that can't take it (awilliam@redhat.com) - Always update repo metadata when building an image (bcl@redhat.com) - Add a test for repo metadata expiration (bcl@redhat.com) - Add tests for setting root password and ssh key with blueprints (bcl@redhat.com) - Use rootpw for setting the root password instead of user (bcl@redhat.com) - Lock the root account, except on live-iso (bcl@redhat.com) - Add new compose types to compose sanity test (dshea@redhat.com) - Add virt guest agents to the qcow2 compose (dshea@redhat.com) - Add a vmdk compose type. (dshea@redhat.com) - Add a vhd compose type for Azure images (dshea@redhat.com) - Add an ami compose type for AWS images (dshea@redhat.com) - Remove --fstype from the generated part line (dshea@redhat.com) - Also run `make check` on travis (lars@karlitski.net) - Fix pylint errors and warnings (lars@karlitski.net) - New cli test covering basic compose commands (atodorov@redhat.com) - Update glusterfs to 5.* (atodorov@redhat.com) - Execute bash tests for composer-cli (atodorov@redhat.com) - Rename composer-cli to composer (lars@karlitski.net) - Include python3-pyatspi on boot.iso (#1506595) (bcl@redhat.com) - Start a HACKING.md file and document how to run the tests (stefw@redhat.com) - tests: Fix tests so they run on Fedora 28 (stefw@redhat.com) - Ignore files created by tests (stefw@redhat.com) - Makefile: Fix the 'make install' target (stefw@redhat.com) - Replace CJK fonts with Google Noto CJK (akira@tagoh.org) - Fix a DeprecationWarning (dshea@redhat.com) - Fix the expected versions of blueprint components (dshea@redhat.com) - Switch the test container back to rawhide (dshea@redhat.com) --- .gitignore | 1 + lorax.spec | 48 +++++++++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 1975dbf..d8fc810 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,4 @@ /lorax-29.13.tar.gz /lorax-29.14.tar.gz /lorax-29.15.tar.gz +/lorax-30.0.tar.gz diff --git a/lorax.spec b/lorax.spec index a2f11ba..1fe8e11 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 29.15 -Release: 2%{?dist} +Version: 30.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -15,10 +15,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# More DNF config interface shenanigans... -# https://github.com/weldr/lorax/pull/480 -# https://bugzilla.redhat.com/show_bug.cgi?id=1595917 -Patch0: 0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch BuildRequires: python3-devel @@ -160,7 +156,6 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build @@ -230,13 +225,44 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %attr(0771, weldr, weldr) %{_sharedstatedir}/lorax/composer/blueprints/* %files -n composer-cli -%{_bindir}/composer-cli +%{_bindir}/composer %{python3_sitelib}/composer/* -%{_sysconfdir}/bash_completion.d/composer-cli +%{_sysconfdir}/bash_completion.d/composer %changelog -* Wed Sep 26 2018 Adam Williamson - 29.15-2 -- Backport PR #480 for DNF 3.6 compatibility (RHBZ #1595917) +* Tue Oct 02 2018 Brian C. Lane 30.0-1 +- Add beakerlib to Dockerfile.test (bcl@redhat.com) +- Adjust the new templates for locked root (bcl@redhat.com) +- Adjust projects test for DNF 3.6.1 tuple issue (bcl@redhat.com) +- Don't try to append to DNF config value that can't take it + (awilliam@redhat.com) +- Always update repo metadata when building an image (bcl@redhat.com) +- Add a test for repo metadata expiration (bcl@redhat.com) +- Add tests for setting root password and ssh key with blueprints + (bcl@redhat.com) +- Use rootpw for setting the root password instead of user (bcl@redhat.com) +- Lock the root account, except on live-iso (bcl@redhat.com) +- Add new compose types to compose sanity test (dshea@redhat.com) +- Add virt guest agents to the qcow2 compose (dshea@redhat.com) +- Add a vmdk compose type. (dshea@redhat.com) +- Add a vhd compose type for Azure images (dshea@redhat.com) +- Add an ami compose type for AWS images (dshea@redhat.com) +- Remove --fstype from the generated part line (dshea@redhat.com) +- Also run `make check` on travis (lars@karlitski.net) +- Fix pylint errors and warnings (lars@karlitski.net) +- New cli test covering basic compose commands (atodorov@redhat.com) +- Update glusterfs to 5.* (atodorov@redhat.com) +- Execute bash tests for composer-cli (atodorov@redhat.com) +- Rename composer-cli to composer (lars@karlitski.net) +- Include python3-pyatspi on boot.iso (#1506595) (bcl@redhat.com) +- Start a HACKING.md file and document how to run the tests (stefw@redhat.com) +- tests: Fix tests so they run on Fedora 28 (stefw@redhat.com) +- Ignore files created by tests (stefw@redhat.com) +- Makefile: Fix the 'make install' target (stefw@redhat.com) +- Replace CJK fonts with Google Noto CJK (akira@tagoh.org) +- Fix a DeprecationWarning (dshea@redhat.com) +- Fix the expected versions of blueprint components (dshea@redhat.com) +- Switch the test container back to rawhide (dshea@redhat.com) * Fri Sep 07 2018 Brian C. Lane 29.15-1 - Add a Makefile target for building html docs using a rawhide environment (bcl@redhat.com) diff --git a/sources b/sources index 707fc58..12fcdb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-29.15.tar.gz) = 2e398b4bb5b25c43a26ebe5d11eb17c5472532d512908e5d1f0d301b1f142ddb3788f916c517d714f38fb9b507307a1d496de4f3c42a3cd0aff891aa2ee6dc1a +SHA512 (lorax-30.0.tar.gz) = 4a284ab77a10ae2f9c77f4497a3593716de8e11e4a95e217ace9a1ac213f173ac46ac2e1c73590e09e321af19d08d6c6b3da60e24db4b3f567df8c2b0853063f From 261de08905278f8ab8512da79d6d6f3392471d26 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 3 Oct 2018 16:57:34 -0700 Subject: [PATCH 008/203] - Report an error if the blueprint doesn't exist (bcl@redhat.com) - cli: Clarify error message for unprivileged access (lars@karlitski.net) - Write a rootpw line if no root customizations in the blueprint (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d8fc810..ac55efa 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,4 @@ /lorax-29.14.tar.gz /lorax-29.15.tar.gz /lorax-30.0.tar.gz +/lorax-30.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 1fe8e11..d82ed68 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.0 +Version: 30.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -230,6 +230,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer %changelog +* Wed Oct 03 2018 Brian C. Lane 30.1-1 +- Report an error if the blueprint doesn't exist (bcl@redhat.com) +- cli: Clarify error message for unprivileged access (lars@karlitski.net) +- Write a rootpw line if no root customizations in the blueprint (bcl@redhat.com) + * Tue Oct 02 2018 Brian C. Lane 30.0-1 - Add beakerlib to Dockerfile.test (bcl@redhat.com) - Adjust the new templates for locked root (bcl@redhat.com) diff --git a/sources b/sources index 12fcdb9..cdbe884 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.0.tar.gz) = 4a284ab77a10ae2f9c77f4497a3593716de8e11e4a95e217ace9a1ac213f173ac46ac2e1c73590e09e321af19d08d6c6b3da60e24db4b3f567df8c2b0853063f +SHA512 (lorax-30.1.tar.gz) = b5c7b059a8a634911ce5c65b1d839197eac3f6b96862932520a34584132fd90adc3a8a70beae6034546ec371ac1f167bb6b559ced00cf87812d59ed4f2c7bce2 From 52194d0f1538ee874d245b1e449eda870764fc13 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 5 Oct 2018 14:44:44 -0700 Subject: [PATCH 009/203] - Work around dnf problem with multiple repos (bcl@redhat.com) - Add and enable cloud-init for ami images (lars@karlitski.net) - Make no-virt generated images sparser (dshea@redhat.com) - New lorax documentation - 30.1 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ac55efa..edbb355 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,4 @@ /lorax-29.15.tar.gz /lorax-30.0.tar.gz /lorax-30.1.tar.gz +/lorax-30.2.tar.gz diff --git a/lorax.spec b/lorax.spec index d82ed68..a7da09a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.1 +Version: 30.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -230,6 +230,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer %changelog +* Fri Oct 05 2018 Brian C. Lane 30.2-1 +- Work around dnf problem with multiple repos (bcl@redhat.com) +- Add and enable cloud-init for ami images (lars@karlitski.net) +- Make no-virt generated images sparser (dshea@redhat.com) +- New lorax documentation - 30.1 (bcl@redhat.com) + * Wed Oct 03 2018 Brian C. Lane 30.1-1 - Report an error if the blueprint doesn't exist (bcl@redhat.com) - cli: Clarify error message for unprivileged access (lars@karlitski.net) diff --git a/sources b/sources index cdbe884..eb9cb9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.1.tar.gz) = b5c7b059a8a634911ce5c65b1d839197eac3f6b96862932520a34584132fd90adc3a8a70beae6034546ec371ac1f167bb6b559ced00cf87812d59ed4f2c7bce2 +SHA512 (lorax-30.2.tar.gz) = 1fe59f2844953b3eede0d405f659804aee1a7492baae475a13c14a1270b9ab8feb5ac0619808fe723695f09a807c8f8c9a4c5189fdcfb1919d97aeaa1bdd10d4 From 3e0806e6dfb21ee9f2a82eb0e0988d5d4d271bd1 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 8 Oct 2018 15:41:11 -0700 Subject: [PATCH 010/203] - Update cli tests to use composer-cli name (bcl@redhat.com) - Revert "Rename composer-cli to composer" (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index edbb355..784a053 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ /lorax-30.0.tar.gz /lorax-30.1.tar.gz /lorax-30.2.tar.gz +/lorax-30.3.tar.gz diff --git a/lorax.spec b/lorax.spec index a7da09a..a7f427b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.2 +Version: 30.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -225,11 +225,15 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %attr(0771, weldr, weldr) %{_sharedstatedir}/lorax/composer/blueprints/* %files -n composer-cli -%{_bindir}/composer +%{_bindir}/composer-cli %{python3_sitelib}/composer/* -%{_sysconfdir}/bash_completion.d/composer +%{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Mon Oct 08 2018 Brian C. Lane 30.3-1 +- Update cli tests to use composer-cli name (bcl@redhat.com) +- Revert "Rename composer-cli to composer" (bcl@redhat.com) + * Fri Oct 05 2018 Brian C. Lane 30.2-1 - Work around dnf problem with multiple repos (bcl@redhat.com) - Add and enable cloud-init for ami images (lars@karlitski.net) diff --git a/sources b/sources index eb9cb9b..d10fd0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.2.tar.gz) = 1fe59f2844953b3eede0d405f659804aee1a7492baae475a13c14a1270b9ab8feb5ac0619808fe723695f09a807c8f8c9a4c5189fdcfb1919d97aeaa1bdd10d4 +SHA512 (lorax-30.3.tar.gz) = 24d48498ecdbfec354e1e8009de4e46a236cd184be28336b27cde4b4acbbfb1e6e8c4d155ee5ed0a5fa81207f4770707bc27c78dd45d5a1bfaea052c6cb834da From d57e0f08ac2b1f70c9683855b00da084c6ccd5ce Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 9 Oct 2018 11:37:05 -0700 Subject: [PATCH 011/203] - Add an openstack image type (bcl@redhat.com) - Add cloud-init to vhd images. (dshea@redhat.com) - Replace /etc/machine-id with an empty file (dshea@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 784a053..0efcc49 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,4 @@ /lorax-30.1.tar.gz /lorax-30.2.tar.gz /lorax-30.3.tar.gz +/lorax-30.4.tar.gz diff --git a/lorax.spec b/lorax.spec index a7f427b..cc7d8a3 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.3 +Version: 30.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -230,6 +230,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Tue Oct 09 2018 Brian C. Lane 30.4-1 +- Add an openstack image type (bcl@redhat.com) +- Add cloud-init to vhd images. (dshea@redhat.com) +- Replace /etc/machine-id with an empty file (dshea@redhat.com) + * Mon Oct 08 2018 Brian C. Lane 30.3-1 - Update cli tests to use composer-cli name (bcl@redhat.com) - Revert "Rename composer-cli to composer" (bcl@redhat.com) diff --git a/sources b/sources index d10fd0f..8999048 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.3.tar.gz) = 24d48498ecdbfec354e1e8009de4e46a236cd184be28336b27cde4b4acbbfb1e6e8c4d155ee5ed0a5fa81207f4770707bc27c78dd45d5a1bfaea052c6cb834da +SHA512 (lorax-30.4.tar.gz) = de345f1241400fecae7331c8294091c6b7f8e29fd07ec94428b24b92aaf23cdfc7e864fbcc6ea7c5fd2dffe03e91a514672d6a964107d93a7a285849311985df From 6456a084d22a2fb0b3c6ef058b2caa139ed96597 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 12 Oct 2018 15:58:04 -0700 Subject: [PATCH 012/203] - Update depsolving with suggestions from dnf (#1636239) (bcl@redhat.com) - Disable false context-manager pylint error (bcl@redhat.com) - Fix directory creation for blueprints (bcl@redhat.com) - Update the tests for new make_dnf_dir arguments. (bcl@redhat.com) - Change make_dnf_dirs to be run as root (bcl@redhat.com) - Fix vhd images (vponcova@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0efcc49..133b113 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,4 @@ /lorax-30.2.tar.gz /lorax-30.3.tar.gz /lorax-30.4.tar.gz +/lorax-30.5.tar.gz diff --git a/lorax.spec b/lorax.spec index cc7d8a3..766700d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.4 +Version: 30.5 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -230,6 +230,14 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Fri Oct 12 2018 Brian C. Lane 30.5-1 +- Update depsolving with suggestions from dnf (#1636239) (bcl@redhat.com) +- Disable false context-manager pylint error (bcl@redhat.com) +- Fix directory creation for blueprints (bcl@redhat.com) +- Update the tests for new make_dnf_dir arguments. (bcl@redhat.com) +- Change make_dnf_dirs to be run as root (bcl@redhat.com) +- Fix vhd images (vponcova@redhat.com) + * Tue Oct 09 2018 Brian C. Lane 30.4-1 - Add an openstack image type (bcl@redhat.com) - Add cloud-init to vhd images. (dshea@redhat.com) diff --git a/sources b/sources index 8999048..2b12008 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.4.tar.gz) = de345f1241400fecae7331c8294091c6b7f8e29fd07ec94428b24b92aaf23cdfc7e864fbcc6ea7c5fd2dffe03e91a514672d6a964107d93a7a285849311985df +SHA512 (lorax-30.5.tar.gz) = e814717973687bf447a1587e3142c93d50f1698ab24ab099e2c7f28b738ad451a5a0cd3e526ebc3a90e0aaf9cb3c0e473472fb86eb223077414186fd548fe44a From b15b4e3eaa4dd7d4e2c2c5ff258bf2f128a5ca72 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 29 Oct 2018 16:10:02 -0700 Subject: [PATCH 013/203] - new test: build and deploy images on AWS (atodorov@redhat.com) - Disable execution of new tests which need Docker privileged mode (atodorov@redhat.com) - New tests: build ext4-filesystem and partitioned-disk composes (atodorov@redhat.com) - Update tmux version in tests (atodorov@redhat.com) - Add tests for ltmpl.py (bcl@redhat.com) - Move get_dnf_base_object into a module (bcl@redhat.com) - New lorax documentation - 30.5 (bcl@redhat.com) - Build manpages for composer-cli and lorax-composer (bcl@redhat.com) - Add --squashfs-only option to drop inner rootfs.img layer (marmarek@invisiblethingslab.com) - Update php version to 7.3.* (bcl@redhat.com) - Update the projects tests to use DNF Repo object (bcl@redhat.com) - dnf changed the type of gpgkey to a tuple (bcl@redhat.com) - Install python3-librepo in the test container (bcl@redhat.com) - lorax: Log when SOURCE_DATE_EPOCH is used for the current time (bcl@redhat.com) - Drop non-determinism from default templates (marmarek@invisiblethingslab.com) - Use SOURCE_DATE_EPOCH for volumeid of efi boot image (marmarek@invisiblethingslab.com) - Preserve timestamps when building fs image (marmarek@invisiblethingslab.com) - Use SOURCE_DATE_EPOCH for metadata timestamps (marmarek@invisiblethingslab.com) --- .gitignore | 1 + lorax.spec | 22 +++++++++++++++++++++- sources | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 133b113..4db4fc7 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,4 @@ /lorax-30.3.tar.gz /lorax-30.4.tar.gz /lorax-30.5.tar.gz +/lorax-30.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 766700d..2b08388 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.5 +Version: 30.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -230,6 +230,26 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Mon Oct 29 2018 Brian C. Lane 30.6-1 +- new test: build and deploy images on AWS (atodorov@redhat.com) +- Disable execution of new tests which need Docker privileged mode (atodorov@redhat.com) +- New tests: build ext4-filesystem and partitioned-disk composes (atodorov@redhat.com) +- Update tmux version in tests (atodorov@redhat.com) +- Add tests for ltmpl.py (bcl@redhat.com) +- Move get_dnf_base_object into a module (bcl@redhat.com) +- New lorax documentation - 30.5 (bcl@redhat.com) +- Build manpages for composer-cli and lorax-composer (bcl@redhat.com) +- Add --squashfs-only option to drop inner rootfs.img layer (marmarek@invisiblethingslab.com) +- Update php version to 7.3.* (bcl@redhat.com) +- Update the projects tests to use DNF Repo object (bcl@redhat.com) +- dnf changed the type of gpgkey to a tuple (bcl@redhat.com) +- Install python3-librepo in the test container (bcl@redhat.com) +- lorax: Log when SOURCE_DATE_EPOCH is used for the current time (bcl@redhat.com) +- Drop non-determinism from default templates (marmarek@invisiblethingslab.com) +- Use SOURCE_DATE_EPOCH for volumeid of efi boot image (marmarek@invisiblethingslab.com) +- Preserve timestamps when building fs image (marmarek@invisiblethingslab.com) +- Use SOURCE_DATE_EPOCH for metadata timestamps (marmarek@invisiblethingslab.com) + * Fri Oct 12 2018 Brian C. Lane 30.5-1 - Update depsolving with suggestions from dnf (#1636239) (bcl@redhat.com) - Disable false context-manager pylint error (bcl@redhat.com) diff --git a/sources b/sources index 2b12008..be62f3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.5.tar.gz) = e814717973687bf447a1587e3142c93d50f1698ab24ab099e2c7f28b738ad451a5a0cd3e526ebc3a90e0aaf9cb3c0e473472fb86eb223077414186fd548fe44a +SHA512 (lorax-30.6.tar.gz) = 21ff5360590ea1182db258254f62813789534a8dde92eaf02c5943d8f7bd5fdbeeed2870be0fbc167d8fb92d277028583bf80ea4a149d918fa95875277c04620 From d7daa042e4bcfe639a92e70c1a0da5c05b20a515 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 29 Nov 2018 14:00:18 -0800 Subject: [PATCH 014/203] - lorax-composer: Install selinux-policy-targeted in images (bcl@redhat.com) - Remove setfiles from mkrootfsimage (bcl@redhat.com) - New lorax documentation - 30.7 (bcl@redhat.com) - Remove SELinux Permissive checks (bcl@redhat.com) - Drop minor version from php package in blueprint (atodorov@redhat.com) - Use a temporary shared dir when testing (atodorov@redhat.com) - Copy blueprints used for testing to temporary directory (atodorov@redhat.com) - Add make targets for Jenkins (atodorov@redhat.com) - Add --no-system-repos to lorax-composer (bcl@redhat.com) - Install grubby-deprecated package for ARMv7 (javierm@redhat.com) - Teach test_cli.sh to execute test scripts via arguments (atodorov@redhat.com) - new test: build an image and deploy it on Azure (atodorov@redhat.com) - Fix typo in comment (atodorov@redhat.com) - Fix reporting of coverage results to coverall.io (bcl@redhat.com) - For OpenStack build image with rng-tools installed (atodorov@redhat.com) - Add tests for partitioned disk images (bcl@redhat.com) - Create a kpartx_disk_img function (bcl@redhat.com) - Add tests for pylorax.imgutils (bcl@redhat.com) - Add tests to test_creator.py (bcl@redhat.com) - Fix make_appliance and the libvirt.tmpl (bcl@redhat.com) - Add some tests for creator.py (bcl@redhat.com) - tests: Add executils test (bcl@redhat.com) - tests: Add sysutils test (bcl@redhat.com) - tests: Add discinfo test (bcl@redhat.com) - tests: Add treeinfo test (bcl@redhat.com) - Stop using build to run the tests, allow using podman (bcl@redhat.com) - new test: build and deploy an image in OpenStack (atodorov@redhat.com) - Fix typos in VM_NAME and cleanup command (atodorov@redhat.com) - new test: build and deploy images on vSphere (atodorov@redhat.com) - Update docs with info about ssh keys (atodorov@redhat.com) --- .gitignore | 1 + lorax.spec | 36 +++++++++++++++++++++++++++++++++++- sources | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4db4fc7..85f4649 100644 --- a/.gitignore +++ b/.gitignore @@ -147,3 +147,4 @@ /lorax-30.4.tar.gz /lorax-30.5.tar.gz /lorax-30.6.tar.gz +/lorax-30.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 2b08388..dcea613 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.6 +Version: 30.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -37,8 +37,10 @@ Requires: module-init-tools Requires: parted Requires: squashfs-tools >= 4.2 Requires: util-linux +Requires: xz-lzma-compat Requires: xz Requires: pigz +Requires: pbzip2 Requires: dracut >= 030 Requires: kpartx @@ -230,6 +232,38 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Thu Nov 29 2018 Brian C. Lane 30.7-1 +- lorax-composer: Install selinux-policy-targeted in images (bcl@redhat.com) +- Remove setfiles from mkrootfsimage (bcl@redhat.com) +- New lorax documentation - 30.7 (bcl@redhat.com) +- Remove SELinux Permissive checks (bcl@redhat.com) +- Drop minor version from php package in blueprint (atodorov@redhat.com) +- Use a temporary shared dir when testing (atodorov@redhat.com) +- Copy blueprints used for testing to temporary directory (atodorov@redhat.com) +- Add make targets for Jenkins (atodorov@redhat.com) +- Add --no-system-repos to lorax-composer (bcl@redhat.com) +- Install grubby-deprecated package for ARMv7 (javierm@redhat.com) +- Teach test_cli.sh to execute test scripts via arguments (atodorov@redhat.com) +- new test: build an image and deploy it on Azure (atodorov@redhat.com) +- Fix typo in comment (atodorov@redhat.com) +- Fix reporting of coverage results to coverall.io (bcl@redhat.com) +- For OpenStack build image with rng-tools installed (atodorov@redhat.com) +- Add tests for partitioned disk images (bcl@redhat.com) +- Create a kpartx_disk_img function (bcl@redhat.com) +- Add tests for pylorax.imgutils (bcl@redhat.com) +- Add tests to test_creator.py (bcl@redhat.com) +- Fix make_appliance and the libvirt.tmpl (bcl@redhat.com) +- Add some tests for creator.py (bcl@redhat.com) +- tests: Add executils test (bcl@redhat.com) +- tests: Add sysutils test (bcl@redhat.com) +- tests: Add discinfo test (bcl@redhat.com) +- tests: Add treeinfo test (bcl@redhat.com) +- Stop using build to run the tests, allow using podman (bcl@redhat.com) +- new test: build and deploy an image in OpenStack (atodorov@redhat.com) +- Fix typos in VM_NAME and cleanup command (atodorov@redhat.com) +- new test: build and deploy images on vSphere (atodorov@redhat.com) +- Update docs with info about ssh keys (atodorov@redhat.com) + * Mon Oct 29 2018 Brian C. Lane 30.6-1 - new test: build and deploy images on AWS (atodorov@redhat.com) - Disable execution of new tests which need Docker privileged mode (atodorov@redhat.com) diff --git a/sources b/sources index be62f3d..5066602 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.6.tar.gz) = 21ff5360590ea1182db258254f62813789534a8dde92eaf02c5943d8f7bd5fdbeeed2870be0fbc167d8fb92d277028583bf80ea4a149d918fa95875277c04620 +SHA512 (lorax-30.7.tar.gz) = 6dc2e79c7521677ad2500b4a5993a4cd02b6419803011994c15553f0b900f41f0b9b94cc2475d682e5ad912d66a1f816c292062cda7cbd8fdd5527c19a3dea52 From a361142864eaecd7efdf3f578aa4ab31ff446ce9 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 6 Dec 2018 16:13:05 -0800 Subject: [PATCH 015/203] - lorax-composer: Handle packages with multiple builds (bcl@redhat.com) - lorax-composer: Check the queue and results at startup (bcl@redhat.com) - Teach OpenStack test to distinguish between RHEL and Fedora (atodorov@redhat.com) - Use full path for Azure playbook as well (atodorov@redhat.com) - Use a temporary dir for ssh keys during testing (atodorov@redhat.com) - Update V_DATASTORE b/c defaults appear to have been changed (atodorov@redhat.com) - Clone pyvmomi samples in the correct directory (atodorov@redhat.com) - Use full path when pushing toml files during testing (atodorov@redhat.com) - Add empty ci_after_success target for Jenkins (atodorov@redhat.com) - Implicitly specify ssh key directory/files for testing (atodorov@redhat.com) - [test] Clean up containers.json (atodorov@redhat.com) - Teach AWS test to distinguish between RHEL and Fedora (atodorov@redhat.com) --- .gitignore | 1 + lorax.spec | 16 +++++++++++++++- sources | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85f4649..892cbca 100644 --- a/.gitignore +++ b/.gitignore @@ -148,3 +148,4 @@ /lorax-30.5.tar.gz /lorax-30.6.tar.gz /lorax-30.7.tar.gz +/lorax-30.8.tar.gz diff --git a/lorax.spec b/lorax.spec index dcea613..acadcb1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.7 +Version: 30.8 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -232,6 +232,20 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Thu Dec 06 2018 Brian C. Lane 30.8-1 +- lorax-composer: Handle packages with multiple builds (bcl@redhat.com) +- lorax-composer: Check the queue and results at startup (bcl@redhat.com) +- Teach OpenStack test to distinguish between RHEL and Fedora (atodorov@redhat.com) +- Use full path for Azure playbook as well (atodorov@redhat.com) +- Use a temporary dir for ssh keys during testing (atodorov@redhat.com) +- Update V_DATASTORE b/c defaults appear to have been changed (atodorov@redhat.com) +- Clone pyvmomi samples in the correct directory (atodorov@redhat.com) +- Use full path when pushing toml files during testing (atodorov@redhat.com) +- Add empty ci_after_success target for Jenkins (atodorov@redhat.com) +- Implicitly specify ssh key directory/files for testing (atodorov@redhat.com) +- [test] Clean up containers.json (atodorov@redhat.com) +- Teach AWS test to distinguish between RHEL and Fedora (atodorov@redhat.com) + * Thu Nov 29 2018 Brian C. Lane 30.7-1 - lorax-composer: Install selinux-policy-targeted in images (bcl@redhat.com) - Remove setfiles from mkrootfsimage (bcl@redhat.com) diff --git a/sources b/sources index 5066602..b29acb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.7.tar.gz) = 6dc2e79c7521677ad2500b4a5993a4cd02b6419803011994c15553f0b900f41f0b9b94cc2475d682e5ad912d66a1f816c292062cda7cbd8fdd5527c19a3dea52 +SHA512 (lorax-30.8.tar.gz) = faa11267764b11d4a2473cafa7ef3cb141cc899a2d29cdd1f0eb1ee43c4ed8b2f4eb6ddec5e9598aed6d7680c890fb1622f76707ae5fd017f85dd248b002eaa3 From cbcdf63ec1afe5f92c0345ef25253a7d887ae64d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 17 Dec 2018 16:46:13 -0800 Subject: [PATCH 016/203] - lorax: Save information about rootfs filesystem size and usage (bcl@redhat.com) - Turn on signed tags when using tito. (bcl@redhat.com) - lorax-composer: Cancel running Anaconda process (bcl@redhat.com) - Add cancel_func to virt and novirt_install functions (bcl@redhat.com) - lorax-composer: Check for STATUS before deleting (bcl@redhat.com) - Check for existing CANCEL request, and exit on FINISHED (bcl@redhat.com) - tests: use the first IP address if more than 1 retruned from OpenStack (atodorov@redhat.com) - tests: remove a debugging command (atodorov@redhat.com) - Add openstack to the image type list in the docs (dshea@redhat.com) --- .gitignore | 1 + lorax.spec | 13 ++++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 892cbca..0477e13 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,4 @@ /lorax-30.6.tar.gz /lorax-30.7.tar.gz /lorax-30.8.tar.gz +/lorax-30.9.tar.gz diff --git a/lorax.spec b/lorax.spec index acadcb1..ae266b6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.8 +Version: 30.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -232,6 +232,17 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Mon Dec 17 2018 Brian C. Lane 30.9-1 +- lorax: Save information about rootfs filesystem size and usage (bcl@redhat.com) +- Turn on signed tags when using tito. (bcl@redhat.com) +- lorax-composer: Cancel running Anaconda process (bcl@redhat.com) +- Add cancel_func to virt and novirt_install functions (bcl@redhat.com) +- lorax-composer: Check for STATUS before deleting (bcl@redhat.com) +- Check for existing CANCEL request, and exit on FINISHED (bcl@redhat.com) +- tests: use the first IP address if more than 1 retruned from OpenStack (atodorov@redhat.com) +- tests: remove a debugging command (atodorov@redhat.com) +- Add openstack to the image type list in the docs (dshea@redhat.com) + * Thu Dec 06 2018 Brian C. Lane 30.8-1 - lorax-composer: Handle packages with multiple builds (bcl@redhat.com) - lorax-composer: Check the queue and results at startup (bcl@redhat.com) diff --git a/sources b/sources index b29acb4..436eec7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.8.tar.gz) = faa11267764b11d4a2473cafa7ef3cb141cc899a2d29cdd1f0eb1ee43c4ed8b2f4eb6ddec5e9598aed6d7680c890fb1622f76707ae5fd017f85dd248b002eaa3 +SHA512 (lorax-30.9.tar.gz) = 0f980d50c47340858ff5df35ced078573960f15788e3a8d9003dd72025104af3635955eecc0f617781f79d2a7a5e5c50ace95d261ee2f28c1281f9408a5166b4 From 238111ee20ae702e0b162055019e6a1431b00c39 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Jan 2019 11:46:35 -0800 Subject: [PATCH 017/203] - Remove unneeded else from for/else loop. It confuses pylint (bcl@redhat.com) - Turn off pylint warning about docstring with backslash (bcl@redhat.com) - Turn off smartquotes in Sphinx documentation (bcl@redhat.com) - fixes #543 qemu -nodefconfig deprecated (afm404@gmail.com) - fix spinx build warnings (afm404@gmail.com) - Revert "lorax-composer: Cancel running Anaconda process" (bcl@redhat.com) - set inst.stage2 for ppc64le image (rhbz#1577587) (dan@danny.cz) - Allow customizations to be specified as a toml list (dshea@redhat.com) - Make sure cancel_func is not None (bcl@redhat.com) - drop ppc/ppc64 from tests (dan@danny.cz) - drop ppc/ppc64 from spec (dan@danny.cz) - all supported arches have docker (dan@danny.cz) - drop big endian ppc/ppc64 support (dan@danny.cz) - add qemu command mapping for ppc64le (dan@danny.cz) - don't reduce initrd size on ppc64/ppc64le (dan@danny.cz) - fbset has been retired (dan@danny.cz) - Add timestamps to program.log and dnf.log (bcl@redhat.com) --- .gitignore | 1 + ...end-to-DNF-config-value-that-can-t-t.patch | 68 ------------------- lorax.spec | 23 ++++++- sources | 2 +- 4 files changed, 23 insertions(+), 71 deletions(-) delete mode 100644 0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch diff --git a/.gitignore b/.gitignore index 0477e13..18158af 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,4 @@ /lorax-30.7.tar.gz /lorax-30.8.tar.gz /lorax-30.9.tar.gz +/lorax-30.10.tar.gz diff --git a/0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch b/0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch deleted file mode 100644 index 67bf97d..0000000 --- a/0001-Don-t-try-to-append-to-DNF-config-value-that-can-t-t.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a7c2d7d66b1a4df5b06a0c5b401558531199f791 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 26 Sep 2018 18:14:06 -0700 -Subject: [PATCH] Don't try to append to DNF config value that can't take it - -See https://bugzilla.redhat.com/show_bug.cgi?id=1595917 and -https://github.com/rpm-software-management/dnf/pull/1200 for -more on this. Briefly, DNF before 3.0 presented this config -value as a list...and mutating it worked. DNF from 3.0 until -3.6 presented it as a list...mutating it didn't work, but also -didn't *fail*, so this has actually not been doing anything on -DNF 3.x but we haven't noticed. - -In DNF 3.6 values like this are presented as tuples instead of -lists, to try and catch usages like this, and it worked! We -need to change this one. - -There is an additional weirdness here. tsflags is actually, in -libdnf terms, an OptionStringListAppend option: that means that -when something tries to *set* its value, the new value is just -appended to the existing list of values. This is very weird -behaviour when you're interacting with it like this, but -happens to be quite useful, as we can just 'set' the value to -a list like this and it will actually get appended (which is -what we want), and this one syntax happens to work correctly in -DNF 2.x, 3.0 through 3.5.1, and 3.6. - -Signed-off-by: Adam Williamson ---- - src/pylorax/api/dnfbase.py | 5 ++++- - src/sbin/lorax | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/pylorax/api/dnfbase.py b/src/pylorax/api/dnfbase.py -index b7a4d1c6..1d7f32cc 100644 ---- a/src/pylorax/api/dnfbase.py -+++ b/src/pylorax/api/dnfbase.py -@@ -56,7 +56,10 @@ def get_base_object(conf): - dbc.reposdir = [repodir] - dbc.install_weak_deps = False - dbc.prepend_installroot('persistdir') -- dbc.tsflags.append('nodocs') -+ # this is a weird 'AppendOption' thing that, when you set it, -+ # actually appends. Doing this adds 'nodocs' to the existing list -+ # of values, over in libdnf, it does not replace the existing values. -+ dbc.tsflags = ['nodocs'] - - if conf.get_default("dnf", "proxy", None): - dbc.proxy = conf.get("dnf", "proxy") -diff --git a/src/sbin/lorax b/src/sbin/lorax -index 30b9cadc..2729757d 100755 ---- a/src/sbin/lorax -+++ b/src/sbin/lorax -@@ -212,7 +212,10 @@ def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, - conf.releasever = releasever - conf.installroot = installroot - conf.prepend_installroot('persistdir') -- conf.tsflags.append('nodocs') -+ # this is a weird 'AppendOption' thing that, when you set it, -+ # actually appends. Doing this adds 'nodocs' to the existing list -+ # of values, over in libdnf, it does not replace the existing values. -+ conf.tsflags = ['nodocs'] - - if proxy: - conf.proxy = proxy --- -2.19.0 - diff --git a/lorax.spec b/lorax.spec index ae266b6..2efd018 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.9 +Version: 30.10 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -62,7 +62,7 @@ Requires: hfsplus-tools Requires: syslinux >= 6.02-4 %endif -%ifarch ppc ppc64 ppc64le +%ifarch ppc64le Requires: grub2 Requires: grub2-tools %endif @@ -232,6 +232,25 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Tue Jan 08 2019 Brian C. Lane 30.10-1 +- Remove unneeded else from for/else loop. It confuses pylint (bcl@redhat.com) +- Turn off pylint warning about docstring with backslash (bcl@redhat.com) +- Turn off smartquotes in Sphinx documentation (bcl@redhat.com) +- fixes #543 qemu -nodefconfig deprecated (afm404@gmail.com) +- fix spinx build warnings (afm404@gmail.com) +- Revert "lorax-composer: Cancel running Anaconda process" (bcl@redhat.com) +- set inst.stage2 for ppc64le image (rhbz#1577587) (dan@danny.cz) +- Allow customizations to be specified as a toml list (dshea@redhat.com) +- Make sure cancel_func is not None (bcl@redhat.com) +- drop ppc/ppc64 from tests (dan@danny.cz) +- drop ppc/ppc64 from spec (dan@danny.cz) +- all supported arches have docker (dan@danny.cz) +- drop big endian ppc/ppc64 support (dan@danny.cz) +- add qemu command mapping for ppc64le (dan@danny.cz) +- don't reduce initrd size on ppc64/ppc64le (dan@danny.cz) +- fbset has been retired (dan@danny.cz) +- Add timestamps to program.log and dnf.log (bcl@redhat.com) + * Mon Dec 17 2018 Brian C. Lane 30.9-1 - lorax: Save information about rootfs filesystem size and usage (bcl@redhat.com) - Turn on signed tags when using tito. (bcl@redhat.com) diff --git a/sources b/sources index 436eec7..d734302 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.9.tar.gz) = 0f980d50c47340858ff5df35ced078573960f15788e3a8d9003dd72025104af3635955eecc0f617781f79d2a7a5e5c50ace95d261ee2f28c1281f9408a5166b4 +SHA512 (lorax-30.10.tar.gz) = 1f096778584e656e3fc3b9787264f5170219d7d0d4876430df536d420c24efd72efd6113da2f95edefc76cda5949e67da2a5aa7bba9171fc372cdfff49b25f07 From d039d7ce8ed30e159bd66f3e7dec4bdcf3dcf6ce Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 15 Jan 2019 22:45:22 -0800 Subject: [PATCH 018/203] Backport PR #568 to fix Rawhide lives (rhbz#1663040) --- ...v-from-the-setfiles-in-novirt_instal.patch | 38 +++++++++++++++++++ lorax.spec | 11 +++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch diff --git a/0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch b/0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch new file mode 100644 index 0000000..dfef1d8 --- /dev/null +++ b/0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch @@ -0,0 +1,38 @@ +From 024293968f5ae3e2d2ea6164b7a693c059dc86c3 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 15 Jan 2019 10:34:54 -0800 +Subject: [PATCH] Don't exclude /dev from the `setfiles` in `novirt_install` + +After a novirt disk image install, we run `setfiles` in the +install root to ensure some SELinux contexts are correct. /dev +is currently excluded from this run. However, as reported and +discussed in https://bugzilla.redhat.com/show_bug.cgi?id=1663040 +it seems that with a recent systemd change, startup of many +services will fail if /dev itself is incorrectly labelled, and +in current Rawhide live images, it *is* incorrectly labelled. +Including `/dev` in this setfiles command appears to resolve the +problem in my testing. + +Resolves: rhbz#1663040 + +Signed-off-by: Adam Williamson +--- + 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 758c3cf5..6d101609 100644 +--- a/src/pylorax/installer.py ++++ b/src/pylorax/installer.py +@@ -389,7 +389,7 @@ def novirt_install(opts, disk_img, disk_size, cancel_func=None): + log.info(line) + + # Make sure the new filesystem is correctly labeled +- setfiles_args = ["-e", "/proc", "-e", "/sys", "-e", "/dev", ++ setfiles_args = ["-e", "/proc", "-e", "/sys", + "/etc/selinux/targeted/contexts/files/file_contexts", "/"] + + if "--dirinstall" in args: +-- +2.20.1 + diff --git a/lorax.spec b/lorax.spec index 2efd018..f37813f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 30.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -16,6 +16,11 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Ensure /dev is correctly labelled in live images: +# https://github.com/weldr/lorax/pull/568 +# https://bugzilla.redhat.com/show_bug.cgi?id=1663040 +Patch0: 0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch + BuildRequires: python3-devel Requires: lorax-templates @@ -158,6 +163,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build @@ -232,6 +238,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Tue Jan 15 2019 Adam Williamson - 30.10-2 +- Backport PR #568 to fix Rawhide lives (rhbz#1663040) + * Tue Jan 08 2019 Brian C. Lane 30.10-1 - Remove unneeded else from for/else loop. It confuses pylint (bcl@redhat.com) - Turn off pylint warning about docstring with backslash (bcl@redhat.com) From fdd5208425f6b6c38b0978aa522cacd6b807c190 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 18 Jan 2019 09:19:43 -0800 Subject: [PATCH 019/203] - Don't exclude /dev from the `setfiles` in `novirt_install` (awilliam@redhat.com) Resolves: rhbz#1663040 - dracut-fips is no longer a subpackage, it is included in dracut. (bcl@redhat.com) --- ...v-from-the-setfiles-in-novirt_instal.patch | 38 ------------------- lorax.spec | 17 ++++----- 2 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch diff --git a/0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch b/0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch deleted file mode 100644 index dfef1d8..0000000 --- a/0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 024293968f5ae3e2d2ea6164b7a693c059dc86c3 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 15 Jan 2019 10:34:54 -0800 -Subject: [PATCH] Don't exclude /dev from the `setfiles` in `novirt_install` - -After a novirt disk image install, we run `setfiles` in the -install root to ensure some SELinux contexts are correct. /dev -is currently excluded from this run. However, as reported and -discussed in https://bugzilla.redhat.com/show_bug.cgi?id=1663040 -it seems that with a recent systemd change, startup of many -services will fail if /dev itself is incorrectly labelled, and -in current Rawhide live images, it *is* incorrectly labelled. -Including `/dev` in this setfiles command appears to resolve the -problem in my testing. - -Resolves: rhbz#1663040 - -Signed-off-by: Adam Williamson ---- - 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 758c3cf5..6d101609 100644 ---- a/src/pylorax/installer.py -+++ b/src/pylorax/installer.py -@@ -389,7 +389,7 @@ def novirt_install(opts, disk_img, disk_size, cancel_func=None): - log.info(line) - - # Make sure the new filesystem is correctly labeled -- setfiles_args = ["-e", "/proc", "-e", "/sys", "-e", "/dev", -+ setfiles_args = ["-e", "/proc", "-e", "/sys", - "/etc/selinux/targeted/contexts/files/file_contexts", "/"] - - if "--dirinstall" in args: --- -2.20.1 - diff --git a/lorax.spec b/lorax.spec index f37813f..13d2cf8 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 30.10 -Release: 2%{?dist} +Version: 30.12 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -16,11 +16,6 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Ensure /dev is correctly labelled in live images: -# https://github.com/weldr/lorax/pull/568 -# https://bugzilla.redhat.com/show_bug.cgi?id=1663040 -Patch0: 0001-Don-t-exclude-dev-from-the-setfiles-in-novirt_instal.patch - BuildRequires: python3-devel Requires: lorax-templates @@ -163,7 +158,6 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build @@ -238,8 +232,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog -* Tue Jan 15 2019 Adam Williamson - 30.10-2 -- Backport PR #568 to fix Rawhide lives (rhbz#1663040) +* Fri Jan 18 2019 Brian C. Lane 30.12-1 +- Don't exclude /dev from the `setfiles` in `novirt_install` (awilliam@redhat.com) + +* Fri Jan 18 2019 Brian C. Lane 30.11-1 +- dracut-fips is no longer a subpackage, it is included in dracut. (bcl@redhat.com) * Tue Jan 08 2019 Brian C. Lane 30.10-1 - Remove unneeded else from for/else loop. It confuses pylint (bcl@redhat.com) From 9f55079494a514101b812fdffc2833a25f7580e0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 18 Jan 2019 09:28:08 -0800 Subject: [PATCH 020/203] Actually add the lorax-30.12-tar.bz2 sources file --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 18158af..38c58f8 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,4 @@ /lorax-30.8.tar.gz /lorax-30.9.tar.gz /lorax-30.10.tar.gz +/lorax-30.12.tar.gz diff --git a/sources b/sources index d734302..b617857 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.10.tar.gz) = 1f096778584e656e3fc3b9787264f5170219d7d0d4876430df536d420c24efd72efd6113da2f95edefc76cda5949e67da2a5aa7bba9171fc372cdfff49b25f07 +SHA512 (lorax-30.12.tar.gz) = 5593f9ebe9a0eb4f57f19251dd739ff6a9598ee09f29df39d3bc610b6c4e0b150a0c9d3e8279e8db1b082e410447b03ca3fe1c106daca23e60669b380ac4137c From 5d09dc7456268746544a520d092d620dd4e9e7f3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:52 +0100 Subject: [PATCH 021/203] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- lorax.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 13d2cf8..7411c34 100644 --- a/lorax.spec +++ b/lorax.spec @@ -7,7 +7,6 @@ Version: 30.12 Release: 1%{?dist} Summary: Tool for creating the anaconda install images -Group: Applications/System License: GPLv2+ URL: https://github.com/weldr/lorax # To generate Source0 do: From 86a193792146bdbad5cb831b0818c372ce61f470 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 30 Jan 2019 12:00:18 -0800 Subject: [PATCH 022/203] - Remove duplicate repositories from the sources list (bcl@redhat.com) - Copy .discinfo to the boot.iso (bcl@redhat.com) - Clarify the ks repo only error message (bcl@redhat.com) - fedora-livemedia.ks: Add packages needed to boot livecd on UEFI systems (bcl@redhat.com) - Use xorrisofs instead of mkisofs (bcl@redhat.com) - lorax: Move default tmp dir to /var/tmp/lorax (bcl@redhat.com) - Export OS_PROJECT_NAME variable in openstack scripts (jstodola@redhat.com) - Collect results from all cleanup scripts (jstodola@redhat.com) - Typo in PR template (atodorov@redhat.com) - Expand parameters as separate words (jstodola@redhat.com) - Add PR template with instructions for repo members (atodorov@redhat.com) - Add script for removing old artifacts from OpenStack (jstodola@redhat.com) - Add script for removing old artifacts from AWS (jstodola@redhat.com) --- .gitignore | 1 + lorax.spec | 23 ++++++++++++++++++++--- sources | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 38c58f8..03afab9 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,4 @@ /lorax-30.9.tar.gz /lorax-30.10.tar.gz /lorax-30.12.tar.gz +/lorax-30.13.tar.gz diff --git a/lorax.spec b/lorax.spec index 7411c34..26c0424 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.12 +Version: 30.13 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -26,7 +26,7 @@ Requires: dosfstools Requires: e2fsprogs Requires: findutils Requires: gawk -Requires: genisoimage +Requires: xorrisofs Requires: glib2 Requires: glibc Requires: glibc-common @@ -58,7 +58,8 @@ Requires: hfsplus-tools %endif %ifarch %{ix86} x86_64 -Requires: syslinux >= 6.02-4 +Requires: syslinux >= 6.03-1 +Requires: syslinux-nonlinux >= 6.03-1 %endif %ifarch ppc64le @@ -203,6 +204,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 @@ -231,6 +233,21 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Wed Jan 30 2019 Brian C. Lane 30.13-1 +- Remove duplicate repositories from the sources list (bcl@redhat.com) +- Copy .discinfo to the boot.iso (bcl@redhat.com) +- Clarify the ks repo only error message (bcl@redhat.com) +- fedora-livemedia.ks: Add packages needed to boot livecd on UEFI systems (bcl@redhat.com) +- Use xorrisofs instead of mkisofs (bcl@redhat.com) +- lorax: Move default tmp dir to /var/tmp/lorax (bcl@redhat.com) +- Export OS_PROJECT_NAME variable in openstack scripts (jstodola@redhat.com) +- Collect results from all cleanup scripts (jstodola@redhat.com) +- Typo in PR template (atodorov@redhat.com) +- Expand parameters as separate words (jstodola@redhat.com) +- Add PR template with instructions for repo members (atodorov@redhat.com) +- Add script for removing old artifacts from OpenStack (jstodola@redhat.com) +- Add script for removing old artifacts from AWS (jstodola@redhat.com) + * Fri Jan 18 2019 Brian C. Lane 30.12-1 - Don't exclude /dev from the `setfiles` in `novirt_install` (awilliam@redhat.com) diff --git a/sources b/sources index b617857..0c4ec7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.12.tar.gz) = 5593f9ebe9a0eb4f57f19251dd739ff6a9598ee09f29df39d3bc610b6c4e0b150a0c9d3e8279e8db1b082e410447b03ca3fe1c106daca23e60669b380ac4137c +SHA512 (lorax-30.13.tar.gz) = c3e9d73234466189470f904c72b6c916f387a7b133b773bee80ef1ab89f8111dab2a51e404ace31cc3b3a89a418b70ccf9a4d4d1ce4d2c0629260089a99bcb02 From d003d1eefd2540a7f72ee491dde2ef10c64fe5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 31 Jan 2019 11:21:20 +0100 Subject: [PATCH 023/203] Use xorriso instead of xorrisofs https://bugzilla.redhat.com/show_bug.cgi?id=1671263 --- lorax.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lorax.spec b/lorax.spec index 26c0424..cfc6ead 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 30.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -26,7 +26,7 @@ Requires: dosfstools Requires: e2fsprogs Requires: findutils Requires: gawk -Requires: xorrisofs +Requires: xorriso Requires: glib2 Requires: glibc Requires: glibc-common @@ -233,6 +233,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog +* Thu Jan 31 2019 Miro Hrončok - 30.13-2 +- Use xorriso instead of xorrisofs (#1671263) + * Wed Jan 30 2019 Brian C. Lane 30.13-1 - Remove duplicate repositories from the sources list (bcl@redhat.com) - Copy .discinfo to the boot.iso (bcl@redhat.com) From 30c3ea41371f30b1deec83fbfecdcd7271f5bf97 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 31 Jan 2019 08:18:38 -0800 Subject: [PATCH 024/203] - xorrisofs is provided by the xorriso package (bcl@redhat.com) - Remove obsolete Group tag (ignatenkobrain@fedoraproject.org) --- .gitignore | 1 + lorax.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 03afab9..a5045bd 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,4 @@ /lorax-30.10.tar.gz /lorax-30.12.tar.gz /lorax-30.13.tar.gz +/lorax-30.14.tar.gz diff --git a/lorax.spec b/lorax.spec index cfc6ead..73f94c8 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 30.13 -Release: 2%{?dist} +Version: 30.14 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -233,8 +233,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sysconfdir}/bash_completion.d/composer-cli %changelog -* Thu Jan 31 2019 Miro Hrončok - 30.13-2 -- Use xorriso instead of xorrisofs (#1671263) +* Thu Jan 31 2019 Brian C. Lane 30.14-1 +- xorrisofs is provided by the xorriso package (bcl@redhat.com) +- Remove obsolete Group tag (ignatenkobrain@fedoraproject.org) * Wed Jan 30 2019 Brian C. Lane 30.13-1 - Remove duplicate repositories from the sources list (bcl@redhat.com) diff --git a/sources b/sources index 0c4ec7e..7895de1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.13.tar.gz) = c3e9d73234466189470f904c72b6c916f387a7b133b773bee80ef1ab89f8111dab2a51e404ace31cc3b3a89a418b70ccf9a4d4d1ce4d2c0629260089a99bcb02 +SHA512 (lorax-30.14.tar.gz) = 21b3b1300ffcdb55a51a32a223205273147ba9518eaafbd339f37070cc785b6a6a24c416d6cd205f06904352cda4d96a9c9826eb056ca81c53e6ed84f5748943 From 052cf3d142cd5fda6c66da1a50c513abdf5520d2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 15 Feb 2019 10:45:04 -0800 Subject: [PATCH 025/203] - Remove 3G minimum from lorax-composer (bcl@redhat.com) - drop Apple/HFS bits from the templates (#602) (dan@danny.cz) - Move manpages into the correct subpackages (bcl@redhat.com) - installer: Run anaconda in a mount and pid namespace (lars@karlitski.net) - Run as root/weldr by default. (clumens@redhat.com) - Pass ssl certificate options to anaconda (lars@karlitski.net) - Drop auth from the kickstart examples (bcl@redhat.com) - Keep OpenStack VMs with Tag keep_me (atodorov@redhat.com) - Make sure compose build tests run with SELinux in enforcing mode (jikortus@redhat.com) - Update with instructions about commit log referencing Bugzilla (atodorov@redhat.com) - Add script for removing old artifacts from Azure (jstodola@redhat.com) - Use existing storage account (jstodola@redhat.com) - Record date/time of VM creation (jstodola@redhat.com) --- .gitignore | 1 + lorax.spec | 26 ++++++++++++++++++++++---- sources | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a5045bd..106fe94 100644 --- a/.gitignore +++ b/.gitignore @@ -154,3 +154,4 @@ /lorax-30.12.tar.gz /lorax-30.13.tar.gz /lorax-30.14.tar.gz +/lorax-30.15.tar.gz diff --git a/lorax.spec b/lorax.spec index 73f94c8..93c91b2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.14 +Version: 30.15 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -46,7 +46,7 @@ Requires: kpartx # Python modules Requires: libselinux-python3 Requires: python3-mako -Requires: python3-kickstart +Requires: python3-kickstart >= 3.19 Requires: python3-dnf >= 3.2.0 Requires: python3-librepo @@ -136,7 +136,7 @@ Requires: libgit2 Requires: libgit2-glib Requires: python3-flask Requires: python3-gevent -Requires: anaconda-tui +Requires: anaconda-tui >= 29.19-1 Requires: qemu-img Requires: tar @@ -203,7 +203,8 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %dir %{_sysconfdir}/lorax %config(noreplace) %{_sysconfdir}/lorax/lorax.conf %dir %{_datadir}/lorax -%{_mandir}/man1/*.1* +%{_mandir}/man1/lorax.1* +%{_mandir}/man1/livemedia-creator.1* %{_tmpfilesdir}/lorax.conf %files lmc-virt @@ -226,13 +227,30 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/ %dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/blueprints/ %attr(0771, weldr, weldr) %{_sharedstatedir}/lorax/composer/blueprints/* +%{_mandir}/man1/lorax-composer.1* %files -n composer-cli %{_bindir}/composer-cli %{python3_sitelib}/composer/* %{_sysconfdir}/bash_completion.d/composer-cli +%{_mandir}/man1/composer-cli.1* %changelog +* Fri Feb 15 2019 Brian C. Lane 30.15-1 +- Remove 3G minimum from lorax-composer (bcl@redhat.com) +- drop Apple/HFS bits from the templates (#602) (dan@danny.cz) +- Move manpages into the correct subpackages (bcl@redhat.com) +- installer: Run anaconda in a mount and pid namespace (lars@karlitski.net) +- Run as root/weldr by default. (clumens@redhat.com) +- Pass ssl certificate options to anaconda (lars@karlitski.net) +- Drop auth from the kickstart examples (bcl@redhat.com) +- Keep OpenStack VMs with Tag keep_me (atodorov@redhat.com) +- Make sure compose build tests run with SELinux in enforcing mode (jikortus@redhat.com) +- Update with instructions about commit log referencing Bugzilla (atodorov@redhat.com) +- Add script for removing old artifacts from Azure (jstodola@redhat.com) +- Use existing storage account (jstodola@redhat.com) +- Record date/time of VM creation (jstodola@redhat.com) + * Thu Jan 31 2019 Brian C. Lane 30.14-1 - xorrisofs is provided by the xorriso package (bcl@redhat.com) - Remove obsolete Group tag (ignatenkobrain@fedoraproject.org) diff --git a/sources b/sources index 7895de1..e33da3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.14.tar.gz) = 21b3b1300ffcdb55a51a32a223205273147ba9518eaafbd339f37070cc785b6a6a24c416d6cd205f06904352cda4d96a9c9826eb056ca81c53e6ed84f5748943 +SHA512 (lorax-30.15.tar.gz) = bb43fc75607418a2a120e567efaf11ed11e76fde47badbb4af1d71ce17e43b9c7550bb44a74f04044f165a7471f748e50a0c259ebe36a69d4fe0ac701799c3bb From a6c0d638cab8936ed59a16c771764adcbd17b38c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 25 Feb 2019 14:45:49 -0800 Subject: [PATCH 026/203] - Fix pylint problems with vmware_list_vms.py (bcl@redhat.com) - Makefile: Make the .test-results directory (bcl@redhat.com) - Add a ppc64le template for live iso creation (bcl@redhat.com) - Move the package requirements for live-iso setup out of the template (bcl@redhat.com) - Remove exclusions from lorax-composer templates (bcl@redhat.com) - Add LiveTemplateRunner to parse per-arch live-iso package requirements (bcl@redhat.com) - Move the run part of LoraxTemplateRunner into new TemplateRunner class (bcl@redhat.com) - lorax-composer: Use reqpart --add-boot for partitioned disk templates (bcl@redhat.com) - livemedia-creator: Add support for reqpart kickstart command (bcl@redhat.com) - Make the lorax-composer ks templates more generic (bcl@redhat.com) - Add script for removing old artifacts from VMware (jstodola@redhat.com) - tests: Fix makeFakeRPM calls (bcl@redhat.com) - Drop _unique_dicts function (bcl@redhat.com) - Update bash to 5.0.* (bcl@redhat.com) - Add some extra cancel_func protection to QEMUInstall (bcl@redhat.com) - Remove unsupported anaconda-docker-addon (#619) (jkonecny@redhat.com) - installer: make sure cancel_func has a value (#612) (yuvalt@gmail.com) - New test: Verify tar images with Docker and systemd-nspawn (atodorov@otb.bg) - Update OpenStack flavor and network settings in tests (atodorov@redhat.com) --- .gitignore | 1 + lorax.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 106fe94..0c38879 100644 --- a/.gitignore +++ b/.gitignore @@ -155,3 +155,4 @@ /lorax-30.13.tar.gz /lorax-30.14.tar.gz /lorax-30.15.tar.gz +/lorax-30.16.tar.gz diff --git a/lorax.spec b/lorax.spec index 93c91b2..aa73c12 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.15 +Version: 30.16 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -236,6 +236,27 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Mon Feb 25 2019 Brian C. Lane 30.16-1 +- Fix pylint problems with vmware_list_vms.py (bcl@redhat.com) +- Makefile: Make the .test-results directory (bcl@redhat.com) +- Add a ppc64le template for live iso creation (bcl@redhat.com) +- Move the package requirements for live-iso setup out of the template (bcl@redhat.com) +- Remove exclusions from lorax-composer templates (bcl@redhat.com) +- Add LiveTemplateRunner to parse per-arch live-iso package requirements (bcl@redhat.com) +- Move the run part of LoraxTemplateRunner into new TemplateRunner class (bcl@redhat.com) +- lorax-composer: Use reqpart --add-boot for partitioned disk templates (bcl@redhat.com) +- livemedia-creator: Add support for reqpart kickstart command (bcl@redhat.com) +- Make the lorax-composer ks templates more generic (bcl@redhat.com) +- Add script for removing old artifacts from VMware (jstodola@redhat.com) +- tests: Fix makeFakeRPM calls (bcl@redhat.com) +- Drop _unique_dicts function (bcl@redhat.com) +- Update bash to 5.0.* (bcl@redhat.com) +- Add some extra cancel_func protection to QEMUInstall (bcl@redhat.com) +- Remove unsupported anaconda-docker-addon (#619) (jkonecny@redhat.com) +- installer: make sure cancel_func has a value (#612) (yuvalt@gmail.com) +- New test: Verify tar images with Docker and systemd-nspawn (atodorov@otb.bg) +- Update OpenStack flavor and network settings in tests (atodorov@redhat.com) + * Fri Feb 15 2019 Brian C. Lane 30.15-1 - Remove 3G minimum from lorax-composer (bcl@redhat.com) - drop Apple/HFS bits from the templates (#602) (dan@danny.cz) diff --git a/sources b/sources index e33da3d..2d1cb71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.15.tar.gz) = bb43fc75607418a2a120e567efaf11ed11e76fde47badbb4af1d71ce17e43b9c7550bb44a74f04044f165a7471f748e50a0c259ebe36a69d4fe0ac701799c3bb +SHA512 (lorax-30.16.tar.gz) = 0056ae1efae78ec1f3c9c26e6adf99d263b9322de65323fc0d9215cf48c689d0caaebf3766fdbb113d3b60f04b6638c542406d98ba447b58fc89d7625f988fed From e3955d8256e0d6e5239c9c534b3d8c3de25d0338 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 15 Mar 2019 11:46:40 -0700 Subject: [PATCH 027/203] - 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) --- .gitignore | 1 + lorax.spec | 25 ++++++++++++++++++++++++- sources | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0c38879..ad39a11 100644 --- a/.gitignore +++ b/.gitignore @@ -156,3 +156,4 @@ /lorax-30.14.tar.gz /lorax-30.15.tar.gz /lorax-30.16.tar.gz +/lorax-31.0.tar.gz diff --git a/lorax.spec b/lorax.spec index aa73c12..d973c59 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 30.16 +Version: 31.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -139,6 +139,10 @@ Requires: python3-gevent Requires: anaconda-tui >= 29.19-1 Requires: qemu-img Requires: tar +Requires: python3-rpmfluff +Requires: git +Requires: xz +Requires: createrepo_c %{?systemd_requires} BuildRequires: systemd @@ -236,6 +240,25 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) + * Mon Feb 25 2019 Brian C. Lane 30.16-1 - Fix pylint problems with vmware_list_vms.py (bcl@redhat.com) - Makefile: Make the .test-results directory (bcl@redhat.com) diff --git a/sources b/sources index 2d1cb71..9b98e40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-30.16.tar.gz) = 0056ae1efae78ec1f3c9c26e6adf99d263b9322de65323fc0d9215cf48c689d0caaebf3766fdbb113d3b60f04b6638c542406d98ba447b58fc89d7625f988fed +SHA512 (lorax-31.0.tar.gz) = 1e4cc527920e46381318720ae326d7a6a5c684ae4a6e864e4038d073c0219123c06171584992a1853187fbb7b7fb26074b9439a0455343f39845e8d4e95745f1 From bee88eaf9b82f9e3dc07cf6e625aad74c5c70afb Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 26 Mar 2019 14:18:19 -0700 Subject: [PATCH 028/203] - 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) --- .gitignore | 1 + lorax.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ad39a11..09ae1c9 100644 --- a/.gitignore +++ b/.gitignore @@ -157,3 +157,4 @@ /lorax-30.15.tar.gz /lorax-30.16.tar.gz /lorax-31.0.tar.gz +/lorax-31.1.tar.gz diff --git a/lorax.spec b/lorax.spec index d973c59..8c8e3d8 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.0 +Version: 31.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -240,6 +240,18 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 9b98e40..a81070d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.0.tar.gz) = 1e4cc527920e46381318720ae326d7a6a5c684ae4a6e864e4038d073c0219123c06171584992a1853187fbb7b7fb26074b9439a0455343f39845e8d4e95745f1 +SHA512 (lorax-31.1.tar.gz) = 17c12472dc4337b73a74029e70410d2845e62a980d23350c24a0f62180f983e7b7e876dbe61a37f802d3f38c5ea04a2d6c2c41a0c1d51506d9b5e645e6445222 From febf664144408d00fbe01d3b5813c29031d4c35c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 1 Apr 2019 11:29:20 -0700 Subject: [PATCH 029/203] - 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) --- .gitignore | 1 + lorax.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 09ae1c9..82b554a 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,4 @@ /lorax-30.16.tar.gz /lorax-31.0.tar.gz /lorax-31.1.tar.gz +/lorax-31.2.tar.gz diff --git a/lorax.spec b/lorax.spec index 8c8e3d8..f535d56 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.1 +Version: 31.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -240,6 +240,13 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index a81070d..709b6fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.1.tar.gz) = 17c12472dc4337b73a74029e70410d2845e62a980d23350c24a0f62180f983e7b7e876dbe61a37f802d3f38c5ea04a2d6c2c41a0c1d51506d9b5e645e6445222 +SHA512 (lorax-31.2.tar.gz) = 909c3b30be2ef2d796b0cd5da685c7ca5a98c501b0e438d2dc9a7400a172a3986b88ab7ad4a4b8baa7a872fe060078c91f0cad46959596681a8d50c208234cb8 From 44cfccc46b263c8fdf294ec37178eca130d9a9f5 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 5 Apr 2019 16:03:21 -0700 Subject: [PATCH 030/203] - 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) --- .gitignore | 1 + lorax.spec | 18 ++++++++++++++++-- sources | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 82b554a..1cee696 100644 --- a/.gitignore +++ b/.gitignore @@ -159,3 +159,4 @@ /lorax-31.0.tar.gz /lorax-31.1.tar.gz /lorax-31.2.tar.gz +/lorax-31.3.tar.gz diff --git a/lorax.spec b/lorax.spec index f535d56..2e7db15 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.2 +Version: 31.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -157,7 +157,7 @@ Summary: A command line tool for use with the lorax-composer API server Requires: python3-urllib3 %description -n composer-cli -A command line tool for use with the lorax-composer API server. Examine recipes, +A command line tool for use with the lorax-composer API server. Examine blueprints, build images, etc. from the command line. %prep @@ -240,6 +240,20 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 709b6fe..9df7b15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.2.tar.gz) = 909c3b30be2ef2d796b0cd5da685c7ca5a98c501b0e438d2dc9a7400a172a3986b88ab7ad4a4b8baa7a872fe060078c91f0cad46959596681a8d50c208234cb8 +SHA512 (lorax-31.3.tar.gz) = 3aa1f1464d88d7a5827a50b68fd2bc40e237062f747330fd8535e743670f45ffa99793c5cf9141aecfd57c2d59fb122a7d8d92a5a646e61cc3e768deb4cdd5df From 30026570e656282964edf8847a24eff3eafd8387 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 2 May 2019 17:05:38 -0700 Subject: [PATCH 031/203] - 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) --- .gitignore | 1 + lorax.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1cee696..1a7b8a8 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,4 @@ /lorax-31.1.tar.gz /lorax-31.2.tar.gz /lorax-31.3.tar.gz +/lorax-31.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 2e7db15..f4c3f9d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.3 +Version: 31.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -240,6 +240,27 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 9df7b15..5e1eb98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.3.tar.gz) = 3aa1f1464d88d7a5827a50b68fd2bc40e237062f747330fd8535e743670f45ffa99793c5cf9141aecfd57c2d59fb122a7d8d92a5a646e61cc3e768deb4cdd5df +SHA512 (lorax-31.4.tar.gz) = 8bc4d5fbe1aff0101026ed67a6b42611bee70ba1be7b955686322d9fddbef5afe607008df64c2c1bd8e24ac102b00d15ebbcc583e095b312f5cdb4d9326e1604 From f59b135afb65ec61e7e085114aa855560d801c83 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 7 May 2019 11:55:46 -0700 Subject: [PATCH 032/203] - 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) --- .gitignore | 1 + lorax.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1a7b8a8..dec156b 100644 --- a/.gitignore +++ b/.gitignore @@ -161,3 +161,4 @@ /lorax-31.2.tar.gz /lorax-31.3.tar.gz /lorax-31.4.tar.gz +/lorax-31.5.tar.gz diff --git a/lorax.spec b/lorax.spec index f4c3f9d..d82edde 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.4 +Version: 31.5 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -49,6 +49,7 @@ Requires: python3-mako Requires: python3-kickstart >= 3.19 Requires: python3-dnf >= 3.2.0 Requires: python3-librepo +Requires: python3-pycdlib %if 0%{?fedora} # Fedora specific deps @@ -240,6 +241,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 5e1eb98..3a82978 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.4.tar.gz) = 8bc4d5fbe1aff0101026ed67a6b42611bee70ba1be7b955686322d9fddbef5afe607008df64c2c1bd8e24ac102b00d15ebbcc583e095b312f5cdb4d9326e1604 +SHA512 (lorax-31.5.tar.gz) = 9f94b5574d34a004e650b565e1fcefddc588c4501c28a040d9f5f232427634be5b3f7cbe39c923df7c824784485eec602be462f3b9b422e6635f578e018b5ee7 From 2c36b44e084e24e50d617f74bd9d729a47b7df92 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 16 May 2019 10:41:38 -0700 Subject: [PATCH 033/203] - 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) --- .gitignore | 1 + lorax.spec | 22 ++++++++++++++++++++-- sources | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dec156b..aa24da9 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,4 @@ /lorax-31.3.tar.gz /lorax-31.4.tar.gz /lorax-31.5.tar.gz +/lorax-31.6.tar.gz diff --git a/lorax.spec b/lorax.spec index d82edde..41c9246 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.5 +Version: 31.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -87,6 +87,14 @@ It also includes livemedia-creator which is used to create bootable livemedia, including live isos and disk images. It can use libvirtd for the install, or Anaconda's image install feature. +%package docs +Summary: Lorax html documentation +Requires: lorax = %{version}-%{release} + +%description docs +Includes the full html documentation for lorax, livemedia-creator, lorax-composer and the +pylorax library. + %package lmc-virt Summary: livemedia-creator libvirt dependencies Requires: lorax = %{version}-%{release} @@ -196,7 +204,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %files %defattr(-,root,root,-) %license COPYING -%doc AUTHORS docs/livemedia-creator.rst docs/product-images.rst +%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/*ks %{python3_sitelib}/pylorax %{python3_sitelib}/*.egg-info @@ -212,6 +222,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/livemedia-creator.1* %{_tmpfilesdir}/lorax.conf +%files docs +%doc docs/html/* + %files lmc-virt %files lmc-novirt @@ -241,6 +254,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 3a82978..679219a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.5.tar.gz) = 9f94b5574d34a004e650b565e1fcefddc588c4501c28a040d9f5f232427634be5b3f7cbe39c923df7c824784485eec602be462f3b9b422e6635f578e018b5ee7 +SHA512 (lorax-31.6.tar.gz) = c9aeabe177a06d6d25ebbde1790ea090b01d33e69625b6b9e23dd746f8a3477538a908509567a6a1629691ef2a40ad0c10eb5ff1407ac2416a4915ee4fed81bc From 59d867061c037f7548074b773307fc72ae87db3c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 18 Jun 2019 15:13:03 -0700 Subject: [PATCH 034/203] - 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) --- .gitignore | 1 + lorax.spec | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 60 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index aa24da9..c6109ed 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,4 @@ /lorax-31.4.tar.gz /lorax-31.5.tar.gz /lorax-31.6.tar.gz +/lorax-31.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 41c9246..a58cb56 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.6 +Version: 31.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -132,14 +132,14 @@ Lorax templates for creating the boot.iso and live isos are placed in %package composer Summary: Lorax Image Composer API Server # For Sphinx documentation build -BuildRequires: python3-flask python3-gobject libgit2-glib python3-pytoml python3-semantic_version +BuildRequires: python3-flask python3-gobject libgit2-glib python3-toml python3-semantic_version Requires: lorax = %{version}-%{release} Requires(pre): /usr/bin/getent Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires: python3-pytoml +Requires: python3-toml Requires: python3-semantic_version Requires: libgit2 Requires: libgit2-glib @@ -254,6 +254,61 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 679219a..551ea8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.6.tar.gz) = c9aeabe177a06d6d25ebbde1790ea090b01d33e69625b6b9e23dd746f8a3477538a908509567a6a1629691ef2a40ad0c10eb5ff1407ac2416a4915ee4fed81bc +SHA512 (lorax-31.7.tar.gz) = 65f738aeda9183b5d7006a1f92800557b9b3b8f1ce625cf65d022ba2e0506a653c29e54f2fa99399614bc7a49f3cb2d7255fe1188a072bceed64c6d8edb5aef4 From 46be0b98e0682185caad2769120fdf28a32a7fe9 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 28 Jun 2019 10:56:04 -0700 Subject: [PATCH 035/203] - 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) --- .gitignore | 1 + lorax.spec | 18 +++++++++++++++++- sources | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c6109ed..b6baabb 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,4 @@ /lorax-31.5.tar.gz /lorax-31.6.tar.gz /lorax-31.7.tar.gz +/lorax-31.8.tar.gz diff --git a/lorax.spec b/lorax.spec index a58cb56..0a32084 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.7 +Version: 31.8 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -254,6 +254,22 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 551ea8d..ad1513f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.7.tar.gz) = 65f738aeda9183b5d7006a1f92800557b9b3b8f1ce625cf65d022ba2e0506a653c29e54f2fa99399614bc7a49f3cb2d7255fe1188a072bceed64c6d8edb5aef4 +SHA512 (lorax-31.8.tar.gz) = 68f7d5a203045baa62a01ed33da6814ae3be4caa410adfc2d2f962a87d9a17468621f772581768ff0bfbcdb3e8bc9f5e73c3a238cbaf1e9e0a94ab9d98461187 From 80de2f2a981476794873b7a78e1ee6eecf83c515 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 15:12:40 +0000 Subject: [PATCH 036/203] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 0a32084..453c131 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 31.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -254,6 +254,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 31.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * 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) From fb2259343ed05a0a3a438d4cca795d71da19cc93 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 29 Jul 2019 15:23:20 -0700 Subject: [PATCH 037/203] - 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) --- .gitignore | 1 + lorax.spec | 31 +++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b6baabb..95a2b43 100644 --- a/.gitignore +++ b/.gitignore @@ -165,3 +165,4 @@ /lorax-31.6.tar.gz /lorax-31.7.tar.gz /lorax-31.8.tar.gz +/lorax-31.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 453c131..003a3b9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 31.8 -Release: 2%{?dist} +Version: 31.9 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -254,8 +254,31 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Thu Jul 25 2019 Fedora Release Engineering - 31.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* 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) diff --git a/sources b/sources index ad1513f..f004626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.8.tar.gz) = 68f7d5a203045baa62a01ed33da6814ae3be4caa410adfc2d2f962a87d9a17468621f772581768ff0bfbcdb3e8bc9f5e73c3a238cbaf1e9e0a94ab9d98461187 +SHA512 (lorax-31.9.tar.gz) = e5d6f064a2f2bd449993d7eda3fdc91f6476c21aa8051dbbda90809e48e3026469ab0c2eaeb936e59c6c64bc237283d75d06eea02803d603f4127f869ceb7a52 From 99d83d6d0709d8b5a50adce208ca8e474182ebb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 18 Aug 2019 01:02:29 +0200 Subject: [PATCH 038/203] Rebuilt for Python 3.8 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 003a3b9..5d6ee68 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 31.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -254,6 +254,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Sat Aug 17 2019 Miro Hrončok - 31.9-2 +- Rebuilt for Python 3.8 + * 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) From 5bfad3cab798cbb344ea226c41128e77f1bf1322 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 20 Aug 2019 17:33:39 -0700 Subject: [PATCH 039/203] - 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) --- .gitignore | 1 + lorax.spec | 23 +++++++++++++++++++---- sources | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 95a2b43..2abdfd1 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,4 @@ /lorax-31.7.tar.gz /lorax-31.8.tar.gz /lorax-31.9.tar.gz +/lorax-31.10.tar.gz diff --git a/lorax.spec b/lorax.spec index 5d6ee68..9266a5e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 31.9 -Release: 2%{?dist} +Version: 31.10 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -254,8 +254,23 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Sat Aug 17 2019 Miro Hrončok - 31.9-2 -- Rebuilt for Python 3.8 +* 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) diff --git a/sources b/sources index f004626..e28a0e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.9.tar.gz) = e5d6f064a2f2bd449993d7eda3fdc91f6476c21aa8051dbbda90809e48e3026469ab0c2eaeb936e59c6c64bc237283d75d06eea02803d603f4127f869ceb7a52 +SHA512 (lorax-31.10.tar.gz) = 3e6d7666b5bf711e8d5b3605a8c09fa0b9eb91c8a0cce2dcfe7693a39c1045c3c14928dc4565fddcf3af61ac94de1bb5c028df81a5a0ca3484860b8c49200e2f From 668bc541755c2549b601b83a2c0f8a4dbd5bbd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 21 Aug 2019 19:15:53 +0200 Subject: [PATCH 040/203] Rebuilt for Python 3.8 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 9266a5e..a9a6a9c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 31.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -254,6 +254,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Wed Aug 21 2019 Miro Hrončok - 31.10-2 +- Rebuilt for Python 3.8 + * 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) From cb01cc9f931e7e1c03882529f879f0cb451963a3 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 30 Sep 2019 17:03:40 -0700 Subject: [PATCH 041/203] - 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) --- .gitignore | 1 + lorax.spec | 26 ++++++++++++++++++++++---- sources | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2abdfd1..87a7f3f 100644 --- a/.gitignore +++ b/.gitignore @@ -167,3 +167,4 @@ /lorax-31.8.tar.gz /lorax-31.9.tar.gz /lorax-31.10.tar.gz +/lorax-32.0.tar.gz diff --git a/lorax.spec b/lorax.spec index a9a6a9c..68af01f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 31.10 -Release: 2%{?dist} +Version: 32.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -254,8 +254,26 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Wed Aug 21 2019 Miro Hrončok - 31.10-2 -- Rebuilt for Python 3.8 +* 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) diff --git a/sources b/sources index e28a0e1..5180f06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.10.tar.gz) = 3e6d7666b5bf711e8d5b3605a8c09fa0b9eb91c8a0cce2dcfe7693a39c1045c3c14928dc4565fddcf3af61ac94de1bb5c028df81a5a0ca3484860b8c49200e2f +SHA512 (lorax-32.0.tar.gz) = 31e9ef812f50f786eef203f02e24de8ef24a39985d79b2ad4c80bd47d5407fd0ee1bef8802e28a9a2a11574f6d0879136e1918036ea30febc5e74c4f15a0a447 From 0f284711c6f8485d26de6df977845282adeb4e4f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 16 Oct 2019 14:37:26 -0700 Subject: [PATCH 042/203] - 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) --- .gitignore | 1 + lorax.spec | 607 ++++++----------------------------------------------- sources | 2 +- 3 files changed, 61 insertions(+), 549 deletions(-) diff --git a/.gitignore b/.gitignore index 87a7f3f..e5ea2dd 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,4 @@ /lorax-31.9.tar.gz /lorax-31.10.tar.gz /lorax-32.0.tar.gz +/lorax-32.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 68af01f..5c03e99 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 32.0 +Version: 32.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -152,6 +152,9 @@ Requires: python3-rpmfluff Requires: git Requires: xz Requires: createrepo_c +Requires: python3-ansible-runner +# For AWS playbook support +Requires: python3-boto3 %{?systemd_requires} BuildRequires: systemd @@ -164,6 +167,7 @@ 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, @@ -236,11 +240,13 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %files composer %config(noreplace) %{_sysconfdir}/lorax/composer.conf %{python3_sitelib}/pylorax/api/* +%{python3_sitelib}/lifted/* %{_sbindir}/lorax-composer %{_unitdir}/lorax-composer.service %{_unitdir}/lorax-composer.socket %dir %{_datadir}/lorax/composer %{_datadir}/lorax/composer/* +%{_datadir}/lorax/lifted/* %{_tmpfilesdir}/lorax-composer.conf %dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/ %dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/blueprints/ @@ -254,6 +260,58 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) @@ -473,550 +531,3 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin - 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) - -* Mon Feb 25 2019 Brian C. Lane 30.16-1 -- Fix pylint problems with vmware_list_vms.py (bcl@redhat.com) -- Makefile: Make the .test-results directory (bcl@redhat.com) -- Add a ppc64le template for live iso creation (bcl@redhat.com) -- Move the package requirements for live-iso setup out of the template (bcl@redhat.com) -- Remove exclusions from lorax-composer templates (bcl@redhat.com) -- Add LiveTemplateRunner to parse per-arch live-iso package requirements (bcl@redhat.com) -- Move the run part of LoraxTemplateRunner into new TemplateRunner class (bcl@redhat.com) -- lorax-composer: Use reqpart --add-boot for partitioned disk templates (bcl@redhat.com) -- livemedia-creator: Add support for reqpart kickstart command (bcl@redhat.com) -- Make the lorax-composer ks templates more generic (bcl@redhat.com) -- Add script for removing old artifacts from VMware (jstodola@redhat.com) -- tests: Fix makeFakeRPM calls (bcl@redhat.com) -- Drop _unique_dicts function (bcl@redhat.com) -- Update bash to 5.0.* (bcl@redhat.com) -- Add some extra cancel_func protection to QEMUInstall (bcl@redhat.com) -- Remove unsupported anaconda-docker-addon (#619) (jkonecny@redhat.com) -- installer: make sure cancel_func has a value (#612) (yuvalt@gmail.com) -- New test: Verify tar images with Docker and systemd-nspawn (atodorov@otb.bg) -- Update OpenStack flavor and network settings in tests (atodorov@redhat.com) - -* Fri Feb 15 2019 Brian C. Lane 30.15-1 -- Remove 3G minimum from lorax-composer (bcl@redhat.com) -- drop Apple/HFS bits from the templates (#602) (dan@danny.cz) -- Move manpages into the correct subpackages (bcl@redhat.com) -- installer: Run anaconda in a mount and pid namespace (lars@karlitski.net) -- Run as root/weldr by default. (clumens@redhat.com) -- Pass ssl certificate options to anaconda (lars@karlitski.net) -- Drop auth from the kickstart examples (bcl@redhat.com) -- Keep OpenStack VMs with Tag keep_me (atodorov@redhat.com) -- Make sure compose build tests run with SELinux in enforcing mode (jikortus@redhat.com) -- Update with instructions about commit log referencing Bugzilla (atodorov@redhat.com) -- Add script for removing old artifacts from Azure (jstodola@redhat.com) -- Use existing storage account (jstodola@redhat.com) -- Record date/time of VM creation (jstodola@redhat.com) - -* Thu Jan 31 2019 Brian C. Lane 30.14-1 -- xorrisofs is provided by the xorriso package (bcl@redhat.com) -- Remove obsolete Group tag (ignatenkobrain@fedoraproject.org) - -* Wed Jan 30 2019 Brian C. Lane 30.13-1 -- Remove duplicate repositories from the sources list (bcl@redhat.com) -- Copy .discinfo to the boot.iso (bcl@redhat.com) -- Clarify the ks repo only error message (bcl@redhat.com) -- fedora-livemedia.ks: Add packages needed to boot livecd on UEFI systems (bcl@redhat.com) -- Use xorrisofs instead of mkisofs (bcl@redhat.com) -- lorax: Move default tmp dir to /var/tmp/lorax (bcl@redhat.com) -- Export OS_PROJECT_NAME variable in openstack scripts (jstodola@redhat.com) -- Collect results from all cleanup scripts (jstodola@redhat.com) -- Typo in PR template (atodorov@redhat.com) -- Expand parameters as separate words (jstodola@redhat.com) -- Add PR template with instructions for repo members (atodorov@redhat.com) -- Add script for removing old artifacts from OpenStack (jstodola@redhat.com) -- Add script for removing old artifacts from AWS (jstodola@redhat.com) - -* Fri Jan 18 2019 Brian C. Lane 30.12-1 -- Don't exclude /dev from the `setfiles` in `novirt_install` (awilliam@redhat.com) - -* Fri Jan 18 2019 Brian C. Lane 30.11-1 -- dracut-fips is no longer a subpackage, it is included in dracut. (bcl@redhat.com) - -* Tue Jan 08 2019 Brian C. Lane 30.10-1 -- Remove unneeded else from for/else loop. It confuses pylint (bcl@redhat.com) -- Turn off pylint warning about docstring with backslash (bcl@redhat.com) -- Turn off smartquotes in Sphinx documentation (bcl@redhat.com) -- fixes #543 qemu -nodefconfig deprecated (afm404@gmail.com) -- fix spinx build warnings (afm404@gmail.com) -- Revert "lorax-composer: Cancel running Anaconda process" (bcl@redhat.com) -- set inst.stage2 for ppc64le image (rhbz#1577587) (dan@danny.cz) -- Allow customizations to be specified as a toml list (dshea@redhat.com) -- Make sure cancel_func is not None (bcl@redhat.com) -- drop ppc/ppc64 from tests (dan@danny.cz) -- drop ppc/ppc64 from spec (dan@danny.cz) -- all supported arches have docker (dan@danny.cz) -- drop big endian ppc/ppc64 support (dan@danny.cz) -- add qemu command mapping for ppc64le (dan@danny.cz) -- don't reduce initrd size on ppc64/ppc64le (dan@danny.cz) -- fbset has been retired (dan@danny.cz) -- Add timestamps to program.log and dnf.log (bcl@redhat.com) - -* Mon Dec 17 2018 Brian C. Lane 30.9-1 -- lorax: Save information about rootfs filesystem size and usage (bcl@redhat.com) -- Turn on signed tags when using tito. (bcl@redhat.com) -- lorax-composer: Cancel running Anaconda process (bcl@redhat.com) -- Add cancel_func to virt and novirt_install functions (bcl@redhat.com) -- lorax-composer: Check for STATUS before deleting (bcl@redhat.com) -- Check for existing CANCEL request, and exit on FINISHED (bcl@redhat.com) -- tests: use the first IP address if more than 1 retruned from OpenStack (atodorov@redhat.com) -- tests: remove a debugging command (atodorov@redhat.com) -- Add openstack to the image type list in the docs (dshea@redhat.com) - -* Thu Dec 06 2018 Brian C. Lane 30.8-1 -- lorax-composer: Handle packages with multiple builds (bcl@redhat.com) -- lorax-composer: Check the queue and results at startup (bcl@redhat.com) -- Teach OpenStack test to distinguish between RHEL and Fedora (atodorov@redhat.com) -- Use full path for Azure playbook as well (atodorov@redhat.com) -- Use a temporary dir for ssh keys during testing (atodorov@redhat.com) -- Update V_DATASTORE b/c defaults appear to have been changed (atodorov@redhat.com) -- Clone pyvmomi samples in the correct directory (atodorov@redhat.com) -- Use full path when pushing toml files during testing (atodorov@redhat.com) -- Add empty ci_after_success target for Jenkins (atodorov@redhat.com) -- Implicitly specify ssh key directory/files for testing (atodorov@redhat.com) -- [test] Clean up containers.json (atodorov@redhat.com) -- Teach AWS test to distinguish between RHEL and Fedora (atodorov@redhat.com) - -* Thu Nov 29 2018 Brian C. Lane 30.7-1 -- lorax-composer: Install selinux-policy-targeted in images (bcl@redhat.com) -- Remove setfiles from mkrootfsimage (bcl@redhat.com) -- New lorax documentation - 30.7 (bcl@redhat.com) -- Remove SELinux Permissive checks (bcl@redhat.com) -- Drop minor version from php package in blueprint (atodorov@redhat.com) -- Use a temporary shared dir when testing (atodorov@redhat.com) -- Copy blueprints used for testing to temporary directory (atodorov@redhat.com) -- Add make targets for Jenkins (atodorov@redhat.com) -- Add --no-system-repos to lorax-composer (bcl@redhat.com) -- Install grubby-deprecated package for ARMv7 (javierm@redhat.com) -- Teach test_cli.sh to execute test scripts via arguments (atodorov@redhat.com) -- new test: build an image and deploy it on Azure (atodorov@redhat.com) -- Fix typo in comment (atodorov@redhat.com) -- Fix reporting of coverage results to coverall.io (bcl@redhat.com) -- For OpenStack build image with rng-tools installed (atodorov@redhat.com) -- Add tests for partitioned disk images (bcl@redhat.com) -- Create a kpartx_disk_img function (bcl@redhat.com) -- Add tests for pylorax.imgutils (bcl@redhat.com) -- Add tests to test_creator.py (bcl@redhat.com) -- Fix make_appliance and the libvirt.tmpl (bcl@redhat.com) -- Add some tests for creator.py (bcl@redhat.com) -- tests: Add executils test (bcl@redhat.com) -- tests: Add sysutils test (bcl@redhat.com) -- tests: Add discinfo test (bcl@redhat.com) -- tests: Add treeinfo test (bcl@redhat.com) -- Stop using build to run the tests, allow using podman (bcl@redhat.com) -- new test: build and deploy an image in OpenStack (atodorov@redhat.com) -- Fix typos in VM_NAME and cleanup command (atodorov@redhat.com) -- new test: build and deploy images on vSphere (atodorov@redhat.com) -- Update docs with info about ssh keys (atodorov@redhat.com) - -* Mon Oct 29 2018 Brian C. Lane 30.6-1 -- new test: build and deploy images on AWS (atodorov@redhat.com) -- Disable execution of new tests which need Docker privileged mode (atodorov@redhat.com) -- New tests: build ext4-filesystem and partitioned-disk composes (atodorov@redhat.com) -- Update tmux version in tests (atodorov@redhat.com) -- Add tests for ltmpl.py (bcl@redhat.com) -- Move get_dnf_base_object into a module (bcl@redhat.com) -- New lorax documentation - 30.5 (bcl@redhat.com) -- Build manpages for composer-cli and lorax-composer (bcl@redhat.com) -- Add --squashfs-only option to drop inner rootfs.img layer (marmarek@invisiblethingslab.com) -- Update php version to 7.3.* (bcl@redhat.com) -- Update the projects tests to use DNF Repo object (bcl@redhat.com) -- dnf changed the type of gpgkey to a tuple (bcl@redhat.com) -- Install python3-librepo in the test container (bcl@redhat.com) -- lorax: Log when SOURCE_DATE_EPOCH is used for the current time (bcl@redhat.com) -- Drop non-determinism from default templates (marmarek@invisiblethingslab.com) -- Use SOURCE_DATE_EPOCH for volumeid of efi boot image (marmarek@invisiblethingslab.com) -- Preserve timestamps when building fs image (marmarek@invisiblethingslab.com) -- Use SOURCE_DATE_EPOCH for metadata timestamps (marmarek@invisiblethingslab.com) - -* Fri Oct 12 2018 Brian C. Lane 30.5-1 -- Update depsolving with suggestions from dnf (#1636239) (bcl@redhat.com) -- Disable false context-manager pylint error (bcl@redhat.com) -- Fix directory creation for blueprints (bcl@redhat.com) -- Update the tests for new make_dnf_dir arguments. (bcl@redhat.com) -- Change make_dnf_dirs to be run as root (bcl@redhat.com) -- Fix vhd images (vponcova@redhat.com) - -* Tue Oct 09 2018 Brian C. Lane 30.4-1 -- Add an openstack image type (bcl@redhat.com) -- Add cloud-init to vhd images. (dshea@redhat.com) -- Replace /etc/machine-id with an empty file (dshea@redhat.com) - -* Mon Oct 08 2018 Brian C. Lane 30.3-1 -- Update cli tests to use composer-cli name (bcl@redhat.com) -- Revert "Rename composer-cli to composer" (bcl@redhat.com) - -* Fri Oct 05 2018 Brian C. Lane 30.2-1 -- Work around dnf problem with multiple repos (bcl@redhat.com) -- Add and enable cloud-init for ami images (lars@karlitski.net) -- Make no-virt generated images sparser (dshea@redhat.com) -- New lorax documentation - 30.1 (bcl@redhat.com) - -* Wed Oct 03 2018 Brian C. Lane 30.1-1 -- Report an error if the blueprint doesn't exist (bcl@redhat.com) -- cli: Clarify error message for unprivileged access (lars@karlitski.net) -- Write a rootpw line if no root customizations in the blueprint (bcl@redhat.com) - -* Tue Oct 02 2018 Brian C. Lane 30.0-1 -- Add beakerlib to Dockerfile.test (bcl@redhat.com) -- Adjust the new templates for locked root (bcl@redhat.com) -- Adjust projects test for DNF 3.6.1 tuple issue (bcl@redhat.com) -- Don't try to append to DNF config value that can't take it - (awilliam@redhat.com) -- Always update repo metadata when building an image (bcl@redhat.com) -- Add a test for repo metadata expiration (bcl@redhat.com) -- Add tests for setting root password and ssh key with blueprints - (bcl@redhat.com) -- Use rootpw for setting the root password instead of user (bcl@redhat.com) -- Lock the root account, except on live-iso (bcl@redhat.com) -- Add new compose types to compose sanity test (dshea@redhat.com) -- Add virt guest agents to the qcow2 compose (dshea@redhat.com) -- Add a vmdk compose type. (dshea@redhat.com) -- Add a vhd compose type for Azure images (dshea@redhat.com) -- Add an ami compose type for AWS images (dshea@redhat.com) -- Remove --fstype from the generated part line (dshea@redhat.com) -- Also run `make check` on travis (lars@karlitski.net) -- Fix pylint errors and warnings (lars@karlitski.net) -- New cli test covering basic compose commands (atodorov@redhat.com) -- Update glusterfs to 5.* (atodorov@redhat.com) -- Execute bash tests for composer-cli (atodorov@redhat.com) -- Rename composer-cli to composer (lars@karlitski.net) -- Include python3-pyatspi on boot.iso (#1506595) (bcl@redhat.com) -- Start a HACKING.md file and document how to run the tests (stefw@redhat.com) -- tests: Fix tests so they run on Fedora 28 (stefw@redhat.com) -- Ignore files created by tests (stefw@redhat.com) -- Makefile: Fix the 'make install' target (stefw@redhat.com) -- Replace CJK fonts with Google Noto CJK (akira@tagoh.org) -- Fix a DeprecationWarning (dshea@redhat.com) -- Fix the expected versions of blueprint components (dshea@redhat.com) -- Switch the test container back to rawhide (dshea@redhat.com) - -* Fri Sep 07 2018 Brian C. Lane 29.15-1 -- Add a Makefile target for building html docs using a rawhide environment (bcl@redhat.com) -- Revert "Don't activate default auto connections after switchroot" (rvykydal@redhat.com) -- Need to explicitly require python3-librepo (#1626413) (bcl@redhat.com) -- New lorax documentation - 29.14 (bcl@redhat.com) - -* Thu Sep 06 2018 Brian C. Lane 29.14-1 -- Add the create ISO component for ARMv7 (pbrobinson@gmail.com) -- Don't activate default auto connections after switchroot (rvykydal@redhat.com) -- Ignore a pylint warning about UnquotingConfigParser get args (bcl@redhat.com) -- Ditch all use of pyanaconda's simpleconfig (awilliam@redhat.com) - -* Wed Aug 29 2018 Brian C. Lane 29.13-1 -- Update the example blueprints for rawhide (bcl@redhat.com) -- Bump required dnf version to 3.2.0 for module_platform_id support (bcl@redhat.com) -- Add support for DNF 3.2 module_platform_id config value (bcl@redhat.com) -- lorax: Only run depmod on the installed kernels (bcl@redhat.com) - -* Tue Aug 28 2018 Brian C. Lane 29.12-1 -- Minor package fixes for aarch64/ARMv7 (pbrobinson@gmail.com) - -* Mon Aug 27 2018 Brian C. Lane 29.11-1 -- Fix composer-cli blueprints changes to get correct total (bcl@redhat.com) -- Fix blueprints/list and blueprints/changes to return the correct total (bcl@redhat.com) -- Add tests for limit=0 routes (bcl@redhat.com) -- Add a function to get_url_json_unlimited to retrieve the total (bcl@redhat.com) -- Fix tests related to blueprint name changes (bcl@redhat.com) -- Add 'example' to the example blueprint names (bcl@redhat.com) -- Use urllib.parse instead of urlparse (bcl@redhat.com) -- In composer-cli, request all results (dshea@redhat.com) -- Add tests for /compose/status filter arguments (dshea@redhat.com) -- Allow '*' as a uuid in /compose/status/ (dshea@redhat.com) -- Add filter arguments to /compose/status (dshea@redhat.com) -- composer-cli should not log to a file by default (bcl@redhat.com) -- Add documentation for using a DVD as the package source (bcl@redhat.com) -- Set TCP listen backlog for API socket to SOMAXCONN (lars@karlitski.net) -- Update Arm architectures for the latest requirements (pbrobinson@gmail.com) -- New lorax documentation - 29.11 (bcl@redhat.com) -- Add a note about using lorax-composer.service (bcl@redhat.com) -- Ignore dnf.logging when building docs (bcl@redhat.com) -- Bring back import-state.service (#1615332) (rvykydal@redhat.com) -- Fix a little bug in running "modules list". (clumens@redhat.com) -- Fix bash_completion.d typo (bcl@redhat.com) -- Move disklabel and UEFI support to compose.py (bcl@redhat.com) -- Fix more tests. (clumens@redhat.com) -- Change INVALID_NAME to INVALID_CHARS. (clumens@redhat.com) -- Update composer-cli for the new error return types. (clumens@redhat.com) -- Add default error IDs everywhere else. (clumens@redhat.com) -- Add error IDs to things that can go wrong when running a compose. (clumens@redhat.com) -- Add error IDs for common source-related errors. (clumens@redhat.com) -- Add error IDs for unknown modules and unknown projects. (clumens@redhat.com) -- Add error IDs for when an unknown commit is requested. (clumens@redhat.com) -- Add error IDs for when an unknown blueprint is requested. (clumens@redhat.com) -- Add error IDs for when an unknown build UUID is requested. (clumens@redhat.com) -- Add error IDs for bad state conditions. (clumens@redhat.com) -- Change the error return type for bad limit= and offset=. (clumens@redhat.com) -- Don't sort error messages. (clumens@redhat.com) -- Fix bash completion of compose info (bcl@redhat.com) -- Add + to the allowed API string character set (bcl@redhat.com) -- Add job_* timestamp support to compose status (bcl@redhat.com) -- Drop .decode from UTF8_TEST_STRING (bcl@redhat.com) -- Add input string checks to the branch and format arguments (bcl@redhat.com) -- Add a test for invalid characters in the API route (bcl@redhat.com) -- Add etc/bash_completion.d/composer-cli (wwoods@redhat.com) -- composer-cli: clean up "list" commands (wwoods@redhat.com) -- Fix logging argument (bcl@redhat.com) -- Update get_system_repo for dnf (bcl@redhat.com) -- Update ConfigParser usage for Py3 (bcl@redhat.com) -- Update StringIO use for Py3 (bcl@redhat.com) -- Add a test for the pylorax.api.timestamp functions (bcl@redhat.com) -- Fix write_timestamp for py3 (bcl@redhat.com) -- Return a JSON error instead of a 404 on certain malformed URLs. (clumens@redhat.com) -- Return an error if /modules/info doesn't return anything. (clumens@redhat.com) -- Update documentation (#409). (clumens@redhat.com) -- Use constants instead of strings (#409). (clumens@redhat.com) -- Write timestamps when important events happen during the compose (#409). (clumens@redhat.com) -- Return multiple timestamps in API results (#409). (clumens@redhat.com) -- Add a new timestamp.py file to the API directory (#409). (clumens@redhat.com) -- Use the first enabled system repo for the test (bcl@redhat.com) -- Show more details when the system repo delete test fails (bcl@redhat.com) -- Add composer-cli function tests (bcl@redhat.com) -- Add a test library (bcl@redhat.com) -- composer-cli: Add support for Group to blueprints diff (bcl@redhat.com) -- Update status.py to use new handle_api_result (bcl@redhat.com) -- Update sources.py to use new handle_api_result (bcl@redhat.com) -- Update projects.py to use new handle_api_result (bcl@redhat.com) -- Update modules.py to use new handle_api_result (bcl@redhat.com) -- Update compose.py to use new handle_api_result (bcl@redhat.com) -- Update blueprints.py to use new handle_api_result (bcl@redhat.com) -- Modify handle_api_result so it can be used in more places (bcl@redhat.com) -- Fix help output on the compose subcommand. (clumens@redhat.com) -- Add timestamps to "compose-cli compose status" output. (clumens@redhat.com) -- And then add real output to the status command. (clumens@redhat.com) -- Add the beginnings of a new status subcommand. (clumens@redhat.com) -- Document that you shouldn't run lorax-composer twice. (clumens@redhat.com) -- Add PIDFile to the .service file. (clumens@redhat.com) -- composer-cli: Fix non-zero epoch in projets info (bcl@redhat.com) - -* Fri Jul 20 2018 Brian C. Lane 29.10-1 -- New lorax documentation - 29.10 (bcl@redhat.com) -- Add dnf.transaction to list of modules for sphinx to ignore (bcl@redhat.com) -- Log and exit on metadata update errors at startup (bcl@redhat.com) -- Check /projects responses for null values. (bcl@redhat.com) -- Clarify error message from /source/new (bcl@redhat.com) -- Update samba and rsync versions for tests (bcl@redhat.com) -- Support loading groups from the kickstart template files. (clumens@redhat.com) -- Add group-based tests. (clumens@redhat.com) -- Include groups in depsolving. (clumens@redhat.com) -- Add support for groups to blueprints. (clumens@redhat.com) -- Add help output to each subcommand. (clumens@redhat.com) -- Split the help output into its own module. (clumens@redhat.com) -- If the help subcommand is given, print the help output. (clumens@redhat.com) -- Check the compose templates at startup (bcl@redhat.com) -- Fix a couple typos in lorax-composer docs. (bcl@redhat.com) - -* Wed Jun 27 2018 Brian C. Lane 29.9-1 -- DNF 3: progress callback constants moved to dnf.transaction (awilliam@redhat.com) -- Include example blueprints in the rpm (bcl@redhat.com) -- Make sure /run/weldr has correct ownership and permissions (bcl@redhat.com) - -* Fri Jun 22 2018 Brian C. Lane 29.8-1 -- Fixing bug where test did not try to import pylorax.version (sophiafondell) -- Add the ability to enable DNF plugins for lorax (bcl@redhat.com) -- Allow more than 1 bash build in tests (bcl@redhat.com) -- Update tests for glusterfs 4.1.* on rawhide (bcl@redhat.com) -- Install 'hostname' in runtime-install (for iSCSI) (awilliam@redhat.com) -- Add redhat.exec to s390 .treeinfo (bcl@redhat.com) -- It's /compose/cancel, not /blueprints/cancel. (clumens@redhat.com) -- Retry losetup if loop_attach fails (bcl@redhat.com) -- Add reqpart to example kickstart files (bcl@redhat.com) -- Increase default ram used with lmc and virt to 2048 (bcl@redhat.com) - -* Thu Jun 07 2018 Brian C. Lane 29.7-1 -- New lorax documentation - 29.7 (bcl@redhat.com) -- Add --dracut-arg support to lorax (bcl@redhat.com) -- Make LogRequestHandler configurable (mkolman@redhat.com) -- gevent has deprecated .wsgi, should use .pywsgi instead (bcl@redhat.com) - -* Mon Jun 04 2018 Brian C. Lane 29.6-1 -- New lorax documentation - 29.6 (bcl@redhat.com) -- Override Sphinx documentation version with LORAX_VERSION (bcl@redhat.com) -- Add support for sources to composer-cli (bcl@redhat.com) -- Fix DNF related issues with source selection (bcl@redhat.com) -- Fix handling bad source repos and add a test (bcl@redhat.com) -- Speed up test_dnfbase.py (bcl@redhat.com) -- Make sure new sources show up in the source/list output (bcl@redhat.com) -- Fix make_dnf_dirs (bcl@redhat.com) -- Update test_server for rawhide (bcl@redhat.com) -- Add support for user defined package sources API (bcl@redhat.com) - -* Wed May 23 2018 Brian C. Lane 29.5-1 -- templates: Stop using gconfset (walters@verbum.org) -- Add support for version globs to blueprints (bcl@redhat.com) -- Update atlas blueprint (bcl@redhat.com) - -* Thu May 17 2018 Brian C. Lane 29.4-1 -- Update documentation (#1430906) (bcl@redhat.com) -- really kill kernel-bootwrapper on ppc (dan@danny.cz) - -* Mon May 14 2018 Brian C. Lane 29.3-1 -- Update the README with relevant URLs (bcl@redhat.com) -- Fix documentation for enabling lorax-composer.socket (bcl@redhat.com) -- Add support for systemd socket activation (bcl@redhat.com) -- Remove -boot-info-table from s390 boot.iso creation (#1478448) (bcl@redhat.com) -- Update the generated html docs (bcl@redhat.com) -- Add documentation for lorax-composer and composer-cli (bcl@redhat.com) -- Move lorax-composer and composer-cli argument parsing into modules (bcl@redhat.com) -- Update composer templates for use with Fedora (bcl@redhat.com) -- Add new cmdline args to compose_args settings (bcl@redhat.com) -- lorax-composer also requires tar (bcl@redhat.com) -- Remove temporary files after run_compose (bcl@redhat.com) -- Add --proxy to lorax-composer cmdline (bcl@redhat.com) -- Pass the --tmp value into run_creator and cleanup after a crash (bcl@redhat.com) -- Add --tmp to lorax-composer and set default tempdir (bcl@redhat.com) -- Set lorax_templates to the correct directory (bcl@redhat.com) -- Adjust the disk size estimates to match Anaconda (bcl@redhat.com) -- Skip creating groups with the same name as a user (bcl@redhat.com) -- Add user and group creation to blueprint (bcl@redhat.com) -- Add blueprint customization support for hostname and ssh key (bcl@redhat.com) -- Update setup.py for lorax-composer and composer-cli (bcl@redhat.com) -- Add composer-cli and tests (bcl@redhat.com) -- Fix the compose arguments for the Fedora version of Anaconda (bcl@redhat.com) -- Add selinux check to lorax-composer (bcl@redhat.com) -- Update test_server for blueprint and Yum to DNF changes. (bcl@redhat.com) -- Convert Yum usage to DNF (bcl@redhat.com) -- workspace read and write needs UTF-8 conversion (bcl@redhat.com) -- Return an empty list if depsolve results are empty (bcl@redhat.com) -- The git blob needs to be bytes (bcl@redhat.com) -- Remove bin and sbin from nose (bcl@redhat.com) -- Update the test blueprints (bcl@redhat.com) -- Ignore more pylint errors (bcl@redhat.com) -- Use default commit sort order instead of TIME (bcl@redhat.com) -- Add lorax-composer and the composer kickstart templates (bcl@redhat.com) -- Update pylorax.api.projects for DNF usage (bcl@redhat.com) -- Update dnfbase (formerly yumbase) for DNF support (bcl@redhat.com) -- Move core of livemedia-creator into pylorax.creator (bcl@redhat.com) -- Update dnfbase tests (bcl@redhat.com) -- Convert lorax-composer yum base object to DNF (bcl@redhat.com) -- Use 2to3 to convert the python2 lorax-composer code to python3 (bcl@redhat.com) -- Add the tests from lorax-composer branch (bcl@redhat.com) -- Update .dockerignore (bcl@redhat.com) -- Update lorax.spec for lorax-composer (bcl@redhat.com) -- livemedia-creator: Move core functions into pylorax modules (bcl@redhat.com) - -* Thu May 03 2018 Brian C. Lane 29.2-1 -- Enable testing in Travis and collecting of coverage history (atodorov@redhat.com) -- Check selinux state before creating output directory (bcl@redhat.com) -- change installed packages on ppc (dan@danny.cz) -- drop support for 32-bit ppc (dan@danny.cz) -- remove redundant mkdir (dan@danny.cz) - -* Mon Apr 09 2018 Brian C. Lane 29.1-1 -- Fix anaconda metapackage name (mkolman@redhat.com) -- Include the anaconda-install-env-deps metapackage (mkolman@redhat.com) -- Update the URL in lorax.spec to point to new Lorax location (bcl@redhat.com) -- lorax's gh-pages are under ./lorax/ so make the links relative - (bcl@redhat.com) -- New lorax documentation - 29.0 (bcl@redhat.com) - -* Thu Mar 15 2018 Brian C. Lane 29.0-1 -- Update Copyright year to 2018 in Sphinx docs (bcl@redhat.com) -- Add links to documentation for previous versions (bcl@redhat.com) -- make docs now also builds html (bcl@redhat.com) -- Update default releasever to Fedora 29 (rawhide) (jkonecny@redhat.com) - -* Mon Feb 26 2018 Brian C. Lane 28.8-1 -- cleanup: don't remove libgstgl (dusty@dustymabe.com) - -* Fri Feb 23 2018 Brian C. Lane 28.7-1 -- Fix _install_branding (bcl@redhat.com) -- livemedia-creator --no-virt requires a system-logos package (bcl@redhat.com) -- Revert "add system-logos dependency for syslinux" (bcl@redhat.com) - -* Thu Feb 22 2018 Brian C. Lane 28.6-1 -- add system-logos dependency for syslinux (pbrobinson@gmail.com) -- Really don't try to build EFI images on i386 (awilliam@redhat.com) - -* Mon Jan 29 2018 Brian C. Lane 28.5-1 -- Don't try to build efi images for basearch=i386. (pjones@redhat.com) -- LMC: Make the QEMU RNG device optional (yturgema@redhat.com) - -* Wed Jan 17 2018 Brian C. Lane 28.4-1 -- Write the --variant string to .buildstamp as 'Variant=' (bcl@redhat.com) -- Run the pylorax tests with 'make test' (bcl@redhat.com) -- Fix installpkg exclude operation (bcl@redhat.com) - -* Wed Jan 03 2018 Brian C. Lane 28.3-1 -- Add --old-chroot to the mock example cmdlines (bcl@redhat.com) -- Don't try and install kernel-PAE on i686 any more (awilliam@redhat.com) -- New lorax documentation - 28.2 (bcl@redhat.com) - -* Tue Nov 28 2017 Brian C. Lane 28.2-1 -- Add documentation about mock changes (#1473880) (bcl@redhat.com) -- Log a more descriptive error when setfiles fails (#1499771) (bcl@redhat.com) -- Add /usr/share/lorax/templates.d ownership to lorax-templates-generic - (bcl@redhat.com) -- Add dependencies for SE/HMC (vponcova@redhat.com) -- Allow installpkgs to do version pinning through globbing (claudioz@fb.com) -- Storaged re-merged with udisks2 upstream (sgallagh@redhat.com) - -* Thu Oct 19 2017 Brian C. Lane 28.1-1 -- Use bytes when writing strings in mk-s390-cdboot (#1504026) (bcl@redhat.com) - -* Tue Oct 17 2017 Brian C. Lane 28.0-1 -- Add make test target and update .gitignore (atodorov@redhat.com) -- Add first unit test so we can start collecting coverage (atodorov@redhat.com) -- Convert mk-s390-cdboot to python3 (#1497141) (bcl@redhat.com) -- Update false positives (atodorov@redhat.com) -- Rename parameters to match names that dnf uses (atodorov@redhat.com) -- Don't override 'line' from outer scope (atodorov@redhat.com) -- Add swaplabel command (vponcova@redhat.com) - -* Wed Sep 27 2017 Brian C. Lane 27.11-1 -- s390 doesn't need to graft product.img and updates.img into /images (#1496461) (bcl@redhat.com) -- distribute the mk-s390-cdboot utility (dan@danny.cz) -- update graft variable in s390 template (dan@danny.cz) - -* Mon Sep 18 2017 Brian C. Lane 27.10-1 -- Restore all of the grub2-tools on x86_64 and i386 (#1492197) (bcl@redhat.com) - -* Fri Aug 25 2017 Brian C. Lane 27.9-1 -- x86.tmpl: initially define compressargs as empty string (awilliam@redhat.com) -- x86.tmpl: ensure efiarch64 is defined (awilliam@redhat.com) - -* Thu Aug 24 2017 Brian C. Lane 27.8-1 -- Fix grub2-efi-ia32-cdboot and shim-ia32 bits. (pjones@redhat.com) - -* Thu Aug 24 2017 Brian C. Lane 27.7-1 -- Make 64-bit kernel on 32-bit firmware work for x86 efi machines (pjones@redhat.com) -- Don't install rdma bits on 32-bit ARM (#1483278) (awilliam@redhat.com) - -* Mon Aug 14 2017 Brian C. Lane 27.6-1 -- Add creation of a bootable s390 iso (#1478448) (bcl@redhat.com) -- Add mk-s360-cdboot utility (#1478448) (bcl@redhat.com) -- Fix systemctl command (#1478247) (bcl@redhat.com) -- Add version output (#1335456) (bcl@redhat.com) -- Include the dracut fips module in the initrd (#1341280) (bcl@redhat.com) -- Make sure loop device is setup (#1462150) (bcl@redhat.com) - -* Wed Aug 02 2017 Brian C. Lane 27.5-1 -- runtime-cleanup: preserve a couple more gstreamer libs (awilliam@redhat.com) -- perl is needed on all arches now (dennis@ausil.us) - -* Mon Jul 10 2017 Brian C. Lane 27.4-1 -- runtime-cleanup.tmpl: don't delete localedef (jlebon@redhat.com) - -* Tue Jun 20 2017 Brian C. Lane 27.3-1 -- Don't remove libmenu.so library during cleanup on PowerPC (sinny@redhat.com) - -* Thu Jun 01 2017 Brian C. Lane 27.2-1 -- Remove filegraft from arm.tmpl (#1457906) (bcl@redhat.com) -- Use anaconda-core to detect buildarch (sgallagh@redhat.com) - -* Wed May 31 2017 Brian C. Lane 27.1-1 -- arm.tmpl import basename (#1457055) (bcl@redhat.com) - -* Tue May 30 2017 Brian C. Lane 27.0-1 -- Bump version to 27.0 (bcl@redhat.com) -- Try all packages when installpkg --optional is used. (bcl@redhat.com) -- Add support for aarch64 live images (bcl@redhat.com) -- pylint: Ignore different argument lengths for dnf callback. (bcl@redhat.com) -- Adds additional callbacks keyword for start() (jmracek@redhat.com) -- Add ppc64-diag for Power64 platforms (pbrobinson@gmail.com) -- livemedia-creator: Add release license files to / of the iso (bcl@redhat.com) -- lorax: Add release license files to / of the iso (bcl@redhat.com) -- INSTALL_ROOT and LIVE_ROOT are not available during %%post (bcl@redhat.com) -- Add --noverifyssl to lorax (#1430483) (bcl@redhat.com) diff --git a/sources b/sources index 5180f06..6e0b9bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-32.0.tar.gz) = 31e9ef812f50f786eef203f02e24de8ef24a39985d79b2ad4c80bd47d5407fd0ee1bef8802e28a9a2a11574f6d0879136e1918036ea30febc5e74c4f15a0a447 +SHA512 (lorax-32.1.tar.gz) = f8b80375bb9033dc609ef676479c90f606e4ed69537118f80d44f0911f0ca48d2e5d1a341bf0345585cf1a6779179e6ae61445c36773c53b01ee4434f58621b6 From c791c3fcca89d2922fedce4e0feb87a3188e4024 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 5 Nov 2019 14:43:11 -0800 Subject: [PATCH 043/203] - 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) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e5ea2dd..afe07fc 100644 --- a/.gitignore +++ b/.gitignore @@ -169,3 +169,4 @@ /lorax-31.10.tar.gz /lorax-32.0.tar.gz /lorax-32.1.tar.gz +/lorax-32.2.tar.gz diff --git a/sources b/sources index 6e0b9bb..a7d23c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-32.1.tar.gz) = f8b80375bb9033dc609ef676479c90f606e4ed69537118f80d44f0911f0ca48d2e5d1a341bf0345585cf1a6779179e6ae61445c36773c53b01ee4434f58621b6 +SHA512 (lorax-32.2.tar.gz) = 61298ef9060dea54f39cf7102a92b9566828274b1818de717cb61f7f869d15d3bc41049b75df1717c777dd8d9d26f4a2bb2eb5cc47e589c0a27880d2d5b31a1b From d8ff91e01e71342efa8865ef4f8351d88beb546f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 5 Nov 2019 15:11:30 -0800 Subject: [PATCH 044/203] Add missing lorax.spec for 32.2 --- lorax.spec | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 5c03e99..310e093 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 32.1 +Version: 32.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -217,6 +217,7 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sbindir}/lorax %{_sbindir}/mkefiboot %{_sbindir}/livemedia-creator +%{_sbindir}/mkksiso %{_bindir}/image-minimizer %{_bindir}/mk-s390-cdboot %dir %{_sysconfdir}/lorax @@ -224,6 +225,7 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %dir %{_datadir}/lorax %{_mandir}/man1/lorax.1* %{_mandir}/man1/livemedia-creator.1* +%{_mandir}/man1/mkksiso.1* %{_tmpfilesdir}/lorax.conf %files docs @@ -260,6 +262,35 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) From 7b921513c3fce83a8d9dd2d8be83d3ac6cf6365c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 18 Nov 2019 16:09:23 -0800 Subject: [PATCH 045/203] - 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) --- .gitignore | 1 + lorax.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index afe07fc..d7a4b4e 100644 --- a/.gitignore +++ b/.gitignore @@ -170,3 +170,4 @@ /lorax-32.0.tar.gz /lorax-32.1.tar.gz /lorax-32.2.tar.gz +/lorax-32.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 310e093..dc3a80a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 32.2 +Version: 32.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -262,6 +262,18 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index a7d23c4..efe9be8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-32.2.tar.gz) = 61298ef9060dea54f39cf7102a92b9566828274b1818de717cb61f7f869d15d3bc41049b75df1717c777dd8d9d26f4a2bb2eb5cc47e589c0a27880d2d5b31a1b +SHA512 (lorax-32.3.tar.gz) = 1f7e88e7ada8b81276257b4e652804174a64936223a67a8b227d0636ffc551630be2074862bc5cdd597832e75c5e5230f0e0f96af1bf849212c3090e09bacc03 From 06edbcacd182778bcea0c7793f912f929d64e92b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 10 Jan 2020 11:39:36 -0800 Subject: [PATCH 046/203] - 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) --- .gitignore | 1 + lorax.spec | 21 ++++++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d7a4b4e..d294bda 100644 --- a/.gitignore +++ b/.gitignore @@ -171,3 +171,4 @@ /lorax-32.1.tar.gz /lorax-32.2.tar.gz /lorax-32.3.tar.gz +/lorax-32.4.tar.gz diff --git a/lorax.spec b/lorax.spec index dc3a80a..7712cc1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 32.3 +Version: 32.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -16,6 +16,7 @@ URL: https://github.com/weldr/lorax Source0: %{name}-%{version}.tar.gz BuildRequires: python3-devel +BuildRequires: make Requires: lorax-templates @@ -262,6 +263,24 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index efe9be8..6d6addb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-32.3.tar.gz) = 1f7e88e7ada8b81276257b4e652804174a64936223a67a8b227d0636ffc551630be2074862bc5cdd597832e75c5e5230f0e0f96af1bf849212c3090e09bacc03 +SHA512 (lorax-32.4.tar.gz) = 121b78a77e7d7624e382ae3171e8feb794ef8ad15fe3439ff208d9bba4e4ffaa072301ae7de9095dbe617e9463438bbb7e5b1ac7068b10d3fc6208e76879d403 From 001d47303a5438f5034dc095a6c8b33a797c2031 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 16 Jan 2020 10:36:00 -0800 Subject: [PATCH 047/203] - 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) --- .gitignore | 1 + lorax.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d294bda..bc8fb99 100644 --- a/.gitignore +++ b/.gitignore @@ -172,3 +172,4 @@ /lorax-32.2.tar.gz /lorax-32.3.tar.gz /lorax-32.4.tar.gz +/lorax-32.5.tar.gz diff --git a/lorax.spec b/lorax.spec index 7712cc1..c4f01e0 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 32.4 +Version: 32.5 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -263,6 +263,21 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 6d6addb..3733bbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-32.4.tar.gz) = 121b78a77e7d7624e382ae3171e8feb794ef8ad15fe3439ff208d9bba4e4ffaa072301ae7de9095dbe617e9463438bbb7e5b1ac7068b10d3fc6208e76879d403 +SHA512 (lorax-32.5.tar.gz) = 636a900451a0a46dfd17ab41c8255ab64a663afe4258e7dce2dce0de4e186e95dfd1b36039ea1c98f3db1f4c126e4da4b4dbf64d32a5a30035528e3b0141ed10 From 8d5e77b375bc49fcf2fa0a50efffe5a758b40938 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:18:07 +0000 Subject: [PATCH 048/203] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index c4f01e0..b7b65d2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 32.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -263,6 +263,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 32.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * 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) From 7cc511a7d3b064544b50a7430c68bf7ff9bacb09 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 12 Feb 2020 13:30:43 -0800 Subject: [PATCH 049/203] - 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) --- .gitignore | 1 + lorax.spec | 23 +++++++++++++++++++---- sources | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bc8fb99..f94dde2 100644 --- a/.gitignore +++ b/.gitignore @@ -173,3 +173,4 @@ /lorax-32.3.tar.gz /lorax-32.4.tar.gz /lorax-32.5.tar.gz +/lorax-32.6.tar.gz diff --git a/lorax.spec b/lorax.spec index b7b65d2..289a258 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 32.5 -Release: 2%{?dist} +Version: 32.6 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -263,8 +263,23 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Wed Jan 29 2020 Fedora Release Engineering - 32.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* 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) diff --git a/sources b/sources index 3733bbc..5ea7720 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-32.5.tar.gz) = 636a900451a0a46dfd17ab41c8255ab64a663afe4258e7dce2dce0de4e186e95dfd1b36039ea1c98f3db1f4c126e4da4b4dbf64d32a5a30035528e3b0141ed10 +SHA512 (lorax-32.6.tar.gz) = 8751182efcd60f375569208e02ee9eac30d16c2268139843d1c8a602061d6a39e61e2d2f7eb4086efd836700daf7c3455ed17b3cfb2fe94cd2fb7840e7a727ef From 94efdc8bbb36f21123160ea669cb230ba10cac6d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 16 Mar 2020 11:57:08 -0700 Subject: [PATCH 050/203] - 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) --- .gitignore | 1 + lorax.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f94dde2..1d613b0 100644 --- a/.gitignore +++ b/.gitignore @@ -174,3 +174,4 @@ /lorax-32.4.tar.gz /lorax-32.5.tar.gz /lorax-32.6.tar.gz +/lorax-32.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 289a258..edab472 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 32.6 +Version: 32.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -160,6 +160,9 @@ Requires: python3-boto3 %{?systemd_requires} BuildRequires: systemd +# Implements the weldr API +Provides: weldr + %description composer lorax-composer provides a REST API for building images using lorax. @@ -263,6 +266,13 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* 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) diff --git a/sources b/sources index 5ea7720..8f667e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-32.6.tar.gz) = 8751182efcd60f375569208e02ee9eac30d16c2268139843d1c8a602061d6a39e61e2d2f7eb4086efd836700daf7c3455ed17b3cfb2fe94cd2fb7840e7a727ef +SHA512 (lorax-32.7.tar.gz) = b6cee6ee9455279c5dcd559130dc702b899521879391190e2238f227953e7a4871e794b4811cc78729ee85fc2188353eb6cb1e0b215e4aa9233eb258332444f9 From 6c739f034ef721ef8ebbe4d5b5f95ee4f0fb59fa Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 20 Mar 2020 11:34:46 -0700 Subject: [PATCH 051/203] - tests: Add tests for _install_branding with and without variant (bcl@redhat.com) - lorax: Update how the release package is chosen (bcl@redhat.com) - ltmpl: Fix package logging format (bcl@redhat.com) Resolves: rhbz#1815000 --- .gitignore | 1 + lorax.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1d613b0..e018702 100644 --- a/.gitignore +++ b/.gitignore @@ -175,3 +175,4 @@ /lorax-32.5.tar.gz /lorax-32.6.tar.gz /lorax-32.7.tar.gz +/lorax-33.0.tar.gz diff --git a/lorax.spec b/lorax.spec index edab472..6876028 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 32.7 +Version: 33.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -266,6 +266,13 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Fri Mar 20 2020 Brian C. Lane 33.0-1 +- tests: Add tests for _install_branding with and without variant (bcl@redhat.com) +- 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) diff --git a/sources b/sources index 8f667e9..cc2fd2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-32.7.tar.gz) = b6cee6ee9455279c5dcd559130dc702b899521879391190e2238f227953e7a4871e794b4811cc78729ee85fc2188353eb6cb1e0b215e4aa9233eb258332444f9 +SHA512 (lorax-33.0.tar.gz) = 678cd871c284afb4718dfe85c2f7017a691940295bcc81af0b252ed155ad624f418691129d8c4458a6005c707c352576f6568d6e28b472db7cfb3b2717955c03 From c542311ec494aeabcafffbd608cd7e24371f5ebd Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 30 Mar 2020 10:19:17 -0700 Subject: [PATCH 052/203] - lorax: Remove vmlinuz from install.img /boot (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e018702..5a7b0bd 100644 --- a/.gitignore +++ b/.gitignore @@ -176,3 +176,4 @@ /lorax-32.6.tar.gz /lorax-32.7.tar.gz /lorax-33.0.tar.gz +/lorax-33.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 6876028..7bbfc86 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 33.0 +Version: 33.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -41,7 +41,7 @@ Requires: xz-lzma-compat Requires: xz Requires: pigz Requires: pbzip2 -Requires: dracut >= 030 +Requires: dracut >= 050 Requires: kpartx # Python modules @@ -266,6 +266,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Mon Mar 30 2020 Brian C. Lane 33.1-1 +- lorax: Remove vmlinuz from install.img /boot (bcl@redhat.com) + * Fri Mar 20 2020 Brian C. Lane 33.0-1 - tests: Add tests for _install_branding with and without variant (bcl@redhat.com) - lorax: Update how the release package is chosen (bcl@redhat.com) diff --git a/sources b/sources index cc2fd2a..c629e52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.0.tar.gz) = 678cd871c284afb4718dfe85c2f7017a691940295bcc81af0b252ed155ad624f418691129d8c4458a6005c707c352576f6568d6e28b472db7cfb3b2717955c03 +SHA512 (lorax-33.1.tar.gz) = 72cac990318e554c942f7b6c70b0bcba9c242d26168c14f078623019d80a186aecf909b3d802fe0b76e6667a1f21722e8d951a661c42210b9841fc3793a3e905 From 6c087614f859f4b65c92f382c054bde1c782bfe0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 28 Apr 2020 12:20:17 -0700 Subject: [PATCH 053/203] - New lorax documentation - 33.2 (bcl@redhat.com) - test: Work around invalid fedora baseurls (marusak.matej@gmail.com) - lorax: Add --skip-branding cmdline argument (bcl@redhat.com) - Update datastore for VMware testing (chrobert@redhat.com) --- .gitignore | 1 + lorax.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5a7b0bd..cd9a10d 100644 --- a/.gitignore +++ b/.gitignore @@ -177,3 +177,4 @@ /lorax-32.7.tar.gz /lorax-33.0.tar.gz /lorax-33.1.tar.gz +/lorax-33.2.tar.gz diff --git a/lorax.spec b/lorax.spec index 7bbfc86..6abc232 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 33.1 +Version: 33.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -266,6 +266,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Tue Apr 28 2020 Brian C. Lane 33.2-1 +- New lorax documentation - 33.2 (bcl@redhat.com) +- test: Work around invalid fedora baseurls (marusak.matej@gmail.com) +- lorax: Add --skip-branding cmdline argument (bcl@redhat.com) +- Update datastore for VMware testing (chrobert@redhat.com) + * Mon Mar 30 2020 Brian C. Lane 33.1-1 - lorax: Remove vmlinuz from install.img /boot (bcl@redhat.com) diff --git a/sources b/sources index c629e52..4f66d7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.1.tar.gz) = 72cac990318e554c942f7b6c70b0bcba9c242d26168c14f078623019d80a186aecf909b3d802fe0b76e6667a1f21722e8d951a661c42210b9841fc3793a3e905 +SHA512 (lorax-33.2.tar.gz) = 441d0791d515849db155f18bd847b51fd21bcd1c12c9b18ee7263bf38a4e71a4a2e3ad744717c25ab9732f8ce5f3798c7f75c27600d4cfb979f2272dc021747f From c3e348e2d37813286d2f423080a43f5e5d5ecbbe Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 5 May 2020 14:41:12 -0700 Subject: [PATCH 054/203] - Don't use f-string without interpolation (atodorov@redhat.com) - lmc-no-virt: Add requirement on anaconda-install-env-deps (bcl@redhat.com) - rsyslog: Disable journal ratelimits during install (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cd9a10d..edb081c 100644 --- a/.gitignore +++ b/.gitignore @@ -178,3 +178,4 @@ /lorax-33.0.tar.gz /lorax-33.1.tar.gz /lorax-33.2.tar.gz +/lorax-33.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 6abc232..83f5ebb 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 33.2 +Version: 33.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -115,6 +115,7 @@ Summary: livemedia-creator no-virt dependencies Requires: lorax = %{version}-%{release} Requires: anaconda-core Requires: anaconda-tui +Requires: anaconda-install-env-deps Requires: system-logos %description lmc-novirt @@ -266,6 +267,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Tue May 05 2020 Brian C. Lane 33.3-1 +- Don't use f-string without interpolation (atodorov@redhat.com) +- lmc-no-virt: Add requirement on anaconda-install-env-deps (bcl@redhat.com) +- rsyslog: Disable journal ratelimits during install (bcl@redhat.com) + * Tue Apr 28 2020 Brian C. Lane 33.2-1 - New lorax documentation - 33.2 (bcl@redhat.com) - test: Work around invalid fedora baseurls (marusak.matej@gmail.com) diff --git a/sources b/sources index 4f66d7c..396dce8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.2.tar.gz) = 441d0791d515849db155f18bd847b51fd21bcd1c12c9b18ee7263bf38a4e71a4a2e3ad744717c25ab9732f8ce5f3798c7f75c27600d4cfb979f2272dc021747f +SHA512 (lorax-33.3.tar.gz) = 47e506a9e9a3d07f805c80d3a84bd45a845a50dab5d67268b71d170da5b8f45668e34cb1bc903814c9747de02a8a881c71c0d2dce4152a5f07ef48dc238553f7 From 28434447c63569d79c797a19ee24456f82680344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 24 May 2020 18:55:54 +0200 Subject: [PATCH 055/203] Rebuilt for Python 3.9 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 83f5ebb..a6daecd 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 33.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -267,6 +267,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Sun May 24 2020 Miro Hrončok - 33.3-2 +- Rebuilt for Python 3.9 + * Tue May 05 2020 Brian C. Lane 33.3-1 - Don't use f-string without interpolation (atodorov@redhat.com) - lmc-no-virt: Add requirement on anaconda-install-env-deps (bcl@redhat.com) From b33aa7d1239402720190f2bcc8c572051d552478 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 1 Jun 2020 14:28:13 -0700 Subject: [PATCH 056/203] - Revert "lorax: Remove vmlinuz from install.img /boot" (bcl@redhat.com) - composer-cli: Add osbuild-composer to connection failure message (bcl@redhat.com) - composer-cli: Update docs to mention osbuild-composer and debug options (bcl@redhat.com) - lorax-composer: Check compose/status for invalid characters (bcl@redhat.com) - lorax-composer: deleting an unknown workspace should return an error (bcl@redhat.com) - lorax-composer: Check for valid characters in the undo commit (bcl@redhat.com) - drop 32-bit support from ppc live image grub.cfg (dan@danny.cz) - mksquashfs: Catch errors with mksquashfs and report them (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index edb081c..78cfa33 100644 --- a/.gitignore +++ b/.gitignore @@ -179,3 +179,4 @@ /lorax-33.1.tar.gz /lorax-33.2.tar.gz /lorax-33.3.tar.gz +/lorax-33.4.tar.gz diff --git a/lorax.spec b/lorax.spec index a6daecd..d88177a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 33.3 -Release: 2%{?dist} +Version: 33.4 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -41,7 +41,7 @@ Requires: xz-lzma-compat Requires: xz Requires: pigz Requires: pbzip2 -Requires: dracut >= 050 +Requires: dracut >= 030 Requires: kpartx # Python modules @@ -267,8 +267,15 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Sun May 24 2020 Miro Hrončok - 33.3-2 -- Rebuilt for Python 3.9 +* Mon Jun 01 2020 Brian C. Lane 33.4-1 +- Revert "lorax: Remove vmlinuz from install.img /boot" (bcl@redhat.com) +- composer-cli: Add osbuild-composer to connection failure message (bcl@redhat.com) +- composer-cli: Update docs to mention osbuild-composer and debug options (bcl@redhat.com) +- lorax-composer: Check compose/status for invalid characters (bcl@redhat.com) +- lorax-composer: deleting an unknown workspace should return an error (bcl@redhat.com) +- lorax-composer: Check for valid characters in the undo commit (bcl@redhat.com) +- drop 32-bit support from ppc live image grub.cfg (dan@danny.cz) +- mksquashfs: Catch errors with mksquashfs and report them (bcl@redhat.com) * Tue May 05 2020 Brian C. Lane 33.3-1 - Don't use f-string without interpolation (atodorov@redhat.com) diff --git a/sources b/sources index 396dce8..af13552 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.3.tar.gz) = 47e506a9e9a3d07f805c80d3a84bd45a845a50dab5d67268b71d170da5b8f45668e34cb1bc903814c9747de02a8a881c71c0d2dce4152a5f07ef48dc238553f7 +SHA512 (lorax-33.4.tar.gz) = 5cbe5bfed31744e66d3536894a5f1a44046aed270adfad77c92b8204b74fa205fbac81926b9c5e922c23a10c8805851711f8e85c4cf27a07c6725a1e1935ca34 From cf351447aca9d12e941c28b4f3dfeded14631cf0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 11 Jun 2020 09:50:02 -0700 Subject: [PATCH 057/203] - lorax-composer: Add deprecation notice to documentation (bcl@redhat.com) - composer-cli: Return a better error with no value (bcl@redhat.com) - tests: Add tests for composer-cli compose start JSON POST (bcl@redhat.com) - composer-cli: Update bash completion for start-ostree (bcl@redhat.com) - composer-cli: Add new start-ostree command (bcl@redhat.com) - composer-cli: Add support for --size to compose start (bcl@redhat.com) - include generic.ins for s390 boot iso (dan@danny.cz) - test: Put VM image overlay into /var/tmp (martin@piware.de) --- .gitignore | 1 + lorax.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 78cfa33..7609fec 100644 --- a/.gitignore +++ b/.gitignore @@ -180,3 +180,4 @@ /lorax-33.2.tar.gz /lorax-33.3.tar.gz /lorax-33.4.tar.gz +/lorax-33.5.tar.gz diff --git a/lorax.spec b/lorax.spec index d88177a..a9b7b93 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 33.4 +Version: 33.5 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -267,6 +267,16 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Thu Jun 11 2020 Brian C. Lane 33.5-1 +- lorax-composer: Add deprecation notice to documentation (bcl@redhat.com) +- composer-cli: Return a better error with no value (bcl@redhat.com) +- tests: Add tests for composer-cli compose start JSON POST (bcl@redhat.com) +- composer-cli: Update bash completion for start-ostree (bcl@redhat.com) +- composer-cli: Add new start-ostree command (bcl@redhat.com) +- composer-cli: Add support for --size to compose start (bcl@redhat.com) +- include generic.ins for s390 boot iso (dan@danny.cz) +- test: Put VM image overlay into /var/tmp (martin@piware.de) + * Mon Jun 01 2020 Brian C. Lane 33.4-1 - Revert "lorax: Remove vmlinuz from install.img /boot" (bcl@redhat.com) - composer-cli: Add osbuild-composer to connection failure message (bcl@redhat.com) diff --git a/sources b/sources index af13552..e573494 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.4.tar.gz) = 5cbe5bfed31744e66d3536894a5f1a44046aed270adfad77c92b8204b74fa205fbac81926b9c5e922c23a10c8805851711f8e85c4cf27a07c6725a1e1935ca34 +SHA512 (lorax-33.5.tar.gz) = 713decd7421af2e4728794a742d7bfc27282b14bc2f4d5ac6c90ccd1cdc3de4ac7e6587057ead5cd729f8b3a3ece886cb33883b7883172543cbdbc39092904d2 From 0d7e6b5223cbeb072450fe4c4e2998c54d7d27d4 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 15 Jun 2020 17:10:01 -0700 Subject: [PATCH 058/203] Backport PR#1035 to fix Rawhide composes (I hope) --- ...ts-before-trying-to-touch-proc-modul.patch | 45 +++++++++++++++++++ lorax.spec | 11 ++++- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.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 new file mode 100644 index 0000000..c346175 --- /dev/null +++ b/0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch @@ -0,0 +1,45 @@ +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/lorax.spec b/lorax.spec index a9b7b93..60c0835 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 33.5 -Release: 1%{?dist} +Release: 2%{?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 +# https://github.com/weldr/lorax/pull/1035 +# Ensure /proc exists before trying to touch /proc/modules +Patch0: 0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch + BuildRequires: python3-devel BuildRequires: make @@ -179,7 +183,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} +%autosetup -n %{name}-%{version} -p1 %build @@ -267,6 +271,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Mon Jun 15 2020 Adam Williamson - 33.5-2 +- Backport PR#1035 to fix Rawhide composes (I hope) + * Thu Jun 11 2020 Brian C. Lane 33.5-1 - lorax-composer: Add deprecation notice to documentation (bcl@redhat.com) - composer-cli: Return a better error with no value (bcl@redhat.com) From c023d712c022d72d73f6238fd8dfa83c12bbaf82 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 18 Jun 2020 12:10:50 -0700 Subject: [PATCH 059/203] - lorax.spec: Add psmisc for fuser debugging of failed umounts in pylorax.imgutils (bcl@redhat.com) - composer-cli: Disable retry counter on connection timeout (bcl@redhat.com) - composer-cli: Change timeout to 5 minutes (bcl@redhat.com) - Temporary fix for running lorax inside mock (no /proc created) --- .gitignore | 1 + lorax.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7609fec..27a8724 100644 --- a/.gitignore +++ b/.gitignore @@ -181,3 +181,4 @@ /lorax-33.3.tar.gz /lorax-33.4.tar.gz /lorax-33.5.tar.gz +/lorax-33.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 60c0835..fa44ee9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 33.5 -Release: 2%{?dist} +Version: 33.6 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -15,6 +15,7 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Temporary workaround - see rhbz#1848201 # https://github.com/weldr/lorax/pull/1035 # Ensure /proc exists before trying to touch /proc/modules Patch0: 0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch @@ -47,6 +48,7 @@ Requires: pigz Requires: pbzip2 Requires: dracut >= 030 Requires: kpartx +Requires: psmisc # Python modules Requires: libselinux-python3 @@ -271,8 +273,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Mon Jun 15 2020 Adam Williamson - 33.5-2 -- Backport PR#1035 to fix Rawhide composes (I hope) +* Thu Jun 18 2020 Brian C. Lane 33.6-1 +- lorax.spec: Add psmisc for fuser debugging of failed umounts in pylorax.imgutils (bcl@redhat.com) +- composer-cli: Disable retry counter on connection timeout (bcl@redhat.com) +- composer-cli: Change timeout to 5 minutes (bcl@redhat.com) +- Temporary fix for running lorax inside mock (no /proc created) * Thu Jun 11 2020 Brian C. Lane 33.5-1 - lorax-composer: Add deprecation notice to documentation (bcl@redhat.com) diff --git a/sources b/sources index e573494..ef01791 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.5.tar.gz) = 713decd7421af2e4728794a742d7bfc27282b14bc2f4d5ac6c90ccd1cdc3de4ac7e6587057ead5cd729f8b3a3ece886cb33883b7883172543cbdbc39092904d2 +SHA512 (lorax-33.6.tar.gz) = dc53607eddabc92d38d4382eae4d441b6a9501c1340abe8363a09836e77e5ebfa5c9fa3d6dbd85a1ebeb3b88822b038f872b51008acc0b0a4d7e9252d35b405e From a19e11afc2c2d0bf4980b75bbbb58db7d6d1108d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 20 Jul 2020 10:26:11 -0700 Subject: [PATCH 060/203] - Add log entry about dracut and /proc (bcl@redhat.com) - Skip creating empty /proc/modules for dracut (bcl@redhat.com) - lorax: Install fcoe-utils (vponcova@redhat.com) - lorax: Enable swap on zram (vponcova@redhat.com) - Fix EFI booting for ISOs generated by `mkksiso` (michel@michel-slm.name) - tests: Disable cloud-init status check (atodorov@redhat.com) --- .gitignore | 1 + lorax.spec | 18 ++++++++++-------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 27a8724..d77b85e 100644 --- a/.gitignore +++ b/.gitignore @@ -182,3 +182,4 @@ /lorax-33.4.tar.gz /lorax-33.5.tar.gz /lorax-33.6.tar.gz +/lorax-33.7.tar.gz diff --git a/lorax.spec b/lorax.spec index fa44ee9..c9ff1c2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 33.6 +Version: 33.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -15,11 +15,6 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Temporary workaround - see rhbz#1848201 -# https://github.com/weldr/lorax/pull/1035 -# Ensure /proc exists before trying to touch /proc/modules -Patch0: 0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch - BuildRequires: python3-devel BuildRequires: make @@ -185,7 +180,7 @@ A command line tool for use with the lorax-composer API server. Examine blueprin build images, etc. from the command line. %prep -%autosetup -n %{name}-%{version} -p1 +%setup -q -n %{name}-%{version} %build @@ -273,11 +268,18 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Mon Jul 20 2020 Brian C. Lane 33.7-1 +- Add log entry about dracut and /proc (bcl@redhat.com) +- Skip creating empty /proc/modules for dracut (bcl@redhat.com) +- lorax: Install fcoe-utils (vponcova@redhat.com) +- lorax: Enable swap on zram (vponcova@redhat.com) +- Fix EFI booting for ISOs generated by `mkksiso` (michel@michel-slm.name) +- tests: Disable cloud-init status check (atodorov@redhat.com) + * Thu Jun 18 2020 Brian C. Lane 33.6-1 - lorax.spec: Add psmisc for fuser debugging of failed umounts in pylorax.imgutils (bcl@redhat.com) - composer-cli: Disable retry counter on connection timeout (bcl@redhat.com) - composer-cli: Change timeout to 5 minutes (bcl@redhat.com) -- Temporary fix for running lorax inside mock (no /proc created) * Thu Jun 11 2020 Brian C. Lane 33.5-1 - lorax-composer: Add deprecation notice to documentation (bcl@redhat.com) diff --git a/sources b/sources index ef01791..b546c6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.6.tar.gz) = dc53607eddabc92d38d4382eae4d441b6a9501c1340abe8363a09836e77e5ebfa5c9fa3d6dbd85a1ebeb3b88822b038f872b51008acc0b0a4d7e9252d35b405e +SHA512 (lorax-33.7.tar.gz) = bd462a1edeab9910f1cf28ee40cda806cedad7df8a13c907f80130b8608799b2f21f9a14b15fafffa05bfbf395ce6f25e47b8b54c58180a7b59276e607bf851f From 3d6e26328e8ca3b0b372e2175fd2b89713d552b7 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 23 Jul 2020 11:24:37 -0700 Subject: [PATCH 061/203] - composer-cli: Make start-ostree parent and ref optional (bcl@redhat.com) - composer-cli: Add a get_arg function (bcl@redhat.com) - Set BACKEND=osbuild-composer if running that test scenario (atodorov@redhat.com) - tests: Don't check info after compose cancel with osbuild-composer (atodorov@redhat.com) - tests: Compare blueprints as TOML objects, not strings (atodorov@redhat.com) - tests: Remove lorax-composer specific checks (atodorov@redhat.com) - tests: Remove compose after we're done (atodorov@redhat.com) - tests: don't use beakerlib in blueprint (lars@karlitski.net) - tests: don't depend on internal state of composer (lars@karlitski.net) - tests: Do not rely on example blueprints (atodorov@redhat.com) - tests: Special case compose types for osbuild-composer (atodorov@redhat.com) - tests: Don't check example blueprints if we don't have to (atodorov@redhat.com) - tests: Use BACKEND env variable instead of hard-coded values (atodorov@redhat.com) - tests: Disable non-cli test scenarios b/c osbuild-composer (atodorov@redhat.com) --- .gitignore | 1 + lorax.spec | 18 +++++++++++++++++- sources | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d77b85e..cc55da0 100644 --- a/.gitignore +++ b/.gitignore @@ -183,3 +183,4 @@ /lorax-33.5.tar.gz /lorax-33.6.tar.gz /lorax-33.7.tar.gz +/lorax-33.8.tar.gz diff --git a/lorax.spec b/lorax.spec index c9ff1c2..d00f8c0 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 33.7 +Version: 33.8 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -268,6 +268,22 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Thu Jul 23 2020 Brian C. Lane 33.8-1 +- composer-cli: Make start-ostree parent and ref optional (bcl@redhat.com) +- composer-cli: Add a get_arg function (bcl@redhat.com) +- Set BACKEND=osbuild-composer if running that test scenario (atodorov@redhat.com) +- tests: Don't check info after compose cancel with osbuild-composer (atodorov@redhat.com) +- tests: Compare blueprints as TOML objects, not strings (atodorov@redhat.com) +- tests: Remove lorax-composer specific checks (atodorov@redhat.com) +- tests: Remove compose after we're done (atodorov@redhat.com) +- tests: don't use beakerlib in blueprint (lars@karlitski.net) +- tests: don't depend on internal state of composer (lars@karlitski.net) +- tests: Do not rely on example blueprints (atodorov@redhat.com) +- tests: Special case compose types for osbuild-composer (atodorov@redhat.com) +- tests: Don't check example blueprints if we don't have to (atodorov@redhat.com) +- tests: Use BACKEND env variable instead of hard-coded values (atodorov@redhat.com) +- tests: Disable non-cli test scenarios b/c osbuild-composer (atodorov@redhat.com) + * Mon Jul 20 2020 Brian C. Lane 33.7-1 - Add log entry about dracut and /proc (bcl@redhat.com) - Skip creating empty /proc/modules for dracut (bcl@redhat.com) diff --git a/sources b/sources index b546c6f..081387b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.7.tar.gz) = bd462a1edeab9910f1cf28ee40cda806cedad7df8a13c907f80130b8608799b2f21f9a14b15fafffa05bfbf395ce6f25e47b8b54c58180a7b59276e607bf851f +SHA512 (lorax-33.8.tar.gz) = 2f91e988edc604fc589ea7c76f24f4e7bc41b48aae6f5483d992db03d7b6b8eaeb011a65a479e6e8fdc80b31997b7af0e097f3fe6def33a10201cbf3b5e9edc3 From 6bfeca4832ecaa36d0db63872e866beeada66e7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:18:28 +0000 Subject: [PATCH 062/203] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index d00f8c0..08f3e5c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 33.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -268,6 +268,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 33.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 23 2020 Brian C. Lane 33.8-1 - composer-cli: Make start-ostree parent and ref optional (bcl@redhat.com) - composer-cli: Add a get_arg function (bcl@redhat.com) From 85783e5a39a7c0586d7d8b6ce700024d8135a640 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Sep 2020 11:28:39 -0700 Subject: [PATCH 063/203] - config_files: Update aarch64, ppc, and sparc timeouts to 60s (bcl@redhat.com) - templates: Ensure nano is installed for the runtime environment (ngompa13@gmail.com) - tests: Ignore W0707 raise-missing-from warnings (bcl@redhat.com) - Switch VMware testing env to improve stability results (chrobert@redhat.com) - tests: Allow skipping image build in compose sanity test (atodorov@redhat.com) --- .gitignore | 1 + lorax.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cc55da0..9d945e1 100644 --- a/.gitignore +++ b/.gitignore @@ -184,3 +184,4 @@ /lorax-33.6.tar.gz /lorax-33.7.tar.gz /lorax-33.8.tar.gz +/lorax-33.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 08f3e5c..b2a5562 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 33.8 -Release: 2%{?dist} +Version: 33.9 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -268,8 +268,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Tue Jul 28 2020 Fedora Release Engineering - 33.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Tue Sep 08 2020 Brian C. Lane 33.9-1 +- config_files: Update aarch64, ppc, and sparc timeouts to 60s (bcl@redhat.com) +- templates: Ensure nano is installed for the runtime environment (ngompa13@gmail.com) +- tests: Ignore W0707 raise-missing-from warnings (bcl@redhat.com) +- Switch VMware testing env to improve stability results (chrobert@redhat.com) +- tests: Allow skipping image build in compose sanity test (atodorov@redhat.com) * Thu Jul 23 2020 Brian C. Lane 33.8-1 - composer-cli: Make start-ostree parent and ref optional (bcl@redhat.com) diff --git a/sources b/sources index 081387b..d0f21fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.8.tar.gz) = 2f91e988edc604fc589ea7c76f24f4e7bc41b48aae6f5483d992db03d7b6b8eaeb011a65a479e6e8fdc80b31997b7af0e097f3fe6def33a10201cbf3b5e9edc3 +SHA512 (lorax-33.9.tar.gz) = 52d38411134a05f6a610be9ef5561fa08695b9a6b31a4e273c15bf84054d1a79ab4f4a8fca944a720b6b4ff0c63241476f19f9751f5af9c3c7fa3f1817d2b6b7 From 119e8238eee128f885c8ad9a68fcda8ddf131ad4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Sep 2020 12:01:26 -0700 Subject: [PATCH 064/203] - New lorax documentation - 34.0 (bcl@redhat.com) - runtime-cleanup: strip a bunch of unnecessary firmwares (awilliam@redhat.com) - runtime-install: specify polkit-gnome to avoid lxpolkit and GTK2 (awilliam@redhat.com) - runtime-install: exclude gnome-firmware and sigrok-firmware (awilliam@redhat.com) - runtime-cleanup: Drop video playback acceleration drivers (awilliam@redhat.com) - runtime-install: don't install notification-daemon (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9d945e1..85c40e8 100644 --- a/.gitignore +++ b/.gitignore @@ -185,3 +185,4 @@ /lorax-33.7.tar.gz /lorax-33.8.tar.gz /lorax-33.9.tar.gz +/lorax-34.0.tar.gz diff --git a/lorax.spec b/lorax.spec index b2a5562..34f294e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 33.9 +Version: 34.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -268,6 +268,14 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Tue Sep 08 2020 Brian C. Lane 34.0-1 +- New lorax documentation - 34.0 (bcl@redhat.com) +- runtime-cleanup: strip a bunch of unnecessary firmwares (awilliam@redhat.com) +- runtime-install: specify polkit-gnome to avoid lxpolkit and GTK2 (awilliam@redhat.com) +- runtime-install: exclude gnome-firmware and sigrok-firmware (awilliam@redhat.com) +- runtime-cleanup: Drop video playback acceleration drivers (awilliam@redhat.com) +- runtime-install: don't install notification-daemon (awilliam@redhat.com) + * Tue Sep 08 2020 Brian C. Lane 33.9-1 - config_files: Update aarch64, ppc, and sparc timeouts to 60s (bcl@redhat.com) - templates: Ensure nano is installed for the runtime environment (ngompa13@gmail.com) diff --git a/sources b/sources index d0f21fa..08d97e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-33.9.tar.gz) = 52d38411134a05f6a610be9ef5561fa08695b9a6b31a4e273c15bf84054d1a79ab4f4a8fca944a720b6b4ff0c63241476f19f9751f5af9c3c7fa3f1817d2b6b7 +SHA512 (lorax-34.0.tar.gz) = e0999438e17f2279f75c09ca9e09f41cb61cd18e4f03e865e6b74eed48310cfe7a26dc25e3e11a40f08ddb3393e0805bf2b5b53c29f07357c854a04f40e22af9 From 73d09c2e292089e81813644b9d93ca2c647a234d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 14 Sep 2020 14:58:58 -0700 Subject: [PATCH 065/203] - Fix broken single-item tuples in a few places (awilliam@redhat.com) - Drop dpaa2 firmware on non-aarch64 arches (awilliam@redhat.com) - Drop firmware for Mellanox Spectrum (awilliam@redhat.com) - runtime-cleanup: big refresh of stale things (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85c40e8..e188561 100644 --- a/.gitignore +++ b/.gitignore @@ -186,3 +186,4 @@ /lorax-33.8.tar.gz /lorax-33.9.tar.gz /lorax-34.0.tar.gz +/lorax-34.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 34f294e..65f4af1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.0 +Version: 34.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -268,6 +268,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Mon Sep 14 2020 Brian C. Lane 34.1-1 +- Fix broken single-item tuples in a few places (awilliam@redhat.com) +- Drop dpaa2 firmware on non-aarch64 arches (awilliam@redhat.com) +- Drop firmware for Mellanox Spectrum (awilliam@redhat.com) +- runtime-cleanup: big refresh of stale things (awilliam@redhat.com) + * Tue Sep 08 2020 Brian C. Lane 34.0-1 - New lorax documentation - 34.0 (bcl@redhat.com) - runtime-cleanup: strip a bunch of unnecessary firmwares (awilliam@redhat.com) diff --git a/sources b/sources index 08d97e1..8649f64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.0.tar.gz) = e0999438e17f2279f75c09ca9e09f41cb61cd18e4f03e865e6b74eed48310cfe7a26dc25e3e11a40f08ddb3393e0805bf2b5b53c29f07357c854a04f40e22af9 +SHA512 (lorax-34.1.tar.gz) = 3a061d44ca5446796516903259f663f5f25c54a3286e066f3f4119e78e5a3b3ede7d976a5c5fed9f59075009c21e2405d5ae16ee241ac916e40290294bbc3969 From 9b33f6260407a523a9765092809e5d0fa760d647 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 29 Sep 2020 15:13:52 -0700 Subject: [PATCH 066/203] - runtime-cleanup: Remove ncurses package (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e188561..b49732a 100644 --- a/.gitignore +++ b/.gitignore @@ -187,3 +187,4 @@ /lorax-33.9.tar.gz /lorax-34.0.tar.gz /lorax-34.1.tar.gz +/lorax-34.2.tar.gz diff --git a/lorax.spec b/lorax.spec index 65f4af1..9aa28ee 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.1 +Version: 34.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -268,6 +268,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Tue Sep 29 2020 Brian C. Lane 34.2-1 +- runtime-cleanup: Remove ncurses package (bcl@redhat.com) + * Mon Sep 14 2020 Brian C. Lane 34.1-1 - Fix broken single-item tuples in a few places (awilliam@redhat.com) - Drop dpaa2 firmware on non-aarch64 arches (awilliam@redhat.com) diff --git a/sources b/sources index 8649f64..f3e6ce1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.1.tar.gz) = 3a061d44ca5446796516903259f663f5f25c54a3286e066f3f4119e78e5a3b3ede7d976a5c5fed9f59075009c21e2405d5ae16ee241ac916e40290294bbc3969 +SHA512 (lorax-34.2.tar.gz) = df405c59c1a43d452bcd159d3e25c46a14cfcdc8da06ef0004f90f0fbebc0b6d48d87d67c14b02fa7f0d8f736dfd14b441bd63fabda50ea9f90c759d07be7409 From 195074814e1743b5633b605b4acd15ae8f1c9d7a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 7 Oct 2020 11:20:35 -0700 Subject: [PATCH 067/203] - composer: Fix open file warnings (bcl@redhat.com) - ltmpl: Fix deprecated escape in docstring (bcl@redhat.com) - tests: Fix open file warning in test_execWithRedirect (bcl@redhat.com) - Cleanup imgutil open files and processes (bcl@redhat.com) - tests: Remove test_del_execReadlines (bcl@redhat.com) - Fix unclosed files (bcl@redhat.com) - test: Use Python dev mode during testing (bcl@redhat.com) - tests: Update composer-cli blueprint server tests (bcl@redhat.com) - runtime-cleanup: Delete .pyc files (bcl@redhat.com) - New lorax documentation - 34.3 (bcl@redhat.com) - doc: Add Blueprint documentation and example to composer-cli.rst (bcl@redhat.com) - docs: Update docs for lorax-composer removal (bcl@redhat.com) - tests: Remove unused lorax-composer tests (bcl@redhat.com) - Remove lorax-composer, it has been replaced by osbuild-composer (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 97 +++++++++++------------------------------------------- sources | 2 +- 3 files changed, 21 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index b49732a..997379e 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,4 @@ /lorax-34.0.tar.gz /lorax-34.1.tar.gz /lorax-34.2.tar.gz +/lorax-34.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 9aa28ee..c8d9110 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.2 +Version: 34.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -17,6 +17,7 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: python3-devel BuildRequires: make +BuildRequires: systemd-rpm-macros Requires: lorax-templates @@ -94,8 +95,7 @@ Summary: Lorax html documentation Requires: lorax = %{version}-%{release} %description docs -Includes the full html documentation for lorax, livemedia-creator, lorax-composer and the -pylorax library. +Includes the full html documentation for lorax, livemedia-creator, and the pylorax library. %package lmc-virt Summary: livemedia-creator libvirt dependencies @@ -132,42 +132,6 @@ 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 composer -Summary: Lorax Image Composer API Server -# For Sphinx documentation build -BuildRequires: python3-flask python3-gobject libgit2-glib python3-toml python3-semantic_version - -Requires: lorax = %{version}-%{release} -Requires(pre): /usr/bin/getent -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/useradd - -Requires: python3-toml -Requires: python3-semantic_version -Requires: libgit2 -Requires: libgit2-glib -Requires: python3-flask -Requires: python3-gevent -Requires: anaconda-tui >= 29.19-1 -Requires: qemu-img -Requires: tar -Requires: python3-rpmfluff -Requires: git -Requires: xz -Requires: createrepo_c -Requires: python3-ansible-runner -# For AWS playbook support -Requires: python3-boto3 - -%{?systemd_requires} -BuildRequires: systemd - -# Implements the weldr API -Provides: weldr - -%description composer -lorax-composer provides a REST API for building images using lorax. - %package -n composer-cli Summary: A command line tool for use with the lorax-composer API server @@ -188,29 +152,6 @@ build images, etc. from the command line. rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install -# Install example blueprints from the test suite. -# This path MUST match the lorax-composer.service blueprint path. -mkdir -p $RPM_BUILD_ROOT/var/lib/lorax/composer/blueprints/ -for bp in example-http-server.toml example-development.toml example-atlas.toml; do - cp ./tests/pylorax/blueprints/$bp $RPM_BUILD_ROOT/var/lib/lorax/composer/blueprints/ -done - -%pre composer -getent group weldr >/dev/null 2>&1 || groupadd -r weldr >/dev/null 2>&1 || : -getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin -c "User for lorax-composer" weldr >/dev/null 2>&1 || : - -%post composer -%systemd_post lorax-composer.service -%systemd_post lorax-composer.socket - -%preun composer -%systemd_preun lorax-composer.service -%systemd_preun lorax-composer.socket - -%postun composer -%systemd_postun_with_restart lorax-composer.service -%systemd_postun_with_restart lorax-composer.socket - %files %defattr(-,root,root,-) %license COPYING @@ -245,22 +186,6 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %dir %{_datadir}/lorax/templates.d %{_datadir}/lorax/templates.d/* -%files composer -%config(noreplace) %{_sysconfdir}/lorax/composer.conf -%{python3_sitelib}/pylorax/api/* -%{python3_sitelib}/lifted/* -%{_sbindir}/lorax-composer -%{_unitdir}/lorax-composer.service -%{_unitdir}/lorax-composer.socket -%dir %{_datadir}/lorax/composer -%{_datadir}/lorax/composer/* -%{_datadir}/lorax/lifted/* -%{_tmpfilesdir}/lorax-composer.conf -%dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/ -%dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/blueprints/ -%attr(0771, weldr, weldr) %{_sharedstatedir}/lorax/composer/blueprints/* -%{_mandir}/man1/lorax-composer.1* - %files -n composer-cli %{_bindir}/composer-cli %{python3_sitelib}/composer/* @@ -268,6 +193,22 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Wed Oct 07 2020 Brian C. Lane 34.3-1 +- composer: Fix open file warnings (bcl@redhat.com) +- ltmpl: Fix deprecated escape in docstring (bcl@redhat.com) +- tests: Fix open file warning in test_execWithRedirect (bcl@redhat.com) +- Cleanup imgutil open files and processes (bcl@redhat.com) +- tests: Remove test_del_execReadlines (bcl@redhat.com) +- Fix unclosed files (bcl@redhat.com) +- test: Use Python dev mode during testing (bcl@redhat.com) +- tests: Update composer-cli blueprint server tests (bcl@redhat.com) +- runtime-cleanup: Delete .pyc files (bcl@redhat.com) +- New lorax documentation - 34.3 (bcl@redhat.com) +- doc: Add Blueprint documentation and example to composer-cli.rst (bcl@redhat.com) +- docs: Update docs for lorax-composer removal (bcl@redhat.com) +- tests: Remove unused lorax-composer tests (bcl@redhat.com) +- Remove lorax-composer, it has been replaced by osbuild-composer (bcl@redhat.com) + * Tue Sep 29 2020 Brian C. Lane 34.2-1 - runtime-cleanup: Remove ncurses package (bcl@redhat.com) diff --git a/sources b/sources index f3e6ce1..f4e8a85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.2.tar.gz) = df405c59c1a43d452bcd159d3e25c46a14cfcdc8da06ef0004f90f0fbebc0b6d48d87d67c14b02fa7f0d8f736dfd14b441bd63fabda50ea9f90c759d07be7409 +SHA512 (lorax-34.3.tar.gz) = 7953664ca44c2591b2245ffdd58c004a623135ee540d4835f737f90361cc53ae903ba7f8f5d0ae45f6eff7d64144b3301e6cc16930c68c20d8d6fed91e1e9179 From 85ff10e99e8dc7f12f3de65c113d6bf15cffff03 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 2 Nov 2020 14:39:49 -0800 Subject: [PATCH 068/203] - Update the default release version to 34 (bcl@redhat.com) - Remove mdmonitor service from boot.iso (bcl@redhat.com) - Switch to using upstream mk-s390image for s390 cdboot.img creation (bcl@redhat.com) - sshd_config: Apply suggested changes (bcl@redhat.com) - lorax.spec: Add BuildRequires on systemd-rpm-macros for tmpfilesdir macro (bcl@redhat.com) --- .gitignore | 1 + ...ts-before-trying-to-touch-proc-modul.patch | 45 ------------------- lorax.spec | 11 ++++- sources | 2 +- 4 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch diff --git a/.gitignore b/.gitignore index 997379e..8f1740f 100644 --- a/.gitignore +++ b/.gitignore @@ -189,3 +189,4 @@ /lorax-34.1.tar.gz /lorax-34.2.tar.gz /lorax-34.3.tar.gz +/lorax-34.4.tar.gz 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/lorax.spec b/lorax.spec index c8d9110..0cdfbcd 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.3 +Version: 34.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -73,6 +73,7 @@ Requires: grub2-tools %ifarch s390 s390x Requires: openssh +Requires: s390utils >= 2.15.0-2 %endif %ifarch %{arm} @@ -166,7 +167,6 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_sbindir}/livemedia-creator %{_sbindir}/mkksiso %{_bindir}/image-minimizer -%{_bindir}/mk-s390-cdboot %dir %{_sysconfdir}/lorax %config(noreplace) %{_sysconfdir}/lorax/lorax.conf %dir %{_datadir}/lorax @@ -193,6 +193,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Mon Nov 02 2020 Brian C. Lane 34.4-1 +- Update the default release version to 34 (bcl@redhat.com) +- Remove mdmonitor service from boot.iso (bcl@redhat.com) +- Switch to using upstream mk-s390image for s390 cdboot.img creation (bcl@redhat.com) +- sshd_config: Apply suggested changes (bcl@redhat.com) +- lorax.spec: Add BuildRequires on systemd-rpm-macros for tmpfilesdir macro (bcl@redhat.com) + * Wed Oct 07 2020 Brian C. Lane 34.3-1 - composer: Fix open file warnings (bcl@redhat.com) - ltmpl: Fix deprecated escape in docstring (bcl@redhat.com) diff --git a/sources b/sources index f4e8a85..d8599ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.3.tar.gz) = 7953664ca44c2591b2245ffdd58c004a623135ee540d4835f737f90361cc53ae903ba7f8f5d0ae45f6eff7d64144b3301e6cc16930c68c20d8d6fed91e1e9179 +SHA512 (lorax-34.4.tar.gz) = 0d83087677e4b3c8ef54c4f838f224d5d7130a1f9f9932e0b4b50935da99edc8924e06b4536b9bee50ecd2bc9314c287f0abcdf2bc2b8ebe8e3a8373873bf58f From 9b301fe53c1af012124379df06626b3db9377eb3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 26 Nov 2020 21:08:33 -0800 Subject: [PATCH 069/203] Add patch for anaconda log-level removal (already upstream) --- ...c89cda687f9689978eedb5482d041577577a.patch | 23 +++++++++++++++++++ lorax.spec | 10 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 78eec89cda687f9689978eedb5482d041577577a.patch diff --git a/78eec89cda687f9689978eedb5482d041577577a.patch b/78eec89cda687f9689978eedb5482d041577577a.patch new file mode 100644 index 0000000..4f9aa0c --- /dev/null +++ b/78eec89cda687f9689978eedb5482d041577577a.patch @@ -0,0 +1,23 @@ +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/lorax.spec b/lorax.spec index 0cdfbcd..712da90 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,6 +14,10 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Patch to no longer pass to anaconda log-level as it's been removed. +# Already upstream +# https://github.com/weldr/lorax/commit/78eec89cda687f9689978eedb5482d041577577a +Patch1: https://github.com/weldr/lorax/commit/78eec89cda687f9689978eedb5482d041577577a.patch BuildRequires: python3-devel BuildRequires: make @@ -146,6 +150,7 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 %build @@ -193,6 +198,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Thu Nov 26 2020 Kevin Fenzi - 34.4-2 +- Add patch for anaconda log-level removal (already upstream) + * Mon Nov 02 2020 Brian C. Lane 34.4-1 - Update the default release version to 34 (bcl@redhat.com) - Remove mdmonitor service from boot.iso (bcl@redhat.com) From 7d205fcda748f2d8b38cfdb94e86f639edf3507a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 30 Nov 2020 14:35:13 -0800 Subject: [PATCH 070/203] - Don't remove libldap_r libraries during runtime-cleanup.tmpl (spichugi@redhat.com) - Do not use '--loglevel' option when running Anaconda (vtrefny@redhat.com) - Makefile: quiet rsync use in testing (bcl@redhat.com) - Switch to using GitHub Actions instead of Travis CI (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 16 +++++++--------- sources | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 8f1740f..3fd0547 100644 --- a/.gitignore +++ b/.gitignore @@ -190,3 +190,4 @@ /lorax-34.2.tar.gz /lorax-34.3.tar.gz /lorax-34.4.tar.gz +/lorax-34.5.tar.gz diff --git a/lorax.spec b/lorax.spec index 712da90..7a628c5 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 34.4 -Release: 2%{?dist} +Version: 34.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,10 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Patch to no longer pass to anaconda log-level as it's been removed. -# Already upstream -# https://github.com/weldr/lorax/commit/78eec89cda687f9689978eedb5482d041577577a -Patch1: https://github.com/weldr/lorax/commit/78eec89cda687f9689978eedb5482d041577577a.patch BuildRequires: python3-devel BuildRequires: make @@ -150,7 +146,6 @@ build images, etc. from the command line. %prep %setup -q -n %{name}-%{version} -%patch1 -p1 %build @@ -198,8 +193,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog -* Thu Nov 26 2020 Kevin Fenzi - 34.4-2 -- Add patch for anaconda log-level removal (already upstream) +* Mon Nov 30 2020 Brian C. Lane 34.5-1 +- Don't remove libldap_r libraries during runtime-cleanup.tmpl (spichugi@redhat.com) +- Do not use '--loglevel' option when running Anaconda (vtrefny@redhat.com) +- Makefile: quiet rsync use in testing (bcl@redhat.com) +- Switch to using GitHub Actions instead of Travis CI (bcl@redhat.com) * Mon Nov 02 2020 Brian C. Lane 34.4-1 - Update the default release version to 34 (bcl@redhat.com) diff --git a/sources b/sources index d8599ce..3bee955 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.4.tar.gz) = 0d83087677e4b3c8ef54c4f838f224d5d7130a1f9f9932e0b4b50935da99edc8924e06b4536b9bee50ecd2bc9314c287f0abcdf2bc2b8ebe8e3a8373873bf58f +SHA512 (lorax-34.5.tar.gz) = 28ab6c2b9bae11c75a1c23475a274a6dda8afbcb794acc69a93c8c4f159455f9a9f20c153ba13ec5872dcd0d8478f9143e710f10059354d7cab636c589d9db20 From a01ddcea0d55e817753efd3f719429eaaf17df87 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 16 Dec 2020 14:15:31 -0800 Subject: [PATCH 071/203] - Remove LD_PRELOAD libgomp.so.1 from lmc --no-virt (bcl@redhat.com) - Add POSTIN scriptlet error to the log monitor list (bcl@redhat.com) - Improve lmc no-virt error handling (bcl@redhat.com) - lorax.spec: Drop GConf2 requirement (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3fd0547..41bbcf8 100644 --- a/.gitignore +++ b/.gitignore @@ -191,3 +191,4 @@ /lorax-34.3.tar.gz /lorax-34.4.tar.gz /lorax-34.5.tar.gz +/lorax-34.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 7a628c5..9a3cfb3 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.5 +Version: 34.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -21,7 +21,6 @@ BuildRequires: systemd-rpm-macros Requires: lorax-templates -Requires: GConf2 Requires: cpio Requires: device-mapper Requires: dosfstools @@ -119,6 +118,7 @@ Requires: anaconda-core Requires: anaconda-tui Requires: anaconda-install-env-deps Requires: system-logos +Requires: python3-psutil %description lmc-novirt Additional dependencies required by livemedia-creator when using it with --no-virt @@ -193,6 +193,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Wed Dec 16 2020 Brian C. Lane 34.6-1 +- Remove LD_PRELOAD libgomp.so.1 from lmc --no-virt (bcl@redhat.com) +- Add POSTIN scriptlet error to the log monitor list (bcl@redhat.com) +- Improve lmc no-virt error handling (bcl@redhat.com) +- lorax.spec: Drop GConf2 requirement (bcl@redhat.com) + * Mon Nov 30 2020 Brian C. Lane 34.5-1 - Don't remove libldap_r libraries during runtime-cleanup.tmpl (spichugi@redhat.com) - Do not use '--loglevel' option when running Anaconda (vtrefny@redhat.com) diff --git a/sources b/sources index 3bee955..fd96346 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.5.tar.gz) = 28ab6c2b9bae11c75a1c23475a274a6dda8afbcb794acc69a93c8c4f159455f9a9f20c153ba13ec5872dcd0d8478f9143e710f10059354d7cab636c589d9db20 +SHA512 (lorax-34.6.tar.gz) = 8585e39feffce2f3d5fcfa27739e113b04168c35d60e11cf00f3114e41e3ef157b22f3e80672082500cdc4e520d70aceb0e37b2c6ec96b3403e5607601e70e31 From 9d2c123fb82b01c1042e9cfcfeda3b7ee8747435 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 20 Jan 2021 11:28:26 -0800 Subject: [PATCH 072/203] - live/x86.tmpl: Copy livecd-iso-to-disk script, if installed (david.ward@ll.mit.edu) - templates: Copy license files from the correct path (david.ward@ll.mit.edu) - test: Fix vm.install for non-LVM cloud images (martin@piware.de) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 41bbcf8..6adddae 100644 --- a/.gitignore +++ b/.gitignore @@ -192,3 +192,4 @@ /lorax-34.4.tar.gz /lorax-34.5.tar.gz /lorax-34.6.tar.gz +/lorax-34.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 9a3cfb3..05bd300 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.6 +Version: 34.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -193,6 +193,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Wed Jan 20 2021 Brian C. Lane 34.7-1 +- live/x86.tmpl: Copy livecd-iso-to-disk script, if installed (david.ward@ll.mit.edu) +- templates: Copy license files from the correct path (david.ward@ll.mit.edu) +- test: Fix vm.install for non-LVM cloud images (martin@piware.de) + * Wed Dec 16 2020 Brian C. Lane 34.6-1 - Remove LD_PRELOAD libgomp.so.1 from lmc --no-virt (bcl@redhat.com) - Add POSTIN scriptlet error to the log monitor list (bcl@redhat.com) diff --git a/sources b/sources index fd96346..1cdb089 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.6.tar.gz) = 8585e39feffce2f3d5fcfa27739e113b04168c35d60e11cf00f3114e41e3ef157b22f3e80672082500cdc4e520d70aceb0e37b2c6ec96b3403e5607601e70e31 +SHA512 (lorax-34.7.tar.gz) = b0bad9592937e6eafd326982754e11593177920753b946392d72a17c2a7830787a9955c6b7784c182befc54f0b3a5755f87013ea5bd5132d7071c28b2e5fc781 From 8dd440eeec9ab7d591a6121f16d08dd243965147 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:42:41 +0000 Subject: [PATCH 073/203] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 05bd300..2efe126 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -193,6 +193,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 34.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 20 2021 Brian C. Lane 34.7-1 - live/x86.tmpl: Copy livecd-iso-to-disk script, if installed (david.ward@ll.mit.edu) - templates: Copy license files from the correct path (david.ward@ll.mit.edu) From 0e58cc6b499949bc30f1bb03709ef0168999a0d6 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 8 Feb 2021 10:49:30 -0800 Subject: [PATCH 074/203] - Use image dependencies metapackage (vslavik@redhat.com) - tests: Include the fedora-updates repo when testing boot.iso building (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6adddae..059547c 100644 --- a/.gitignore +++ b/.gitignore @@ -193,3 +193,4 @@ /lorax-34.5.tar.gz /lorax-34.6.tar.gz /lorax-34.7.tar.gz +/lorax-34.8.tar.gz diff --git a/lorax.spec b/lorax.spec index 2efe126..afe7148 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 34.7 -Release: 2%{?dist} +Version: 34.8 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -193,8 +193,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog -* Tue Jan 26 2021 Fedora Release Engineering - 34.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Mon Feb 08 2021 Brian C. Lane 34.8-1 +- Use image dependencies metapackage (vslavik@redhat.com) +- tests: Include the fedora-updates repo when testing boot.iso building (bcl@redhat.com) * Wed Jan 20 2021 Brian C. Lane 34.7-1 - live/x86.tmpl: Copy livecd-iso-to-disk script, if installed (david.ward@ll.mit.edu) diff --git a/sources b/sources index 1cdb089..2c7fa2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.7.tar.gz) = b0bad9592937e6eafd326982754e11593177920753b946392d72a17c2a7830787a9955c6b7784c182befc54f0b3a5755f87013ea5bd5132d7071c28b2e5fc781 +SHA512 (lorax-34.8.tar.gz) = c7785ae119fbb664c2a9c1f7d0eb649f67e012704ef9c17a0436f4e83647359d9bdf3039a35ffc84c170e3e5fc7574fc94b14121d1307a0fb16a5b225cda24e5 From 7e58c71c421aa896230f6e0b45e3433a39736edc Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 15 Feb 2021 09:09:57 -0800 Subject: [PATCH 075/203] - Use inst.rescue to trigger rescue mode (awilliam@redhat.com) Resolves: rhbz#1928318 --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 059547c..126d823 100644 --- a/.gitignore +++ b/.gitignore @@ -194,3 +194,4 @@ /lorax-34.6.tar.gz /lorax-34.7.tar.gz /lorax-34.8.tar.gz +/lorax-34.9.tar.gz diff --git a/lorax.spec b/lorax.spec index afe7148..30e3488 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.8 +Version: 34.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -193,6 +193,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Mon Feb 15 2021 Brian C. Lane 34.9-1 +- Use inst.rescue to trigger rescue mode (awilliam@redhat.com) + Resolves: rhbz#1928318 * Mon Feb 08 2021 Brian C. Lane 34.8-1 - Use image dependencies metapackage (vslavik@redhat.com) - tests: Include the fedora-updates repo when testing boot.iso building (bcl@redhat.com) diff --git a/sources b/sources index 2c7fa2c..2578a4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.8.tar.gz) = c7785ae119fbb664c2a9c1f7d0eb649f67e012704ef9c17a0436f4e83647359d9bdf3039a35ffc84c170e3e5fc7574fc94b14121d1307a0fb16a5b225cda24e5 +SHA512 (lorax-34.9.tar.gz) = 592a2fe3a4dbb7deb62745acc7b5874afa01dfbe89e74232d74e013954bac3a64d22353ff876b09b38d4b5fadb3a2762612a9f5ce7e340168f7a3ee8e9b7f900 From 9fd32b245eb02c51fb108c8a50dd4b28332359f2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 3 Mar 2021 16:44:25 -0800 Subject: [PATCH 076/203] - New lorax documentation - 35.0 (bcl@redhat.com) - Makefile: Add test-in-podman and docs-in-podman build targets (bcl@redhat.com) - isolinux.cfg: Rename the 'vesa' menu entry to 'basic' (bcl@redhat.com) - composer-cli: Add support for start-ostree --url URL (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 213 ++++------------------------------------------------- sources | 2 +- 3 files changed, 15 insertions(+), 201 deletions(-) diff --git a/.gitignore b/.gitignore index 126d823..4d8f999 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-35.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 30e3488..772bbee 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 34.9 +Version: 35.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -193,6 +193,18 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Wed Mar 03 2021 Brian C. Lane 35.0-1 +- New lorax documentation - 35.0 (bcl@redhat.com) +- Makefile: Add test-in-podman and docs-in-podman build targets (bcl@redhat.com) +- isolinux.cfg: Rename the 'vesa' menu entry to 'basic' (bcl@redhat.com) +- composer-cli: Add support for start-ostree --url URL (bcl@redhat.com) + +* Wed Mar 03 2021 Brian C. Lane +- New lorax documentation - 35.0 (bcl@redhat.com) +- Makefile: Add test-in-podman and docs-in-podman build targets (bcl@redhat.com) +- isolinux.cfg: Rename the 'vesa' menu entry to 'basic' (bcl@redhat.com) +- composer-cli: Add support for start-ostree --url URL (bcl@redhat.com) + * Mon Feb 15 2021 Brian C. Lane 34.9-1 - Use inst.rescue to trigger rescue mode (awilliam@redhat.com) Resolves: rhbz#1928318 @@ -505,202 +517,3 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - 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) diff --git a/sources b/sources index 2578a4f..3d35bc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-34.9.tar.gz) = 592a2fe3a4dbb7deb62745acc7b5874afa01dfbe89e74232d74e013954bac3a64d22353ff876b09b38d4b5fadb3a2762612a9f5ce7e340168f7a3ee8e9b7f900 +SHA512 (lorax-35.0.tar.gz) = df38aa790c5013dc5d2466511acd07799a1099999820d499ef6cf3a4a529e50d6cc85c8ba37aa4a9379506bee24cf249c5de6ddbc5f49b0e4338e622ddee540e From 454b68495ff2cabf57ad28b3983ea14f3d0e1b3b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 5 Mar 2021 13:35:57 -0800 Subject: [PATCH 077/203] Add patch downstream to replace retired/blocked xorg-x11-server-utils package --- lorax.spec | 7 ++++++- xorg-x11-server-utils-retire.patch | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 xorg-x11-server-utils-retire.patch diff --git a/lorax.spec b/lorax.spec index 772bbee..18fd37d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.0 -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,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Fri Mar 05 2021 Kevin Fenzi - 35.0-2 +- Add patch downstream to replace retired/blocked xorg-x11-server-utils package + * Wed Mar 03 2021 Brian C. Lane 35.0-1 - New lorax documentation - 35.0 (bcl@redhat.com) - Makefile: Add test-in-podman and docs-in-podman build targets (bcl@redhat.com) 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 29bf54b82907bd2bdb6630a655fe3a5e548ce6c7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 10 Mar 2021 18:42:57 -0800 Subject: [PATCH 078/203] Don't cleanup report-cli and fix text mode crash reporting --- ...don-t-wipe-usr-bin-report-cli-193755.patch | 27 +++++++++++++++++++ lorax.spec | 11 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.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 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 + diff --git a/lorax.spec b/lorax.spec index 18fd37d..d2d997b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.0 -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 +* Wed Mar 10 2021 Adam Williamson - 35.0-3 +- Backport patch to not cleanup report-cli and fix text mode crash reporting + Resolves: rhbz#1937550 + * Fri Mar 05 2021 Kevin Fenzi - 35.0-2 - Add patch downstream to replace retired/blocked xorg-x11-server-utils package From 4ffefc09f4bdfd011814f4576e136cde09a1ddf7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 1 Apr 2021 18:06:39 -0700 Subject: [PATCH 079/203] Add downstream patch to not try and install retired resierfs-utils package --- lorax-35.0-drop-reiserfs.patch | 12 ++++++++++++ lorax.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 lorax-35.0-drop-reiserfs.patch diff --git a/lorax-35.0-drop-reiserfs.patch b/lorax-35.0-drop-reiserfs.patch new file mode 100644 index 0000000..f19d6c5 --- /dev/null +++ b/lorax-35.0-drop-reiserfs.patch @@ -0,0 +1,12 @@ +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-04-01 17:57:17.526337827 -0700 ++++ lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl 2021-04-01 17:57:58.961412923 -0700 +@@ -96,7 +96,7 @@ + installpkg librsvg2 + + ## filesystem tools +-installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils gfs2-utils ntfs-3g ntfsprogs ++installpkg btrfs-progs jfsutils xfsprogs gfs2-utils ntfs-3g ntfsprogs + installpkg system-storage-manager + installpkg device-mapper-persistent-data + installpkg xfsdump diff --git a/lorax.spec b/lorax.spec index d2d997b..be85f5e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -19,6 +19,8 @@ Patch0: xorg-x11-server-utils-retire.patch # 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 +# reiserfs-utils has been retired in fedora, so don't try and install it anymore. +Patch2: lorax-35.0-drop-reiserfs.patch BuildRequires: python3-devel BuildRequires: make @@ -200,6 +202,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Thu Apr 01 2021 Kevin Fenzi - 35.0-4 +- Add downstream patch to not try and install retired resierfs-utils package + * Wed Mar 10 2021 Adam Williamson - 35.0-3 - Backport patch to not cleanup report-cli and fix text mode crash reporting Resolves: rhbz#1937550 From f06bb78ce6f70d4675cbb8de1033afca66436a01 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 2 Apr 2021 06:16:29 -0700 Subject: [PATCH 080/203] Actually apply the patch in the last release. --- lorax.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index be85f5e..11bc37d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -155,6 +155,7 @@ build images, etc. from the command line. %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -202,6 +203,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/composer-cli.1* %changelog +* Fri Apr 02 2021 Kevin Fenzi - 35.0-5 +- Actually apply the patch in the last release. + * Thu Apr 01 2021 Kevin Fenzi - 35.0-4 - Add downstream patch to not try and install retired resierfs-utils package From b666fd7402ab3c86a341e99f9e9fa7b36f9c7aef Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 26 Apr 2021 16:11:54 -0700 Subject: [PATCH 081/203] - New lorax documentation - 35.1 (bcl@redhat.com) - Makefile: Use podman as a user for testing and docs (bcl@redhat.com) - composer-cli: Remove all traces of composer-cli (bcl@redhat.com) - livemedia-creator: Add rhgb to live iso cmdline (#1943312) (bcl@redhat.com) - tests: Fix pocketlint use of removed pylint messages (bcl@redhat.com) - Disable X11 forwarding from installation environment. (vslavik@redhat.com) - Remove display-related packages (vslavik@redhat.com) - Drop trying to install reiserfs-utils (kevin@scrye.com) - test: Fix URL to bots testmap (martin@piware.de) - Change khmeros-base-fonts to khmer-os-system-fonts. (pnemade@fedoraproject.org) - Fix output path in docs (vslavik@redhat.com) - runtime-cleanup: don't wipe /usr/bin/report-cli (#1937550) (awilliam@redhat.com) - 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 | 311 ++++------------------------------------------------- sources | 2 +- 3 files changed, 20 insertions(+), 294 deletions(-) diff --git a/.gitignore b/.gitignore index 4d8f999..567070d 100644 --- a/.gitignore +++ b/.gitignore @@ -196,3 +196,4 @@ /lorax-34.8.tar.gz /lorax-34.9.tar.gz /lorax-35.0.tar.gz +/lorax-35.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 11bc37d..c432d7b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 35.0 -Release: 5%{?dist} +Version: 35.1 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,13 +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 -# reiserfs-utils has been retired in fedora, so don't try and install it anymore. -Patch2: lorax-35.0-drop-reiserfs.patch BuildRequires: python3-devel BuildRequires: make @@ -140,22 +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 -%patch2 -p1 %build @@ -167,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 @@ -196,26 +174,22 @@ 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 -* Fri Apr 02 2021 Kevin Fenzi - 35.0-5 -- Actually apply the patch in the last release. - -* Thu Apr 01 2021 Kevin Fenzi - 35.0-4 -- Add downstream patch to not try and install retired resierfs-utils package - -* Wed Mar 10 2021 Adam Williamson - 35.0-3 -- Backport patch to not cleanup report-cli and fix text mode crash reporting - Resolves: rhbz#1937550 - -* Fri Mar 05 2021 Kevin Fenzi - 35.0-2 -- Add patch downstream to replace retired/blocked xorg-x11-server-utils package - +* Mon Apr 26 2021 Brian C. Lane 35.1-1 +- New lorax documentation - 35.1 (bcl@redhat.com) +- Makefile: Use podman as a user for testing and docs (bcl@redhat.com) +- composer-cli: Remove all traces of composer-cli (bcl@redhat.com) +- livemedia-creator: Add rhgb to live iso cmdline (#1943312) (bcl@redhat.com) +- tests: Fix pocketlint use of removed pylint messages (bcl@redhat.com) +- Disable X11 forwarding from installation environment. (vslavik@redhat.com) +- Remove display-related packages (vslavik@redhat.com) +- Drop trying to install reiserfs-utils (kevin@scrye.com) +- test: Fix URL to bots testmap (martin@piware.de) +- Change khmeros-base-fonts to khmer-os-system-fonts. (pnemade@fedoraproject.org) +- Fix output path in docs (vslavik@redhat.com) +- runtime-cleanup: don't wipe /usr/bin/report-cli (#1937550) (awilliam@redhat.com) +- 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) * Wed Mar 03 2021 Brian C. Lane 35.0-1 - New lorax documentation - 35.0 (bcl@redhat.com) - Makefile: Add test-in-podman and docs-in-podman build targets (bcl@redhat.com) @@ -291,252 +265,3 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - runtime-install: exclude gnome-firmware and sigrok-firmware (awilliam@redhat.com) - runtime-cleanup: Drop video playback acceleration drivers (awilliam@redhat.com) - runtime-install: don't install notification-daemon (awilliam@redhat.com) - -* Tue Sep 08 2020 Brian C. Lane 33.9-1 -- config_files: Update aarch64, ppc, and sparc timeouts to 60s (bcl@redhat.com) -- templates: Ensure nano is installed for the runtime environment (ngompa13@gmail.com) -- tests: Ignore W0707 raise-missing-from warnings (bcl@redhat.com) -- Switch VMware testing env to improve stability results (chrobert@redhat.com) -- tests: Allow skipping image build in compose sanity test (atodorov@redhat.com) - -* Thu Jul 23 2020 Brian C. Lane 33.8-1 -- composer-cli: Make start-ostree parent and ref optional (bcl@redhat.com) -- composer-cli: Add a get_arg function (bcl@redhat.com) -- Set BACKEND=osbuild-composer if running that test scenario (atodorov@redhat.com) -- tests: Don't check info after compose cancel with osbuild-composer (atodorov@redhat.com) -- tests: Compare blueprints as TOML objects, not strings (atodorov@redhat.com) -- tests: Remove lorax-composer specific checks (atodorov@redhat.com) -- tests: Remove compose after we're done (atodorov@redhat.com) -- tests: don't use beakerlib in blueprint (lars@karlitski.net) -- tests: don't depend on internal state of composer (lars@karlitski.net) -- tests: Do not rely on example blueprints (atodorov@redhat.com) -- tests: Special case compose types for osbuild-composer (atodorov@redhat.com) -- tests: Don't check example blueprints if we don't have to (atodorov@redhat.com) -- tests: Use BACKEND env variable instead of hard-coded values (atodorov@redhat.com) -- tests: Disable non-cli test scenarios b/c osbuild-composer (atodorov@redhat.com) - -* Mon Jul 20 2020 Brian C. Lane 33.7-1 -- Add log entry about dracut and /proc (bcl@redhat.com) -- Skip creating empty /proc/modules for dracut (bcl@redhat.com) -- lorax: Install fcoe-utils (vponcova@redhat.com) -- lorax: Enable swap on zram (vponcova@redhat.com) -- Fix EFI booting for ISOs generated by `mkksiso` (michel@michel-slm.name) -- tests: Disable cloud-init status check (atodorov@redhat.com) - -* Thu Jun 18 2020 Brian C. Lane 33.6-1 -- lorax.spec: Add psmisc for fuser debugging of failed umounts in pylorax.imgutils (bcl@redhat.com) -- composer-cli: Disable retry counter on connection timeout (bcl@redhat.com) -- composer-cli: Change timeout to 5 minutes (bcl@redhat.com) - -* Thu Jun 11 2020 Brian C. Lane 33.5-1 -- lorax-composer: Add deprecation notice to documentation (bcl@redhat.com) -- composer-cli: Return a better error with no value (bcl@redhat.com) -- tests: Add tests for composer-cli compose start JSON POST (bcl@redhat.com) -- composer-cli: Update bash completion for start-ostree (bcl@redhat.com) -- composer-cli: Add new start-ostree command (bcl@redhat.com) -- composer-cli: Add support for --size to compose start (bcl@redhat.com) -- include generic.ins for s390 boot iso (dan@danny.cz) -- test: Put VM image overlay into /var/tmp (martin@piware.de) - -* Mon Jun 01 2020 Brian C. Lane 33.4-1 -- Revert "lorax: Remove vmlinuz from install.img /boot" (bcl@redhat.com) -- composer-cli: Add osbuild-composer to connection failure message (bcl@redhat.com) -- composer-cli: Update docs to mention osbuild-composer and debug options (bcl@redhat.com) -- lorax-composer: Check compose/status for invalid characters (bcl@redhat.com) -- lorax-composer: deleting an unknown workspace should return an error (bcl@redhat.com) -- lorax-composer: Check for valid characters in the undo commit (bcl@redhat.com) -- drop 32-bit support from ppc live image grub.cfg (dan@danny.cz) -- mksquashfs: Catch errors with mksquashfs and report them (bcl@redhat.com) - -* Tue May 05 2020 Brian C. Lane 33.3-1 -- Don't use f-string without interpolation (atodorov@redhat.com) -- lmc-no-virt: Add requirement on anaconda-install-env-deps (bcl@redhat.com) -- rsyslog: Disable journal ratelimits during install (bcl@redhat.com) - -* Tue Apr 28 2020 Brian C. Lane 33.2-1 -- New lorax documentation - 33.2 (bcl@redhat.com) -- test: Work around invalid fedora baseurls (marusak.matej@gmail.com) -- lorax: Add --skip-branding cmdline argument (bcl@redhat.com) -- Update datastore for VMware testing (chrobert@redhat.com) - -* Mon Mar 30 2020 Brian C. Lane 33.1-1 -- lorax: Remove vmlinuz from install.img /boot (bcl@redhat.com) - -* Fri Mar 20 2020 Brian C. Lane 33.0-1 -- tests: Add tests for _install_branding with and without variant (bcl@redhat.com) -- 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) diff --git a/sources b/sources index 3d35bc8..736709d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.0.tar.gz) = df38aa790c5013dc5d2466511acd07799a1099999820d499ef6cf3a4a529e50d6cc85c8ba37aa4a9379506bee24cf249c5de6ddbc5f49b0e4338e622ddee540e +SHA512 (lorax-35.1.tar.gz) = 3081eb8fe4ec2dc5bd6bda0e06a76d832b6cf63cdbbd23f5a79419c1dada68a591150513f5a0c487c9c335349983434be408e78a778e9201dc679dff7a5e7204 From bd7c3d46e8af483a9da07f214772a1d51f7f6cd8 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 26 Apr 2021 16:28:21 -0700 Subject: [PATCH 082/203] - docs: Remove composer-cli.1 manpage --- 0001-docs-Remove-composer-cli.1.patch | 941 ++++++++++++++++++++++++++ lorax.spec | 4 +- 2 files changed, 944 insertions(+), 1 deletion(-) create mode 100644 0001-docs-Remove-composer-cli.1.patch diff --git a/0001-docs-Remove-composer-cli.1.patch b/0001-docs-Remove-composer-cli.1.patch new file mode 100644 index 0000000..e68da6a --- /dev/null +++ b/0001-docs-Remove-composer-cli.1.patch @@ -0,0 +1,941 @@ +From cc7430fbbd7f72e5d6efd3e83efe2616de3a5d58 Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" +Date: Mon, 26 Apr 2021 16:24:12 -0700 +Subject: [PATCH] docs: Remove composer-cli.1 + +--- + docs/man/composer-cli.1 | 922 ---------------------------------------- + 1 file changed, 922 deletions(-) + delete mode 100644 docs/man/composer-cli.1 + +diff --git a/docs/man/composer-cli.1 b/docs/man/composer-cli.1 +deleted file mode 100644 +index ce78286c..00000000 +--- a/docs/man/composer-cli.1 ++++ /dev/null +@@ -1,922 +0,0 @@ +-.\" Man page generated from reStructuredText. +-. +-.TH "COMPOSER-CLI" "1" "Mar 04, 2021" "35.0" "Lorax" +-.SH NAME +-composer-cli \- Composer Cmdline Utility Documentation +-. +-.nr rst2man-indent-level 0 +-. +-.de1 rstReportMargin +-\\$1 \\n[an-margin] +-level \\n[rst2man-indent-level] +-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +-- +-\\n[rst2man-indent0] +-\\n[rst2man-indent1] +-\\n[rst2man-indent2] +-.. +-.de1 INDENT +-.\" .rstReportMargin pre: +-. RS \\$1 +-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +-. nr rst2man-indent-level +1 +-.\" .rstReportMargin post: +-.. +-.de UNINDENT +-. RE +-.\" indent \\n[an-margin] +-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +-.nr rst2man-indent-level -1 +-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +-.. +-.INDENT 0.0 +-.TP +-.B Authors +-Brian C. Lane <\fI\%bcl@redhat.com\fP> +-.UNINDENT +-.sp +-\fBcomposer\-cli\fP is an interactive tool for use with a WELDR API server, +-managing blueprints, exploring available packages, and building new images. As +-of Fedora 34, \fIosbuild\-composer \fP is the recommended +-server. +-.sp +-It requires the server to be installed on the local system, and the user +-running it needs to be a member of the \fBweldr\fP group. +-.SH COMPOSER-CLI CMDLINE ARGUMENTS +-.sp +-Lorax Composer commandline tool +- +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-usage: composer\-cli [\-h] [\-j] [\-s SOCKET] [\-\-log LOG] [\-a APIVER] [\-\-test TESTMODE] [\-V] ... +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.SS Positional Arguments +-.INDENT 0.0 +-.TP +-.Bargs +-.UNINDENT +-.SS Named Arguments +-.INDENT 0.0 +-.TP +-.B\-j, \-\-json +-Output the raw JSON response instead of the normal output. +-.sp +-Default: False +-.TP +-.B\-s, \-\-socket +-Path to the socket file to listen on +-.sp +-Default: "/run/weldr/api.socket" +-.TP +-.B\-\-log +-Path to logfile (./composer\-cli.log) +-.TP +-.B\-a, \-\-api +-API Version to use +-.sp +-Default: "1" +-.TP +-.B\-\-test +-Pass test mode to compose. 1=Mock compose with fail. 2=Mock compose with finished. +-.sp +-Default: 0 +-.TP +-.B\-V +-show program\(aqs version number and exit +-.sp +-Default: False +-.UNINDENT +-.sp +-.INDENT 0.0 +-.TP +-.B compose start [\-\-size XXXX] [ | ] +-Start a compose using the selected blueprint and output type. Optionally start an upload. +-\-\-size is supported by osbuild\-composer, and is in MiB. +-.TP +-.B compose start\-ostree [\-\-size XXXX] [\-\-parent PARENT] [\-\-ref REF] [\-\-url url] [ ] +-Start an ostree compose using the selected blueprint and output type. Optionally start an upload. This command +-is only supported by osbuild\-composer. \-\-size is in MiB. +-.TP +-.B compose types +-List the supported output types. +-.TP +-.B compose status +-List the status of all running and finished composes. +-.TP +-.B compose list [waiting|running|finished|failed] +-List basic information about composes. +-.TP +-.B compose log [] +-Show the last SIZE kB of the compose log. +-.TP +-.B compose cancel +-Cancel a running compose and delete any intermediate results. +-.TP +-.B compose delete +-Delete the listed compose results. +-.TP +-.B compose info +-Show detailed information on the compose. +-.TP +-.B compose metadata +-Download the metadata use to create the compose to \-metadata.tar +-.TP +-.B compose logs +-Download the compose logs to \-logs.tar +-.TP +-.B compose results +-Download all of the compose results; metadata, logs, and image to .tar +-.TP +-.B compose image +-Download the output image from the compose. Filename depends on the type. +-.TP +-.B blueprints list +-List the names of the available blueprints. +-.TP +-.B blueprints show +-Display the blueprint in TOML format. +-.TP +-.B blueprints changes +-Display the changes for each blueprint. +-.TP +-.B blueprints diff +-Display the differences between 2 versions of a blueprint. +-FROM\-COMMIT can be a commit hash or NEWEST +-TO\-COMMIT can be a commit hash, NEWEST, or WORKSPACE +-.TP +-.B blueprints save +-Save the blueprint to a file, .toml +-.TP +-.B blueprints delete +-Delete a blueprint from the server +-.TP +-.B blueprints depsolve +-Display the packages needed to install the blueprint. +-.TP +-.B blueprints push +-Push a blueprint TOML file to the server. +-.TP +-.B blueprints freeze +-Display the frozen blueprint\(aqs modules and packages. +-.TP +-.B blueprints freeze show +-Display the frozen blueprint in TOML format. +-.TP +-.B blueprints freeze save +-Save the frozen blueprint to a file, .frozen.toml. +-.TP +-.B blueprints tag +-Tag the most recent blueprint commit as a release. +-.TP +-.B blueprints undo +-Undo changes to a blueprint by reverting to the selected commit. +-.TP +-.B blueprints workspace +-Push the blueprint TOML to the temporary workspace storage. +-.TP +-.B modules list +-List the available modules. +-.TP +-.B projects list +-List the available projects. +-.TP +-.B projects info +-Show details about the listed projects. +-.TP +-.B sources list +-List the available sources +-.TP +-.B sources info +-Details about the source. +-.TP +-.B sources add +-Add a package source to the server. +-.TP +-.B sources change +-Change an existing source +-.TP +-.B sources delete +-Delete a package source. +-.UNINDENT +-.sp +-status show Show API server status. +-.INDENT 0.0 +-.TP +-.B upload info +-Details about an upload +-.TP +-.B upload start [ |] +-Upload a build image to the selected provider. +-.TP +-.B upload log +-Show the upload log +-.TP +-.B upload cancel +-Cancel an upload with that is queued or in progress +-.TP +-.B upload delete +-Delete the upload and remove it from the build +-.TP +-.B upload reset +-Reset the upload so that it can be tried again +-.TP +-.B providers list +-List the available providers, or list the available profiles +-.TP +-.B providers show +-show the details of a specific provider\(aqs profile +-.TP +-.B providers push +-Add a new profile, or overwrite an existing one +-.TP +-.B providers save +-Save the profile\(aqs details to a TOML file named .toml +-.TP +-.B providers delete +-Delete a profile from a provider +-.UNINDENT +- +-.SH EDIT A BLUEPRINT +-.sp +-Start out by listing the available blueprints using \fBcomposer\-cli blueprints +-list\fP, pick one and save it to the local directory by running \fBcomposer\-cli +-blueprints save http\-server\fP\&. +-.sp +-Edit the file (it will be saved with a .toml extension) and change the +-description, add a package or module to it. Send it back to the server by +-running \fBcomposer\-cli blueprints push http\-server.toml\fP\&. You can verify that it was +-saved by viewing the changelog \- \fBcomposer\-cli blueprints changes http\-server\fP\&. +-.sp +-See the \fI\%Example Blueprint\fP for an example. +-.SH BUILD AN IMAGE +-.sp +-Build a \fBqcow2\fP disk image from this blueprint by running \fBcomposer\-cli +-compose start http\-server qcow2\fP\&. It will print a UUID that you can use to +-keep track of the build. You can also cancel the build if needed. +-.sp +-The available types of images is displayed by \fBcomposer\-cli compose types\fP\&. +-Currently this consists of: alibaba, ami, ext4\-filesystem, google, hyper\-v, +-live\-iso, openstack, partitioned\-disk, qcow2, tar, vhd, vmdk +-.sp +-You can optionally start an upload of the finished image, see \fI\%Image Uploads\fP for +-more information. +-.SH MONITOR THE BUILD STATUS +-.sp +-Monitor it using \fBcomposer\-cli compose status\fP, which will show the status of +-all the builds on the system. You can view the end of the anaconda build logs +-once it is in the \fBRUNNING\fP state using \fBcomposer\-cli compose log UUID\fP +-where UUID is the UUID returned by the start command. +-.sp +-Once the build is in the \fBFINISHED\fP state you can download the image. +-.SH DOWNLOAD THE IMAGE +-.sp +-Downloading the final image is done with \fBcomposer\-cli compose image UUID\fP and it will +-save the qcow2 image as \fBUUID\-disk.qcow2\fP which you can then use to boot a VM like this: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-qemu\-kvm \-\-name test\-image \-m 1024 \-hda ./UUID\-disk.qcow2 +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.SH IMAGE UPLOADS +-.sp +-\fBcomposer\-cli\fP can upload the images to a number of services, including AWS, +-OpenStack, and vSphere. The upload can be started when the build is finished, +-by using \fBcomposer\-cli compose start ...\fP or an existing image can be uploaded +-with \fBcomposer\-cli upload start ...\fP\&. In order to access the service you need +-to pass authentication details to composer\-cli using a TOML file, or reference +-a previously saved profile. +-.sp +-\fBNOTE:\fP +-.INDENT 0.0 +-.INDENT 3.5 +-With \fBosbuild\-composer\fP you can only specify upload targets during +-the compose process. +-.UNINDENT +-.UNINDENT +-.SH PROVIDERS +-.sp +-Providers are the services providers with Ansible playbook support under +-\fB/usr/share/lorax/lifted/providers/\fP, you will need to gather some provider +-specific information in order to authenticate with it. You can view the +-required fields using \fBcomposer\-cli providers template \fP, eg. for AWS +-you would run: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-composer\-cli upload template aws +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-The output looks like this: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-provider = "aws" +- +-[settings] +-aws_access_key = "AWS Access Key" +-aws_bucket = "AWS Bucket" +-aws_region = "AWS Region" +-aws_secret_key = "AWS Secret Key" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-Save this into an \fBaws\-credentials.toml\fP file and use it when running \fBstart\fP\&. +-.SS AWS +-.sp +-The access key and secret key can be created by going to the +-\fBIAM\->Users\->Security Credentials\fP section and creating a new access key. The +-secret key will only be shown when it is first created so make sure to record +-it in a secure place. The region should be the region that you want to use the +-AMI in, and the bucket can be an existing bucket, or a new one, following the +-normal AWS bucket naming rules. It will be created if it doesn\(aqt already exist. +-.sp +-When uploading the image it is first uploaded to the s3 bucket, and then +-converted to an AMI. If the conversion is successful the s3 object will be +-deleted. If it fails, re\-trying after correcting the problem will re\-use the +-object if you have not deleted it in the meantime, speeding up the process. +-.SH PROFILES +-.sp +-Profiles store the authentication settings associated with a specific provider. +-Providers can have multiple profiles, as long as their names are unique. For +-example, you may have one profile for testing and another for production +-uploads. +-.sp +-Profiles are created by pushing the provider settings template to the server using +-\fBcomposer\-cli providers push \fP where \fBPROFILE.TOML\fP is the same as the +-provider template, but with the addition of a \fBprofile\fP field. For example, an AWS +-profile named \fBtest\-uploads\fP would look like this: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-provider = "aws" +-profile = "test\-uploads" +- +-[settings] +-aws_access_key = "AWS Access Key" +-aws_bucket = "AWS Bucket" +-aws_region = "AWS Region" +-aws_secret_key = "AWS Secret Key" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-You can view the profile by using \fBcomposer\-cli providers aws test\-uploads\fP\&. +-.SH BUILD AN IMAGE AND UPLOAD RESULTS +-.sp +-If you have a profile named \fBtest\-uploads\fP: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-composer\-cli compose start example\-http\-server ami "http image" aws test\-uploads +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-Or if you have the settings stored in a TOML file: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-composer\-cli compose start example\-http\-server ami "http image" aws\-settings.toml +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-It will return the UUID of the image build, and the UUID of the upload. Once +-the build has finished successfully it will start the upload process, which you +-can monitor with \fBcomposer\-cli upload info \fP +-.sp +-You can also view the upload logs from the Ansible playbook with: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-\(ga\(gacomposer\-cli upload log \(ga\(ga +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-The type of the image must match the type supported by the provider. +-.SH UPLOAD AN EXISTING IMAGE +-.sp +-You can upload previously built images, as long as they are in the \fBFINISHED\fP state, using \fBcomposer\-cli upload start ...\(ga\fP\&. If you have a profile named \fBtest\-uploads\fP: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-composer\-cli upload start "http\-image" aws test\-uploads +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-Or if you have the settings stored in a TOML file: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-composer\-cli upload start "http\-image" aws\-settings.toml +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-This will output the UUID of the upload, which can then be used to monitor the status in the same way +-described above. +-.SH DEBUGGING +-.sp +-There are a couple of arguments that can be helpful when debugging problems. +-These are only meant for debugging and should not be used to script access to +-the API. If you need to do that you can communicate with it directly in the +-language of your choice. +-.sp +-\fB\-\-json\fP will return the server\(aqs response as a nicely formatted json output +-instead of printing what the command would usually print. +-.sp +-\fB\-\-test=1\fP will cause a compose start to start creating an image, and then +-end with a failed state. +-.sp +-\fB\-\-test=2\fP will cause a compose to start and then end with a finished state, +-without actually composing anything. +-.SH BLUEPRINT REFERENCE +-.sp +-Blueprints are simple text files in \fI\%TOML\fP format that describe +-which packages, and what versions, to install into the image. They can also define a limited set +-of customizations to make to the final image. +-.sp +-A basic blueprint looks like this: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-name = "base" +-description = "A base system with bash" +-version = "0.0.1" +- +-[[packages]] +-name = "bash" +-version = "4.4.*" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-The \fBname\fP field is the name of the blueprint. It can contain spaces, but they will be converted to \fB\-\fP +-when it is written to disk. It should be short and descriptive. +-.sp +-\fBdescription\fP can be a longer description of the blueprint, it is only used for display purposes. +-.sp +-\fBversion\fP is a \fI\%semver compatible\fP version number. If +-a new blueprint is uploaded with the same \fBversion\fP the server will +-automatically bump the PATCH level of the \fBversion\fP\&. If the \fBversion\fP +-doesn\(aqt match it will be used as is. eg. Uploading a blueprint with \fBversion\fP +-set to \fB0.1.0\fP when the existing blueprint \fBversion\fP is \fB0.0.1\fP will +-result in the new blueprint being stored as \fBversion 0.1.0\fP\&. +-.SS [[packages]] and [[modules]] +-.sp +-These entries describe the package names and matching version glob to be installed into the image. +-.sp +-The names must match the names exactly, and the versions can be an exact match +-or a filesystem\-like glob of the version using \fB*\fP wildcards and \fB?\fP +-character matching. +-.sp +-\fBNOTE:\fP +-.INDENT 0.0 +-.INDENT 3.5 +-Currently there are no differences between \fBpackages\fP and \fBmodules\fP +-in \fBosbuild\-composer\fP\&. Both are treated like an rpm package dependency. +-.UNINDENT +-.UNINDENT +-.sp +-For example, to install \fBtmux\-2.9a\fP and \fBopenssh\-server\-8.*\fP, you would add +-this to your blueprint: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[[packages]] +-name = "tmux" +-version = "2.9a" +- +-[[packages]] +-name = "openssh\-server" +-version = "8.*" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.SS [[groups]] +-.sp +-The \fBgroups\fP entries describe a group of packages to be installed into the image. Package groups are +-defined in the repository metadata. Each group has a descriptive name used primarily for display +-in user interfaces and an ID more commonly used in kickstart files. Here, the ID is the expected +-way of listing a group. +-.sp +-Groups have three different ways of categorizing their packages: mandatory, default, and optional. +-For purposes of blueprints, mandatory and default packages will be installed. There is no mechanism +-for selecting optional packages. +-.sp +-For example, if you want to install the \fBanaconda\-tools\fP group you would add this to your +-blueprint: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[[groups]] +-name="anaconda\-tools" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-\fBgroups\fP is a TOML list, so each group needs to be listed separately, like \fBpackages\fP but with +-no version number. +-.SS Customizations +-.sp +-The \fB[customizations]\fP section can be used to configure the hostname of the final image. eg.: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[customizations] +-hostname = "baseimage" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-This is optional and may be left out to use the defaults. +-.SS [customizations.kernel] +-.sp +-This allows you to append arguments to the bootloader\(aqs kernel commandline. This will not have any +-effect on \fBtar\fP or \fBext4\-filesystem\fP images since they do not include a bootloader. +-.sp +-For example: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[customizations.kernel] +-append = "nosmt=force" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.SS [[customizations.sshkey]] +-.sp +-Set an existing user\(aqs ssh key in the final image: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[[customizations.sshkey]] +-user = "root" +-key = "PUBLIC SSH KEY" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-The key will be added to the user\(aqs authorized_keys file. +-.sp +-\fBWARNING:\fP +-.INDENT 0.0 +-.INDENT 3.5 +-\fBkey\fP expects the entire content of \fB~/.ssh/id_rsa.pub\fP +-.UNINDENT +-.UNINDENT +-.SS [[customizations.user]] +-.sp +-Add a user to the image, and/or set their ssh key. +-All fields for this section are optional except for the \fBname\fP, here is a complete example: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[[customizations.user]] +-name = "admin" +-description = "Administrator account" +-password = "$6$CHO2$3rN8eviE2t50lmVyBYihTgVRHcaecmeCk31L..." +-key = "PUBLIC SSH KEY" +-home = "/srv/widget/" +-shell = "/usr/bin/bash" +-groups = ["widget", "users", "wheel"] +-uid = 1200 +-gid = 1200 +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-If the password starts with \fB$6$\fP, \fB$5$\fP, or \fB$2b$\fP it will be stored as +-an encrypted password. Otherwise it will be treated as a plain text password. +-.sp +-\fBWARNING:\fP +-.INDENT 0.0 +-.INDENT 3.5 +-\fBkey\fP expects the entire content of \fB~/.ssh/id_rsa.pub\fP +-.UNINDENT +-.UNINDENT +-.SS [[customizations.group]] +-.sp +-Add a group to the image. \fBname\fP is required and \fBgid\fP is optional: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[[customizations.group]] +-name = "widget" +-gid = 1130 +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.SS [customizations.timezone] +-.sp +-Customizing the timezone and the NTP servers to use for the system: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[customizations.timezone] +-timezone = "US/Eastern" +-ntpservers = ["0.north\-america.pool.ntp.org", "1.north\-america.pool.ntp.org"] +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-The values supported by \fBtimezone\fP can be listed by running \fBtimedatectl list\-timezones\fP\&. +-.sp +-If no timezone is setup the system will default to using \fIUTC\fP\&. The ntp servers are also +-optional and will default to using the distribution defaults which are fine for most uses. +-.sp +-In some image types there are already NTP servers setup, eg. Google cloud image, and they +-cannot be overridden because they are required to boot in the selected environment. But the +-timezone will be updated to the one selected in the blueprint. +-.SS [customizations.locale] +-.sp +-Customize the locale settings for the system: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[customizations.locale] +-languages = ["en_US.UTF\-8"] +-keyboard = "us" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-The values supported by \fBlanguages\fP can be listed by running \fBlocalectl list\-locales\fP from +-the command line. +-.sp +-The values supported by \fBkeyboard\fP can be listed by running \fBlocalectl list\-keymaps\fP from +-the command line. +-.sp +-Multiple languages can be added. The first one becomes the +-primary, and the others are added as secondary. One or the other of \fBlanguages\fP +-or \fBkeyboard\fP must be included (or both) in the section. +-.SS [customizations.firewall] +-.sp +-By default the firewall blocks all access except for services that enable their ports explicitly, +-like \fBsshd\fP\&. This command can be used to open other ports or services. Ports are configured using +-the port:protocol format: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[customizations.firewall] +-ports = ["22:tcp", "80:tcp", "imap:tcp", "53:tcp", "53:udp"] +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-Numeric ports, or their names from \fB/etc/services\fP can be used in the \fBports\fP enabled/disabled lists. +-.sp +-The blueprint settings extend any existing settings in the image templates, so if \fBsshd\fP is +-already enabled it will extend the list of ports with the ones listed by the blueprint. +-.sp +-If the distribution uses \fBfirewalld\fP you can specify services listed by \fBfirewall\-cmd \-\-get\-services\fP +-in a \fBcustomizations.firewall.services\fP section: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[customizations.firewall.services] +-enabled = ["ftp", "ntp", "dhcp"] +-disabled = ["telnet"] +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.sp +-Remember that the \fBfirewall.services\fP are different from the names in \fB/etc/services\fP\&. +-.sp +-Both are optional, if they are not used leave them out or set them to an empty list \fB[]\fP\&. If you +-only want the default firewall setup this section can be omitted from the blueprint. +-.sp +-NOTE: The \fBGoogle\fP and \fBOpenStack\fP templates explicitly disable the firewall for their environment. +-This cannot be overridden by the blueprint. +-.SS [customizations.services] +-.sp +-This section can be used to control which services are enabled at boot time. +-Some image types already have services enabled or disabled in order for the +-image to work correctly, and cannot be overridden. eg. \fBami\fP requires +-\fBsshd\fP, \fBchronyd\fP, and \fBcloud\-init\fP\&. Without them the image will not +-boot. Blueprint services are added to, not replacing, the list already in the +-templates, if any. +-.sp +-The service names are systemd service units. You may specify any systemd unit +-file accepted by \fBsystemctl enable\fP eg. \fBcockpit.socket\fP: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[customizations.services] +-enabled = ["sshd", "cockpit.socket", "httpd"] +-disabled = ["postfix", "telnetd"] +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.SS [[repos.git]] +-.sp +-\fBNOTE:\fP +-.INDENT 0.0 +-.INDENT 3.5 +-Currently \fBosbuild\-composer\fP does not support \fBrepos.git\fP +-.UNINDENT +-.UNINDENT +-.sp +-The \fB[[repos.git]]\fP entries are used to add files from a \fI\%git repository\fP +-repository to the created image. The repository is cloned, the specified \fBref\fP is checked out +-and an rpm is created to install the files to a \fBdestination\fP path. The rpm includes a summary +-with the details of the repository and reference used to create it. The rpm is also included in the +-image build metadata. +-.sp +-To create an rpm named \fBserver\-config\-1.0\-1.noarch.rpm\fP you would add this to your blueprint: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-[[repos.git]] +-rpmname="server\-config" +-rpmversion="1.0" +-rpmrelease="1" +-summary="Setup files for server deployment" +-repo="PATH OF GIT REPO TO CLONE" +-ref="v1.0" +-destination="/opt/server/" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.INDENT 0.0 +-.IP \(bu 2 +-rpmname: Name of the rpm to create, also used as the prefix name in the tar archive +-.IP \(bu 2 +-rpmversion: Version of the rpm, eg. "1.0.0" +-.IP \(bu 2 +-rpmrelease: Release of the rpm, eg. "1" +-.IP \(bu 2 +-summary: Summary string for the rpm +-.IP \(bu 2 +-repo: URL of the get repo to clone and create the archive from +-.IP \(bu 2 +-ref: Git reference to check out. eg. origin/branch\-name, git tag, or git commit hash +-.IP \(bu 2 +-destination: Path to install the / of the git repo at when installing the rpm +-.UNINDENT +-.sp +-An rpm will be created with the contents of the git repository referenced, with the files +-being installed under \fB/opt/server/\fP in this case. +-.sp +-\fBref\fP can be any valid git reference for use with \fBgit archive\fP\&. eg. to use the head +-of a branch set it to \fBorigin/branch\-name\fP, a tag name, or a commit hash. +-.sp +-Note that the repository is cloned in full each time a build is started, so pointing to a +-repository with a large amount of history may take a while to clone and use a significant +-amount of disk space. The clone is temporary and is removed once the rpm is created. +-.SH EXAMPLE BLUEPRINT +-.sp +-This example blueprint will install the \fBtmux\fP, \fBgit\fP, and \fBvim\-enhanced\fP +-packages. It will set the \fBroot\fP ssh key, add the \fBwidget\fP and \fBadmin\fP +-users as well as a \fBstudents\fP group: +-.INDENT 0.0 +-.INDENT 3.5 +-.sp +-.nf +-.ft C +-name = "example\-custom\-base" +-description = "A base system with customizations" +-version = "0.0.1" +- +-[[packages]] +-name = "tmux" +-version = "*" +- +-[[packages]] +-name = "git" +-version = "*" +- +-[[packages]] +-name = "vim\-enhanced" +-version = "*" +- +-[customizations] +-hostname = "custombase" +- +-[[customizations.sshkey]] +-user = "root" +-key = "A SSH KEY FOR ROOT" +- +-[[customizations.user]] +-name = "widget" +-description = "Widget process user account" +-home = "/srv/widget/" +-shell = "/usr/bin/false" +-groups = ["dialout", "users"] +- +-[[customizations.user]] +-name = "admin" +-description = "Widget admin account" +-password = "$6$CHO2$3rN8eviE2t50lmVyBYihTgVRHcaecmeCk31LeOUleVK/R/aeWVHVZDi26zAH.o0ywBKH9Tc0/wm7sW/q39uyd1" +-home = "/srv/widget/" +-shell = "/usr/bin/bash" +-groups = ["widget", "users", "students"] +-uid = 1200 +- +-[[customizations.user]] +-name = "plain" +-password = "simple plain password" +- +-[[customizations.user]] +-name = "bart" +-key = "SSH KEY FOR BART" +-groups = ["students"] +- +-[[customizations.group]] +-name = "widget" +- +-[[customizations.group]] +-name = "students" +-.ft P +-.fi +-.UNINDENT +-.UNINDENT +-.SH AUTHOR +-Weldr Team +-.SH COPYRIGHT +-2018, Red Hat, Inc. +-.\" Generated by docutils manpage writer. +-. +-- +2.26.3 + diff --git a/lorax.spec b/lorax.spec index c432d7b..dcc0f30 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.1 -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: 0001-docs-Remove-composer-cli.1.patch BuildRequires: python3-devel BuildRequires: make @@ -135,6 +136,7 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build From f3d336e5165d750882eb0a9b3865adec17dc55c1 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 3 May 2021 15:31:31 -0700 Subject: [PATCH 083/203] Remove unused patches --- ...don-t-wipe-usr-bin-report-cli-193755.patch | 27 ------------------- ...c89cda687f9689978eedb5482d041577577a.patch | 23 ---------------- lorax-35.0-drop-reiserfs.patch | 12 --------- xorg-x11-server-utils-retire.patch | 23 ---------------- 4 files changed, 85 deletions(-) delete mode 100644 0001-runtime-cleanup-don-t-wipe-usr-bin-report-cli-193755.patch delete mode 100644 78eec89cda687f9689978eedb5482d041577577a.patch delete mode 100644 lorax-35.0-drop-reiserfs.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/lorax-35.0-drop-reiserfs.patch b/lorax-35.0-drop-reiserfs.patch deleted file mode 100644 index f19d6c5..0000000 --- a/lorax-35.0-drop-reiserfs.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-04-01 17:57:17.526337827 -0700 -+++ lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl 2021-04-01 17:57:58.961412923 -0700 -@@ -96,7 +96,7 @@ - installpkg librsvg2 - - ## filesystem tools --installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils gfs2-utils ntfs-3g ntfsprogs -+installpkg btrfs-progs jfsutils xfsprogs gfs2-utils ntfs-3g ntfsprogs - installpkg system-storage-manager - installpkg device-mapper-persistent-data - installpkg xfsdump 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 050700651b86dcd90266e3592f3ecf41bfddc24d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 3 May 2021 15:39:00 -0700 Subject: [PATCH 084/203] 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..9d31c2f --- /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=rawhide --release=rawhide --volid="Fedora-rawhide-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 17e3b44300ec077f1accc500168da337b1637ba9 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 5 May 2021 14:30:14 -0700 Subject: [PATCH 085/203] - 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) - docs: Remove composer-cli.1 (bcl@redhat.com) --- .gitignore | 1 + 0001-docs-Remove-composer-cli.1.patch | 941 -------------------------- lorax.spec | 12 +- sources | 2 +- 4 files changed, 10 insertions(+), 946 deletions(-) delete mode 100644 0001-docs-Remove-composer-cli.1.patch diff --git a/.gitignore b/.gitignore index 567070d..08171d5 100644 --- a/.gitignore +++ b/.gitignore @@ -197,3 +197,4 @@ /lorax-34.9.tar.gz /lorax-35.0.tar.gz /lorax-35.1.tar.gz +/lorax-35.2.tar.gz diff --git a/0001-docs-Remove-composer-cli.1.patch b/0001-docs-Remove-composer-cli.1.patch deleted file mode 100644 index e68da6a..0000000 --- a/0001-docs-Remove-composer-cli.1.patch +++ /dev/null @@ -1,941 +0,0 @@ -From cc7430fbbd7f72e5d6efd3e83efe2616de3a5d58 Mon Sep 17 00:00:00 2001 -From: "Brian C. Lane" -Date: Mon, 26 Apr 2021 16:24:12 -0700 -Subject: [PATCH] docs: Remove composer-cli.1 - ---- - docs/man/composer-cli.1 | 922 ---------------------------------------- - 1 file changed, 922 deletions(-) - delete mode 100644 docs/man/composer-cli.1 - -diff --git a/docs/man/composer-cli.1 b/docs/man/composer-cli.1 -deleted file mode 100644 -index ce78286c..00000000 ---- a/docs/man/composer-cli.1 -+++ /dev/null -@@ -1,922 +0,0 @@ --.\" Man page generated from reStructuredText. --. --.TH "COMPOSER-CLI" "1" "Mar 04, 2021" "35.0" "Lorax" --.SH NAME --composer-cli \- Composer Cmdline Utility Documentation --. --.nr rst2man-indent-level 0 --. --.de1 rstReportMargin --\\$1 \\n[an-margin] --level \\n[rst2man-indent-level] --level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] --- --\\n[rst2man-indent0] --\\n[rst2man-indent1] --\\n[rst2man-indent2] --.. --.de1 INDENT --.\" .rstReportMargin pre: --. RS \\$1 --. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] --. nr rst2man-indent-level +1 --.\" .rstReportMargin post: --.. --.de UNINDENT --. RE --.\" indent \\n[an-margin] --.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] --.nr rst2man-indent-level -1 --.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] --.in \\n[rst2man-indent\\n[rst2man-indent-level]]u --.. --.INDENT 0.0 --.TP --.B Authors --Brian C. Lane <\fI\%bcl@redhat.com\fP> --.UNINDENT --.sp --\fBcomposer\-cli\fP is an interactive tool for use with a WELDR API server, --managing blueprints, exploring available packages, and building new images. As --of Fedora 34, \fIosbuild\-composer \fP is the recommended --server. --.sp --It requires the server to be installed on the local system, and the user --running it needs to be a member of the \fBweldr\fP group. --.SH COMPOSER-CLI CMDLINE ARGUMENTS --.sp --Lorax Composer commandline tool -- --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --usage: composer\-cli [\-h] [\-j] [\-s SOCKET] [\-\-log LOG] [\-a APIVER] [\-\-test TESTMODE] [\-V] ... --.ft P --.fi --.UNINDENT --.UNINDENT --.SS Positional Arguments --.INDENT 0.0 --.TP --.Bargs --.UNINDENT --.SS Named Arguments --.INDENT 0.0 --.TP --.B\-j, \-\-json --Output the raw JSON response instead of the normal output. --.sp --Default: False --.TP --.B\-s, \-\-socket --Path to the socket file to listen on --.sp --Default: "/run/weldr/api.socket" --.TP --.B\-\-log --Path to logfile (./composer\-cli.log) --.TP --.B\-a, \-\-api --API Version to use --.sp --Default: "1" --.TP --.B\-\-test --Pass test mode to compose. 1=Mock compose with fail. 2=Mock compose with finished. --.sp --Default: 0 --.TP --.B\-V --show program\(aqs version number and exit --.sp --Default: False --.UNINDENT --.sp --.INDENT 0.0 --.TP --.B compose start [\-\-size XXXX] [ | ] --Start a compose using the selected blueprint and output type. Optionally start an upload. --\-\-size is supported by osbuild\-composer, and is in MiB. --.TP --.B compose start\-ostree [\-\-size XXXX] [\-\-parent PARENT] [\-\-ref REF] [\-\-url url] [ ] --Start an ostree compose using the selected blueprint and output type. Optionally start an upload. This command --is only supported by osbuild\-composer. \-\-size is in MiB. --.TP --.B compose types --List the supported output types. --.TP --.B compose status --List the status of all running and finished composes. --.TP --.B compose list [waiting|running|finished|failed] --List basic information about composes. --.TP --.B compose log [] --Show the last SIZE kB of the compose log. --.TP --.B compose cancel --Cancel a running compose and delete any intermediate results. --.TP --.B compose delete --Delete the listed compose results. --.TP --.B compose info --Show detailed information on the compose. --.TP --.B compose metadata --Download the metadata use to create the compose to \-metadata.tar --.TP --.B compose logs --Download the compose logs to \-logs.tar --.TP --.B compose results --Download all of the compose results; metadata, logs, and image to .tar --.TP --.B compose image --Download the output image from the compose. Filename depends on the type. --.TP --.B blueprints list --List the names of the available blueprints. --.TP --.B blueprints show --Display the blueprint in TOML format. --.TP --.B blueprints changes --Display the changes for each blueprint. --.TP --.B blueprints diff --Display the differences between 2 versions of a blueprint. --FROM\-COMMIT can be a commit hash or NEWEST --TO\-COMMIT can be a commit hash, NEWEST, or WORKSPACE --.TP --.B blueprints save --Save the blueprint to a file, .toml --.TP --.B blueprints delete --Delete a blueprint from the server --.TP --.B blueprints depsolve --Display the packages needed to install the blueprint. --.TP --.B blueprints push --Push a blueprint TOML file to the server. --.TP --.B blueprints freeze --Display the frozen blueprint\(aqs modules and packages. --.TP --.B blueprints freeze show --Display the frozen blueprint in TOML format. --.TP --.B blueprints freeze save --Save the frozen blueprint to a file, .frozen.toml. --.TP --.B blueprints tag --Tag the most recent blueprint commit as a release. --.TP --.B blueprints undo --Undo changes to a blueprint by reverting to the selected commit. --.TP --.B blueprints workspace --Push the blueprint TOML to the temporary workspace storage. --.TP --.B modules list --List the available modules. --.TP --.B projects list --List the available projects. --.TP --.B projects info --Show details about the listed projects. --.TP --.B sources list --List the available sources --.TP --.B sources info --Details about the source. --.TP --.B sources add --Add a package source to the server. --.TP --.B sources change --Change an existing source --.TP --.B sources delete --Delete a package source. --.UNINDENT --.sp --status show Show API server status. --.INDENT 0.0 --.TP --.B upload info --Details about an upload --.TP --.B upload start [ |] --Upload a build image to the selected provider. --.TP --.B upload log --Show the upload log --.TP --.B upload cancel --Cancel an upload with that is queued or in progress --.TP --.B upload delete --Delete the upload and remove it from the build --.TP --.B upload reset --Reset the upload so that it can be tried again --.TP --.B providers list --List the available providers, or list the available profiles --.TP --.B providers show --show the details of a specific provider\(aqs profile --.TP --.B providers push --Add a new profile, or overwrite an existing one --.TP --.B providers save --Save the profile\(aqs details to a TOML file named .toml --.TP --.B providers delete --Delete a profile from a provider --.UNINDENT -- --.SH EDIT A BLUEPRINT --.sp --Start out by listing the available blueprints using \fBcomposer\-cli blueprints --list\fP, pick one and save it to the local directory by running \fBcomposer\-cli --blueprints save http\-server\fP\&. --.sp --Edit the file (it will be saved with a .toml extension) and change the --description, add a package or module to it. Send it back to the server by --running \fBcomposer\-cli blueprints push http\-server.toml\fP\&. You can verify that it was --saved by viewing the changelog \- \fBcomposer\-cli blueprints changes http\-server\fP\&. --.sp --See the \fI\%Example Blueprint\fP for an example. --.SH BUILD AN IMAGE --.sp --Build a \fBqcow2\fP disk image from this blueprint by running \fBcomposer\-cli --compose start http\-server qcow2\fP\&. It will print a UUID that you can use to --keep track of the build. You can also cancel the build if needed. --.sp --The available types of images is displayed by \fBcomposer\-cli compose types\fP\&. --Currently this consists of: alibaba, ami, ext4\-filesystem, google, hyper\-v, --live\-iso, openstack, partitioned\-disk, qcow2, tar, vhd, vmdk --.sp --You can optionally start an upload of the finished image, see \fI\%Image Uploads\fP for --more information. --.SH MONITOR THE BUILD STATUS --.sp --Monitor it using \fBcomposer\-cli compose status\fP, which will show the status of --all the builds on the system. You can view the end of the anaconda build logs --once it is in the \fBRUNNING\fP state using \fBcomposer\-cli compose log UUID\fP --where UUID is the UUID returned by the start command. --.sp --Once the build is in the \fBFINISHED\fP state you can download the image. --.SH DOWNLOAD THE IMAGE --.sp --Downloading the final image is done with \fBcomposer\-cli compose image UUID\fP and it will --save the qcow2 image as \fBUUID\-disk.qcow2\fP which you can then use to boot a VM like this: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --qemu\-kvm \-\-name test\-image \-m 1024 \-hda ./UUID\-disk.qcow2 --.ft P --.fi --.UNINDENT --.UNINDENT --.SH IMAGE UPLOADS --.sp --\fBcomposer\-cli\fP can upload the images to a number of services, including AWS, --OpenStack, and vSphere. The upload can be started when the build is finished, --by using \fBcomposer\-cli compose start ...\fP or an existing image can be uploaded --with \fBcomposer\-cli upload start ...\fP\&. In order to access the service you need --to pass authentication details to composer\-cli using a TOML file, or reference --a previously saved profile. --.sp --\fBNOTE:\fP --.INDENT 0.0 --.INDENT 3.5 --With \fBosbuild\-composer\fP you can only specify upload targets during --the compose process. --.UNINDENT --.UNINDENT --.SH PROVIDERS --.sp --Providers are the services providers with Ansible playbook support under --\fB/usr/share/lorax/lifted/providers/\fP, you will need to gather some provider --specific information in order to authenticate with it. You can view the --required fields using \fBcomposer\-cli providers template \fP, eg. for AWS --you would run: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --composer\-cli upload template aws --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --The output looks like this: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --provider = "aws" -- --[settings] --aws_access_key = "AWS Access Key" --aws_bucket = "AWS Bucket" --aws_region = "AWS Region" --aws_secret_key = "AWS Secret Key" --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --Save this into an \fBaws\-credentials.toml\fP file and use it when running \fBstart\fP\&. --.SS AWS --.sp --The access key and secret key can be created by going to the --\fBIAM\->Users\->Security Credentials\fP section and creating a new access key. The --secret key will only be shown when it is first created so make sure to record --it in a secure place. The region should be the region that you want to use the --AMI in, and the bucket can be an existing bucket, or a new one, following the --normal AWS bucket naming rules. It will be created if it doesn\(aqt already exist. --.sp --When uploading the image it is first uploaded to the s3 bucket, and then --converted to an AMI. If the conversion is successful the s3 object will be --deleted. If it fails, re\-trying after correcting the problem will re\-use the --object if you have not deleted it in the meantime, speeding up the process. --.SH PROFILES --.sp --Profiles store the authentication settings associated with a specific provider. --Providers can have multiple profiles, as long as their names are unique. For --example, you may have one profile for testing and another for production --uploads. --.sp --Profiles are created by pushing the provider settings template to the server using --\fBcomposer\-cli providers push \fP where \fBPROFILE.TOML\fP is the same as the --provider template, but with the addition of a \fBprofile\fP field. For example, an AWS --profile named \fBtest\-uploads\fP would look like this: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --provider = "aws" --profile = "test\-uploads" -- --[settings] --aws_access_key = "AWS Access Key" --aws_bucket = "AWS Bucket" --aws_region = "AWS Region" --aws_secret_key = "AWS Secret Key" --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --You can view the profile by using \fBcomposer\-cli providers aws test\-uploads\fP\&. --.SH BUILD AN IMAGE AND UPLOAD RESULTS --.sp --If you have a profile named \fBtest\-uploads\fP: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --composer\-cli compose start example\-http\-server ami "http image" aws test\-uploads --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --Or if you have the settings stored in a TOML file: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --composer\-cli compose start example\-http\-server ami "http image" aws\-settings.toml --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --It will return the UUID of the image build, and the UUID of the upload. Once --the build has finished successfully it will start the upload process, which you --can monitor with \fBcomposer\-cli upload info \fP --.sp --You can also view the upload logs from the Ansible playbook with: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --\(ga\(gacomposer\-cli upload log \(ga\(ga --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --The type of the image must match the type supported by the provider. --.SH UPLOAD AN EXISTING IMAGE --.sp --You can upload previously built images, as long as they are in the \fBFINISHED\fP state, using \fBcomposer\-cli upload start ...\(ga\fP\&. If you have a profile named \fBtest\-uploads\fP: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --composer\-cli upload start "http\-image" aws test\-uploads --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --Or if you have the settings stored in a TOML file: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --composer\-cli upload start "http\-image" aws\-settings.toml --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --This will output the UUID of the upload, which can then be used to monitor the status in the same way --described above. --.SH DEBUGGING --.sp --There are a couple of arguments that can be helpful when debugging problems. --These are only meant for debugging and should not be used to script access to --the API. If you need to do that you can communicate with it directly in the --language of your choice. --.sp --\fB\-\-json\fP will return the server\(aqs response as a nicely formatted json output --instead of printing what the command would usually print. --.sp --\fB\-\-test=1\fP will cause a compose start to start creating an image, and then --end with a failed state. --.sp --\fB\-\-test=2\fP will cause a compose to start and then end with a finished state, --without actually composing anything. --.SH BLUEPRINT REFERENCE --.sp --Blueprints are simple text files in \fI\%TOML\fP format that describe --which packages, and what versions, to install into the image. They can also define a limited set --of customizations to make to the final image. --.sp --A basic blueprint looks like this: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --name = "base" --description = "A base system with bash" --version = "0.0.1" -- --[[packages]] --name = "bash" --version = "4.4.*" --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --The \fBname\fP field is the name of the blueprint. It can contain spaces, but they will be converted to \fB\-\fP --when it is written to disk. It should be short and descriptive. --.sp --\fBdescription\fP can be a longer description of the blueprint, it is only used for display purposes. --.sp --\fBversion\fP is a \fI\%semver compatible\fP version number. If --a new blueprint is uploaded with the same \fBversion\fP the server will --automatically bump the PATCH level of the \fBversion\fP\&. If the \fBversion\fP --doesn\(aqt match it will be used as is. eg. Uploading a blueprint with \fBversion\fP --set to \fB0.1.0\fP when the existing blueprint \fBversion\fP is \fB0.0.1\fP will --result in the new blueprint being stored as \fBversion 0.1.0\fP\&. --.SS [[packages]] and [[modules]] --.sp --These entries describe the package names and matching version glob to be installed into the image. --.sp --The names must match the names exactly, and the versions can be an exact match --or a filesystem\-like glob of the version using \fB*\fP wildcards and \fB?\fP --character matching. --.sp --\fBNOTE:\fP --.INDENT 0.0 --.INDENT 3.5 --Currently there are no differences between \fBpackages\fP and \fBmodules\fP --in \fBosbuild\-composer\fP\&. Both are treated like an rpm package dependency. --.UNINDENT --.UNINDENT --.sp --For example, to install \fBtmux\-2.9a\fP and \fBopenssh\-server\-8.*\fP, you would add --this to your blueprint: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[[packages]] --name = "tmux" --version = "2.9a" -- --[[packages]] --name = "openssh\-server" --version = "8.*" --.ft P --.fi --.UNINDENT --.UNINDENT --.SS [[groups]] --.sp --The \fBgroups\fP entries describe a group of packages to be installed into the image. Package groups are --defined in the repository metadata. Each group has a descriptive name used primarily for display --in user interfaces and an ID more commonly used in kickstart files. Here, the ID is the expected --way of listing a group. --.sp --Groups have three different ways of categorizing their packages: mandatory, default, and optional. --For purposes of blueprints, mandatory and default packages will be installed. There is no mechanism --for selecting optional packages. --.sp --For example, if you want to install the \fBanaconda\-tools\fP group you would add this to your --blueprint: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[[groups]] --name="anaconda\-tools" --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --\fBgroups\fP is a TOML list, so each group needs to be listed separately, like \fBpackages\fP but with --no version number. --.SS Customizations --.sp --The \fB[customizations]\fP section can be used to configure the hostname of the final image. eg.: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[customizations] --hostname = "baseimage" --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --This is optional and may be left out to use the defaults. --.SS [customizations.kernel] --.sp --This allows you to append arguments to the bootloader\(aqs kernel commandline. This will not have any --effect on \fBtar\fP or \fBext4\-filesystem\fP images since they do not include a bootloader. --.sp --For example: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[customizations.kernel] --append = "nosmt=force" --.ft P --.fi --.UNINDENT --.UNINDENT --.SS [[customizations.sshkey]] --.sp --Set an existing user\(aqs ssh key in the final image: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[[customizations.sshkey]] --user = "root" --key = "PUBLIC SSH KEY" --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --The key will be added to the user\(aqs authorized_keys file. --.sp --\fBWARNING:\fP --.INDENT 0.0 --.INDENT 3.5 --\fBkey\fP expects the entire content of \fB~/.ssh/id_rsa.pub\fP --.UNINDENT --.UNINDENT --.SS [[customizations.user]] --.sp --Add a user to the image, and/or set their ssh key. --All fields for this section are optional except for the \fBname\fP, here is a complete example: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[[customizations.user]] --name = "admin" --description = "Administrator account" --password = "$6$CHO2$3rN8eviE2t50lmVyBYihTgVRHcaecmeCk31L..." --key = "PUBLIC SSH KEY" --home = "/srv/widget/" --shell = "/usr/bin/bash" --groups = ["widget", "users", "wheel"] --uid = 1200 --gid = 1200 --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --If the password starts with \fB$6$\fP, \fB$5$\fP, or \fB$2b$\fP it will be stored as --an encrypted password. Otherwise it will be treated as a plain text password. --.sp --\fBWARNING:\fP --.INDENT 0.0 --.INDENT 3.5 --\fBkey\fP expects the entire content of \fB~/.ssh/id_rsa.pub\fP --.UNINDENT --.UNINDENT --.SS [[customizations.group]] --.sp --Add a group to the image. \fBname\fP is required and \fBgid\fP is optional: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[[customizations.group]] --name = "widget" --gid = 1130 --.ft P --.fi --.UNINDENT --.UNINDENT --.SS [customizations.timezone] --.sp --Customizing the timezone and the NTP servers to use for the system: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[customizations.timezone] --timezone = "US/Eastern" --ntpservers = ["0.north\-america.pool.ntp.org", "1.north\-america.pool.ntp.org"] --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --The values supported by \fBtimezone\fP can be listed by running \fBtimedatectl list\-timezones\fP\&. --.sp --If no timezone is setup the system will default to using \fIUTC\fP\&. The ntp servers are also --optional and will default to using the distribution defaults which are fine for most uses. --.sp --In some image types there are already NTP servers setup, eg. Google cloud image, and they --cannot be overridden because they are required to boot in the selected environment. But the --timezone will be updated to the one selected in the blueprint. --.SS [customizations.locale] --.sp --Customize the locale settings for the system: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[customizations.locale] --languages = ["en_US.UTF\-8"] --keyboard = "us" --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --The values supported by \fBlanguages\fP can be listed by running \fBlocalectl list\-locales\fP from --the command line. --.sp --The values supported by \fBkeyboard\fP can be listed by running \fBlocalectl list\-keymaps\fP from --the command line. --.sp --Multiple languages can be added. The first one becomes the --primary, and the others are added as secondary. One or the other of \fBlanguages\fP --or \fBkeyboard\fP must be included (or both) in the section. --.SS [customizations.firewall] --.sp --By default the firewall blocks all access except for services that enable their ports explicitly, --like \fBsshd\fP\&. This command can be used to open other ports or services. Ports are configured using --the port:protocol format: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[customizations.firewall] --ports = ["22:tcp", "80:tcp", "imap:tcp", "53:tcp", "53:udp"] --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --Numeric ports, or their names from \fB/etc/services\fP can be used in the \fBports\fP enabled/disabled lists. --.sp --The blueprint settings extend any existing settings in the image templates, so if \fBsshd\fP is --already enabled it will extend the list of ports with the ones listed by the blueprint. --.sp --If the distribution uses \fBfirewalld\fP you can specify services listed by \fBfirewall\-cmd \-\-get\-services\fP --in a \fBcustomizations.firewall.services\fP section: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[customizations.firewall.services] --enabled = ["ftp", "ntp", "dhcp"] --disabled = ["telnet"] --.ft P --.fi --.UNINDENT --.UNINDENT --.sp --Remember that the \fBfirewall.services\fP are different from the names in \fB/etc/services\fP\&. --.sp --Both are optional, if they are not used leave them out or set them to an empty list \fB[]\fP\&. If you --only want the default firewall setup this section can be omitted from the blueprint. --.sp --NOTE: The \fBGoogle\fP and \fBOpenStack\fP templates explicitly disable the firewall for their environment. --This cannot be overridden by the blueprint. --.SS [customizations.services] --.sp --This section can be used to control which services are enabled at boot time. --Some image types already have services enabled or disabled in order for the --image to work correctly, and cannot be overridden. eg. \fBami\fP requires --\fBsshd\fP, \fBchronyd\fP, and \fBcloud\-init\fP\&. Without them the image will not --boot. Blueprint services are added to, not replacing, the list already in the --templates, if any. --.sp --The service names are systemd service units. You may specify any systemd unit --file accepted by \fBsystemctl enable\fP eg. \fBcockpit.socket\fP: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[customizations.services] --enabled = ["sshd", "cockpit.socket", "httpd"] --disabled = ["postfix", "telnetd"] --.ft P --.fi --.UNINDENT --.UNINDENT --.SS [[repos.git]] --.sp --\fBNOTE:\fP --.INDENT 0.0 --.INDENT 3.5 --Currently \fBosbuild\-composer\fP does not support \fBrepos.git\fP --.UNINDENT --.UNINDENT --.sp --The \fB[[repos.git]]\fP entries are used to add files from a \fI\%git repository\fP --repository to the created image. The repository is cloned, the specified \fBref\fP is checked out --and an rpm is created to install the files to a \fBdestination\fP path. The rpm includes a summary --with the details of the repository and reference used to create it. The rpm is also included in the --image build metadata. --.sp --To create an rpm named \fBserver\-config\-1.0\-1.noarch.rpm\fP you would add this to your blueprint: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --[[repos.git]] --rpmname="server\-config" --rpmversion="1.0" --rpmrelease="1" --summary="Setup files for server deployment" --repo="PATH OF GIT REPO TO CLONE" --ref="v1.0" --destination="/opt/server/" --.ft P --.fi --.UNINDENT --.UNINDENT --.INDENT 0.0 --.IP \(bu 2 --rpmname: Name of the rpm to create, also used as the prefix name in the tar archive --.IP \(bu 2 --rpmversion: Version of the rpm, eg. "1.0.0" --.IP \(bu 2 --rpmrelease: Release of the rpm, eg. "1" --.IP \(bu 2 --summary: Summary string for the rpm --.IP \(bu 2 --repo: URL of the get repo to clone and create the archive from --.IP \(bu 2 --ref: Git reference to check out. eg. origin/branch\-name, git tag, or git commit hash --.IP \(bu 2 --destination: Path to install the / of the git repo at when installing the rpm --.UNINDENT --.sp --An rpm will be created with the contents of the git repository referenced, with the files --being installed under \fB/opt/server/\fP in this case. --.sp --\fBref\fP can be any valid git reference for use with \fBgit archive\fP\&. eg. to use the head --of a branch set it to \fBorigin/branch\-name\fP, a tag name, or a commit hash. --.sp --Note that the repository is cloned in full each time a build is started, so pointing to a --repository with a large amount of history may take a while to clone and use a significant --amount of disk space. The clone is temporary and is removed once the rpm is created. --.SH EXAMPLE BLUEPRINT --.sp --This example blueprint will install the \fBtmux\fP, \fBgit\fP, and \fBvim\-enhanced\fP --packages. It will set the \fBroot\fP ssh key, add the \fBwidget\fP and \fBadmin\fP --users as well as a \fBstudents\fP group: --.INDENT 0.0 --.INDENT 3.5 --.sp --.nf --.ft C --name = "example\-custom\-base" --description = "A base system with customizations" --version = "0.0.1" -- --[[packages]] --name = "tmux" --version = "*" -- --[[packages]] --name = "git" --version = "*" -- --[[packages]] --name = "vim\-enhanced" --version = "*" -- --[customizations] --hostname = "custombase" -- --[[customizations.sshkey]] --user = "root" --key = "A SSH KEY FOR ROOT" -- --[[customizations.user]] --name = "widget" --description = "Widget process user account" --home = "/srv/widget/" --shell = "/usr/bin/false" --groups = ["dialout", "users"] -- --[[customizations.user]] --name = "admin" --description = "Widget admin account" --password = "$6$CHO2$3rN8eviE2t50lmVyBYihTgVRHcaecmeCk31LeOUleVK/R/aeWVHVZDi26zAH.o0ywBKH9Tc0/wm7sW/q39uyd1" --home = "/srv/widget/" --shell = "/usr/bin/bash" --groups = ["widget", "users", "students"] --uid = 1200 -- --[[customizations.user]] --name = "plain" --password = "simple plain password" -- --[[customizations.user]] --name = "bart" --key = "SSH KEY FOR BART" --groups = ["students"] -- --[[customizations.group]] --name = "widget" -- --[[customizations.group]] --name = "students" --.ft P --.fi --.UNINDENT --.UNINDENT --.SH AUTHOR --Weldr Team --.SH COPYRIGHT --2018, Red Hat, Inc. --.\" Generated by docutils manpage writer. --. --- -2.26.3 - diff --git a/lorax.spec b/lorax.spec index dcc0f30..b9784bc 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 35.1 -Release: 2%{?dist} +Version: 35.2 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,7 +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: 0001-docs-Remove-composer-cli.1.patch BuildRequires: python3-devel BuildRequires: make @@ -136,7 +135,6 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build @@ -177,6 +175,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed May 05 2021 Brian C. Lane 35.2-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) +- docs: Remove composer-cli.1 (bcl@redhat.com) + * Mon Apr 26 2021 Brian C. Lane 35.1-1 - New lorax documentation - 35.1 (bcl@redhat.com) - Makefile: Use podman as a user for testing and docs (bcl@redhat.com) diff --git a/sources b/sources index 736709d..106d4ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.1.tar.gz) = 3081eb8fe4ec2dc5bd6bda0e06a76d832b6cf63cdbbd23f5a79419c1dada68a591150513f5a0c487c9c335349983434be408e78a778e9201dc679dff7a5e7204 +SHA512 (lorax-35.2.tar.gz) = 2eb7d2cdf4e5ae49ba9218c616f5e467c6e7e5867cde149845d4b2e4cc89ff2fb262c59f79c2c2544051d3ccc082db54a1ff58a0dbff472130864770f6c45a0d From 05bf92eca64573cc6198e9d0b437b19de79cf67d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 25 May 2021 09:30:56 -0700 Subject: [PATCH 086/203] - Add a context manager for dracut (bcl@redhat.com) Resolves: rhbz#1962975 - Remove unneeded aajohan-comfortaa-fonts (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 08171d5..143bbb9 100644 --- a/.gitignore +++ b/.gitignore @@ -198,3 +198,4 @@ /lorax-35.0.tar.gz /lorax-35.1.tar.gz /lorax-35.2.tar.gz +/lorax-35.3.tar.gz diff --git a/lorax.spec b/lorax.spec index b9784bc..1db28c2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 35.2 +Version: 35.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue May 25 2021 Brian C. Lane 35.3-1 +- Add a context manager for dracut (bcl@redhat.com) + Resolves: rhbz#1962975 +- Remove unneeded aajohan-comfortaa-fonts (bcl@redhat.com) + * Wed May 05 2021 Brian C. Lane 35.2-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 106d4ba..812c7c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.2.tar.gz) = 2eb7d2cdf4e5ae49ba9218c616f5e467c6e7e5867cde149845d4b2e4cc89ff2fb262c59f79c2c2544051d3ccc082db54a1ff58a0dbff472130864770f6c45a0d +SHA512 (lorax-35.3.tar.gz) = 07f3d6299f76a62b50a594d84db7a5854fc2b4aa3a782ba243134da212890c438c1a7e27e3dd6ab2e7f911f40a4f1e7459e0c297d2ec773e75ba5477318e4068 From 4e0d9bba5658f818268be54ea82b016d9eac66c3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 11:51:30 +0200 Subject: [PATCH 087/203] Rebuilt for Python 3.10 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 1db28c2..b3650d5 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -175,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jun 04 2021 Python Maint - 35.3-2 +- Rebuilt for Python 3.10 + * Tue May 25 2021 Brian C. Lane 35.3-1 - Add a context manager for dracut (bcl@redhat.com) Resolves: rhbz#1962975 From 2742e7ad835c2cea8e4e8118682149871d083380 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 9 Jun 2021 11:43:48 -0400 Subject: [PATCH 088/203] Add patch downstream to remove retired icfg Signed-off-by: Mohan Boddu --- icfg-retire.patch | 25 +++++++++++++++++++++++++ lorax.spec | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 icfg-retire.patch diff --git a/icfg-retire.patch b/icfg-retire.patch new file mode 100644 index 0000000..dddff62 --- /dev/null +++ b/icfg-retire.patch @@ -0,0 +1,25 @@ +From 568462d98313ef6796304d760a620e535f110d77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 9 Jun 2021 09:17:59 +0200 +Subject: [PATCH] Drop retired icfg + +Rawhide compose failed because icfg was retired yesterday: +https://src.fedoraproject.org/rpms/icfg/c/64ef393a109dd468b1b6950bfef70b2c45b5b903?branch=rawhide +https://pagure.io/releng/failed-composes/issue/2557 +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 83ec12835..1aaac0907 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -173,7 +173,7 @@ installpkg python3-pyatspi + installpkg nano nano-default-editor + installpkg vim-minimal strace lsof dump xz less + installpkg wget rsync bind-utils ftp mtr vconfig +-installpkg icfg spice-vdagent ++installpkg spice-vdagent + installpkg gdisk hexedit sg3_utils + + ## actually install all the requested packages diff --git a/lorax.spec b/lorax.spec index b3650d5..bbb5a86 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,6 +14,8 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1153 +Patch0: icfg-retire.patch BuildRequires: python3-devel BuildRequires: make @@ -135,6 +137,7 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build @@ -175,6 +178,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jun 09 2021 Mohan Boddu - 35.3-3 +- Add patch downstream to remove retired icfg + * Fri Jun 04 2021 Python Maint - 35.3-2 - Rebuilt for Python 3.10 From 5ee9410c493b1e4fe476a6eb0d8b8ea2f2daf3b6 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 10 Jun 2021 11:09:05 -0700 Subject: [PATCH 089/203] - livemedia-creator: Check for mkfs.hfsplus (bcl@redhat.com) - Drop retired icfg (zbyszek@in.waw.pl) --- .gitignore | 1 + lorax.spec | 15 +++++---------- sources | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 143bbb9..0641ac2 100644 --- a/.gitignore +++ b/.gitignore @@ -199,3 +199,4 @@ /lorax-35.1.tar.gz /lorax-35.2.tar.gz /lorax-35.3.tar.gz +/lorax-35.4.tar.gz diff --git a/lorax.spec b/lorax.spec index bbb5a86..318f57b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 35.3 -Release: 3%{?dist} +Version: 35.4 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,8 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1153 -Patch0: icfg-retire.patch BuildRequires: python3-devel BuildRequires: make @@ -137,7 +135,6 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build @@ -178,11 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Wed Jun 09 2021 Mohan Boddu - 35.3-3 -- Add patch downstream to remove retired icfg - -* Fri Jun 04 2021 Python Maint - 35.3-2 -- Rebuilt for Python 3.10 +* Thu Jun 10 2021 Brian C. Lane 35.4-1 +- livemedia-creator: Check for mkfs.hfsplus (bcl@redhat.com) +- Drop retired icfg (zbyszek@in.waw.pl) * Tue May 25 2021 Brian C. Lane 35.3-1 - Add a context manager for dracut (bcl@redhat.com) diff --git a/sources b/sources index 812c7c2..f5a1b9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.3.tar.gz) = 07f3d6299f76a62b50a594d84db7a5854fc2b4aa3a782ba243134da212890c438c1a7e27e3dd6ab2e7f911f40a4f1e7459e0c297d2ec773e75ba5477318e4068 +SHA512 (lorax-35.4.tar.gz) = a9824fd944b8cf44ce49da0e29199987580bfa92cd61036c2b26f0b537c1fd7c3114b0b63e716d5c95be0c13017ab49333a98cc8145eb6e234d5ac788c994feb From 6a24f7bd7541f1f58add486faca16b9114775497 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 11 Jun 2021 10:22:12 -0700 Subject: [PATCH 090/203] - pylorax: Fix mksparse ftruncate size handling (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0641ac2..0dd302f 100644 --- a/.gitignore +++ b/.gitignore @@ -200,3 +200,4 @@ /lorax-35.2.tar.gz /lorax-35.3.tar.gz /lorax-35.4.tar.gz +/lorax-35.5.tar.gz diff --git a/lorax.spec b/lorax.spec index 318f57b..92d31d1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 35.4 +Version: 35.5 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 +* Fri Jun 11 2021 Brian C. Lane 35.5-1 +- pylorax: Fix mksparse ftruncate size handling (bcl@redhat.com) + * Thu Jun 10 2021 Brian C. Lane 35.4-1 - livemedia-creator: Check for mkfs.hfsplus (bcl@redhat.com) - Drop retired icfg (zbyszek@in.waw.pl) diff --git a/sources b/sources index f5a1b9c..c1680b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.4.tar.gz) = a9824fd944b8cf44ce49da0e29199987580bfa92cd61036c2b26f0b537c1fd7c3114b0b63e716d5c95be0c13017ab49333a98cc8145eb6e234d5ac788c994feb +SHA512 (lorax-35.5.tar.gz) = 4ab041241503b50daf77691a7f511dc8da07c3cc20200df3a6010762dfa1b5c7750c127a2085d724e26c194bea099f0e92c69dbb888cff3d116bc94599489020 From 7fbe63bcb44b782fbb59649960d415c9cf7881ca Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 25 Jun 2021 12:47:38 -0700 Subject: [PATCH 091/203] Add tests for mkksiso --- tests/scripts/run_tests.sh | 157 ++++++++++++++++++++++++++++++++++++- 1 file changed, 156 insertions(+), 1 deletion(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 9d31c2f..4894eb5 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -1,5 +1,150 @@ #!/bin/bash set -eux + +FAILANY=0 +BOOTISO=/var/tmp/lorax-fedora-iso/images/boot.iso +KSNAME=fedora-minimal.ks +KS="/usr/share/doc/lorax/$KSNAME" +OUTISO=/var/tmp/out.iso +ISODIR=/var/tmp/iso +IMGDIR=/var/tmp/img +## Functions for testing mkkiso + + +function fail { + echo -e "\n\n#### ERROR: $1\n" + FAIL=1 + FAILANY=1 +} + +function status { + if [ "$FAIL" -eq 0 ]; then + echo -e "\n\n#### PASS: $1\n" + else + echo -e "\n\n#### FAIL: $1\n" + fi +} + +function running { + FAIL=0 + echo -e "\n\n#### RUN: $1\n" +} + +[ -e "$ISODIR" ] || mkdir "$ISODIR" +[ -e "$IMGDIR" ] || mkdir "$IMGDIR" + +# Only add kickstart +function ks_only { + running "Add kickstart to iso" + + mkksiso $KS $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_ks + + status "Add kickstart" + umount "$IMGDIR" + umount "$ISODIR" +} + +function test_ks { + ## This all needs to be another function + # Is there a kickstart in / of the iso? + [ -e "$ISODIR/$KSNAME" ] || fail "Missing kickstart" + + # Is the kickstart in the BIOS config? + grep "inst.ks=.*$KSNAME" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" + + # Is the kickstart in the UEFI config? + mount "$ISODIR/images/efiboot.img" "$IMGDIR" || exit 1 + grep "inst.ks=.*$KSNAME" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" +} + +# Add ks and cmdline +function ks_serial { + running "Add kickstart and serial cmdline" + + mkksiso -c "console=ttyS0,115200n8" $KS $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_ks + test_ks_serial + + status "Add kickstart and serial cmdline" + umount "$IMGDIR" + umount "$ISODIR" +} + +function test_ks_serial { + + # Is the serial in the BIOS config? + grep "console=ttyS0,115200n8" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg cmdline entry" + + # Is the serial in the UEFI config? + grep "console=ttyS0,115200n8" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg cmdline entry" +} + +# New VOLID +function new_volid { + running "Use a new VOLID" + + mkksiso -V "mkksiso-test" $KS $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_ks + test_volid + + status "Use a new VOLID" + umount "$IMGDIR" + umount "$ISODIR" +} + +function test_volid { + # Is the VOLID in the BIOS config? + grep "hd:LABEL=mkksiso-test" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" + + # Is the VOLID in the UEFI config? + grep "hd:LABEL=mkksiso-test" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" +} + +# Add extra files +function add_files { + running "Add files" + + mkksiso -a /etc/services $KS $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_ks + test_files + + status "Add files" + umount "$IMGDIR" + umount "$ISODIR" +} + +function test_files { + [ -e "$ISODIR/services" ] || fail "Missing file from iso" +} + +# All of the changes +function run_all { + running "Use all the options" + + mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" $KS $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_ks + test_ks_serial + test_volid + test_files + + status "Use all the options" + umount "$IMGDIR" + umount "$ISODIR" +} + + + # 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 @@ -9,5 +154,15 @@ 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 +running "Build boot.iso with lorax" lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ - $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ + $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 + +# Test mkksiso on the new boot.iso +ks_only +ks_serial +new_volid +add_files +run_all + +exit $FAILANY From 434e3d7e24c25aee7e3fc623be17acdff1e02ece Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 8 Jul 2021 12:04:34 -0700 Subject: [PATCH 092/203] Add downstream patch to fix grub2 fonts location. --- lorax-35.5-grub2-fonts.patch | 40 ++++++++++++++++++++++++++++++++++++ lorax.spec | 8 +++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 lorax-35.5-grub2-fonts.patch diff --git a/lorax-35.5-grub2-fonts.patch b/lorax-35.5-grub2-fonts.patch new file mode 100644 index 0000000..861a05e --- /dev/null +++ b/lorax-35.5-grub2-fonts.patch @@ -0,0 +1,40 @@ +diff --color -Nur lorax-35.5.orig/share/templates.d/99-generic/efi.tmpl lorax-35.5/share/templates.d/99-generic/efi.tmpl +--- lorax-35.5.orig/share/templates.d/99-generic/efi.tmpl 2021-06-11 10:19:38.000000000 -0700 ++++ lorax-35.5/share/templates.d/99-generic/efi.tmpl 2021-07-08 11:43:37.539689458 -0700 +@@ -6,7 +6,6 @@ + %> + + mkdir ${EFIBOOTDIR} +-mkdir ${EFIBOOTDIR}/fonts/ + %if efiarch64: + install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI + install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ +@@ -17,7 +16,7 @@ + install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ + install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi + %endif +-install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ ++install boot/grub2/fonts/unicode.pf2 grub2/fonts/unicode.pf2 + + ## actually make the EFI images + ${make_efiboot("images/efiboot.img")} +diff --color -Nur lorax-35.5.orig/share/templates.d/99-generic/live/efi.tmpl lorax-35.5/share/templates.d/99-generic/live/efi.tmpl +--- lorax-35.5.orig/share/templates.d/99-generic/live/efi.tmpl 2021-06-11 10:19:38.000000000 -0700 ++++ lorax-35.5/share/templates.d/99-generic/live/efi.tmpl 2021-07-08 11:43:07.788631007 -0700 +@@ -6,7 +6,6 @@ + %> + + mkdir ${EFIBOOTDIR} +-mkdir ${EFIBOOTDIR}/fonts/ + %if efiarch64: + install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI + install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ +@@ -17,7 +16,7 @@ + install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ + install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi + %endif +-install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ ++install boot/grub2/fonts/unicode.pf2 grub2/fonts/ + + ## actually make the EFI images + ${make_efiboot("images/efiboot.img")} diff --git a/lorax.spec b/lorax.spec index 92d31d1..2ec8c4d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.5 -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 +Patch1: lorax-35.5-grub2-fonts.patch BuildRequires: python3-devel BuildRequires: make @@ -136,6 +137,8 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +%patch1 -p1 + %build %install @@ -175,6 +178,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 08 2021 Kevin Fenzi - 35.5-2 +- Add downstream patch to fix grub2 fonts location. + * Fri Jun 11 2021 Brian C. Lane 35.5-1 - pylorax: Fix mksparse ftruncate size handling (bcl@redhat.com) From b50361af2164e3f1ee9cda7be758eca3a0506b3b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 8 Jul 2021 16:16:37 -0700 Subject: [PATCH 093/203] - Install unicode.pf2 from new directory (bcl@redhat.com) - Makefile: Use sudo to fix ownership of docs (bcl@redhat.com) - Makefile: Make sure container is built before docs (bcl@redhat.com) - Makefile: Add local-srpm target to create a .src.rpm from HEAD (bcl@redhat.com) - mkksiso: cmdline should default to empty string (bcl@redhat.com) - runtime-install: Remove gfs2-utils (bcl@redhat.com) - mount.py: Fix docstring (jkucera@redhat.com) --- .gitignore | 1 + lorax-35.5-grub2-fonts.patch | 40 ------------------------------------ lorax.spec | 17 ++++++++------- sources | 2 +- 4 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 lorax-35.5-grub2-fonts.patch diff --git a/.gitignore b/.gitignore index 0dd302f..1cb4f18 100644 --- a/.gitignore +++ b/.gitignore @@ -201,3 +201,4 @@ /lorax-35.3.tar.gz /lorax-35.4.tar.gz /lorax-35.5.tar.gz +/lorax-35.6.tar.gz diff --git a/lorax-35.5-grub2-fonts.patch b/lorax-35.5-grub2-fonts.patch deleted file mode 100644 index 861a05e..0000000 --- a/lorax-35.5-grub2-fonts.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --color -Nur lorax-35.5.orig/share/templates.d/99-generic/efi.tmpl lorax-35.5/share/templates.d/99-generic/efi.tmpl ---- lorax-35.5.orig/share/templates.d/99-generic/efi.tmpl 2021-06-11 10:19:38.000000000 -0700 -+++ lorax-35.5/share/templates.d/99-generic/efi.tmpl 2021-07-08 11:43:37.539689458 -0700 -@@ -6,7 +6,6 @@ - %> - - mkdir ${EFIBOOTDIR} --mkdir ${EFIBOOTDIR}/fonts/ - %if efiarch64: - install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI - install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ -@@ -17,7 +16,7 @@ - install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ - install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi - %endif --install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ -+install boot/grub2/fonts/unicode.pf2 grub2/fonts/unicode.pf2 - - ## actually make the EFI images - ${make_efiboot("images/efiboot.img")} -diff --color -Nur lorax-35.5.orig/share/templates.d/99-generic/live/efi.tmpl lorax-35.5/share/templates.d/99-generic/live/efi.tmpl ---- lorax-35.5.orig/share/templates.d/99-generic/live/efi.tmpl 2021-06-11 10:19:38.000000000 -0700 -+++ lorax-35.5/share/templates.d/99-generic/live/efi.tmpl 2021-07-08 11:43:07.788631007 -0700 -@@ -6,7 +6,6 @@ - %> - - mkdir ${EFIBOOTDIR} --mkdir ${EFIBOOTDIR}/fonts/ - %if efiarch64: - install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI - install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ -@@ -17,7 +16,7 @@ - install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ - install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi - %endif --install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ -+install boot/grub2/fonts/unicode.pf2 grub2/fonts/ - - ## actually make the EFI images - ${make_efiboot("images/efiboot.img")} diff --git a/lorax.spec b/lorax.spec index 2ec8c4d..1f5de8b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 35.5 -Release: 2%{?dist} +Version: 35.6 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,7 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -Patch1: lorax-35.5-grub2-fonts.patch BuildRequires: python3-devel BuildRequires: make @@ -137,8 +136,6 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} -%patch1 -p1 - %build %install @@ -178,8 +175,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 08 2021 Kevin Fenzi - 35.5-2 -- Add downstream patch to fix grub2 fonts location. +* Thu Jul 08 2021 Brian C. Lane 35.6-1 +- Install unicode.pf2 from new directory (bcl@redhat.com) +- Makefile: Use sudo to fix ownership of docs (bcl@redhat.com) +- Makefile: Make sure container is built before docs (bcl@redhat.com) +- Makefile: Add local-srpm target to create a .src.rpm from HEAD (bcl@redhat.com) +- mkksiso: cmdline should default to empty string (bcl@redhat.com) +- runtime-install: Remove gfs2-utils (bcl@redhat.com) +- mount.py: Fix docstring (jkucera@redhat.com) * Fri Jun 11 2021 Brian C. Lane 35.5-1 - pylorax: Fix mksparse ftruncate size handling (bcl@redhat.com) diff --git a/sources b/sources index c1680b8..31e773d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.5.tar.gz) = 4ab041241503b50daf77691a7f511dc8da07c3cc20200df3a6010762dfa1b5c7750c127a2085d724e26c194bea099f0e92c69dbb888cff3d116bc94599489020 +SHA512 (lorax-35.6.tar.gz) = a2d3fe8585b24d896972436b9d74ea7cdcfdbb6d4d6abd5398e1fd6752bd59039fe2bc552cff5dd02e7675a6700410b954492139e9537c3d25bc6877e05b7ac6 From 5d32f01d3d5accb5ec3c7af012ddead3dfcf7458 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:10:17 +0000 Subject: [PATCH 094/203] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 1f5de8b..5fcff56 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -175,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 35.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 08 2021 Brian C. Lane 35.6-1 - Install unicode.pf2 from new directory (bcl@redhat.com) - Makefile: Use sudo to fix ownership of docs (bcl@redhat.com) From 3f58dab4dd582693c6bc2449304d261e7d33e46f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 7 Sep 2021 15:20:31 -0700 Subject: [PATCH 095/203] - templates: Remove memtest86+ (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1cb4f18..0303f4d 100644 --- a/.gitignore +++ b/.gitignore @@ -202,3 +202,4 @@ /lorax-35.4.tar.gz /lorax-35.5.tar.gz /lorax-35.6.tar.gz +/lorax-35.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 5fcff56..0d80600 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 35.6 -Release: 2%{?dist} +Version: 35.7 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -175,8 +175,8 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 22 2021 Fedora Release Engineering - 35.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Tue Sep 07 2021 Brian C. Lane 35.7-1 +- templates: Remove memtest86+ (bcl@redhat.com) * Thu Jul 08 2021 Brian C. Lane 35.6-1 - Install unicode.pf2 from new directory (bcl@redhat.com) diff --git a/sources b/sources index 31e773d..b9bc57f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.6.tar.gz) = a2d3fe8585b24d896972436b9d74ea7cdcfdbb6d4d6abd5398e1fd6752bd59039fe2bc552cff5dd02e7675a6700410b954492139e9537c3d25bc6877e05b7ac6 +SHA512 (lorax-35.7.tar.gz) = 21ee1fb8bf2228aa802ae13244955a7b1c14f655ed5d9ef40caee0f3ae9085c2b327e611518a60c57e4ea9ee85f1579242804dfc49a5e53cf60fa586dee38530 From 8af49866e4824bd4b096044f44ff9e3d6618c3c6 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 8 Oct 2021 15:33:06 -0700 Subject: [PATCH 096/203] Backport PR #1175 to reduce size of netinsts (#2009730, #2009731) --- ...drop-some-Qualcomm-smartphone-firmwa.patch | 29 +++++++++++++ ...drop-Marvell-Prestera-firmware-files.patch | 28 +++++++++++++ ...exclude-liquidio-and-netronome-firmw.patch | 41 +++++++++++++++++++ lorax.spec | 14 ++++++- 4 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch create mode 100644 0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch create mode 100644 0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch diff --git a/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch b/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch new file mode 100644 index 0000000..43052d6 --- /dev/null +++ b/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch @@ -0,0 +1,29 @@ +From a70fcd5ea015580f83e9470fa65d7e5a657243f4 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 6 Oct 2021 14:19:47 -0700 +Subject: [PATCH 1/3] runtime-cleanup: drop some Qualcomm smartphone firmwares + +These firmwares are for Qualcomm smartphone chipsets (SM845 and +SM8250). Don't think they're any use in network install images. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 37c45338..5960c82b 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -231,6 +231,8 @@ removefrom linux-firmware /usr/lib/firmware/intel/IntcSST2.bin + removefrom linux-firmware /usr/lib/firmware/intel/fw_sst* + removefrom linux-firmware /usr/lib/firmware/intel/dsp* + removefrom linux-firmware /usr/lib/firmware/as102* ++removefrom linux-firmware /usr/lib/firmware/qcom/sdm845/* ++removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* + removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* + removefrom linux-firmware /usr/lib/firmware/meson/vdec/* + removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* +-- +2.32.0 + diff --git a/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch b/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch new file mode 100644 index 0000000..e0e27bf --- /dev/null +++ b/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch @@ -0,0 +1,28 @@ +From 8f4a66bf53acc4beae9530361de96fdbb81b44f9 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 6 Oct 2021 14:21:34 -0700 +Subject: [PATCH 2/3] runtime-cleanup: drop Marvell Prestera firmware files + +These add up to 26MB and they are for high-end switches, unlikely +targets for network installs. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 5960c82b..827465f0 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -236,6 +236,7 @@ removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* + removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* + removefrom linux-firmware /usr/lib/firmware/meson/vdec/* + removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* ++removefrom linux-firmware /usr/lib/firmware/mrvl/prestera/* + %if basearch != "aarch64": + removefrom linux-firmware /usr/lib/firmware/dpaa2/* + %endif +-- +2.32.0 + diff --git a/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch b/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch new file mode 100644 index 0000000..327cbd2 --- /dev/null +++ b/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch @@ -0,0 +1,41 @@ +From 8514ce1ceb9b31cc5b0ab7d00951b70e9c237609 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 6 Oct 2021 14:43:21 -0700 +Subject: [PATCH 3/3] runtime-install: exclude liquidio and netronome firmwares + +As Peter Robinson explains here: +https://bugzilla.redhat.com/show_bug.cgi?id=2011615#c3 +these are not useful, as the devices they're for do not support +netinst-style deployment. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 4aabe292..fddac051 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -17,12 +17,16 @@ installpkg grubby + %if basearch != "s390x": + ## skip the firmware for sound, video, and scanners, none of which will + ## do much good for the installer. Also skip uhd-firmware which is not +- ## even a kernel firmware package. ++ ## even a kernel firmware package. liquidio and netronome firmwares are ++ ## for enterprise switch devices, netinst deployment does not work on ++ ## these so there is no point shipping them - see ++ ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 + installpkg --optional *-firmware --except alsa* --except midisport-firmware \ + --except crystalhd-firmware --except ivtv-firmware \ + --except cx18-firmware --except iscan-firmware \ + --except uhd-firmware --except lulzbot-marlin-firmware \ +- --except gnome-firmware --except sigrok-firmware ++ --except gnome-firmware --except sigrok-firmware \ ++ --except liquidio-firmware --except netronome-firmware + installpkg b43-openfwwf + %endif + +-- +2.32.0 + diff --git a/lorax.spec b/lorax.spec index 0d80600..60c4f10 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 35.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,6 +14,13 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Trim some unneeded firmware files to reduce size of netinsts +# https://bugzilla.redhat.com/show_bug.cgi?id=2009730 +# https://bugzilla.redhat.com/show_bug.cgi?id=2009731 +# https://github.com/weldr/lorax/pull/1175 +Patch0: 0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch +Patch1: 0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch +Patch2: 0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch BuildRequires: python3-devel BuildRequires: make @@ -134,7 +141,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build @@ -175,6 +182,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Oct 08 2021 Adam Williamson - 35.7-2 +- Backport PR #1175 to reduce size of netinsts (#2009730, #2009731) + * Tue Sep 07 2021 Brian C. Lane 35.7-1 - templates: Remove memtest86+ (bcl@redhat.com) From 9eed18b5672b3d32213a064af06f913a4b912dde Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 11 Oct 2021 15:46:54 -0700 Subject: [PATCH 097/203] - New lorax documentation - 36.0 (bcl@redhat.com) - docs: Remove logging command from examples (bcl@redhat.com) - runtime-install: exclude liquidio and netronome firmwares (awilliam@redhat.com) - runtime-cleanup: drop Marvell Prestera firmware files (awilliam@redhat.com) - runtime-cleanup: drop some Qualcomm smartphone firmwares (awilliam@redhat.com) - Fix pylint warnings about string formatting (bcl@redhat.com) - tests: Ignore new pylint warnings (bcl@redhat.com) - Add fstrim to disk and filesystem image creation (bcl@redhat.com) --- .gitignore | 1 + ...drop-some-Qualcomm-smartphone-firmwa.patch | 29 ------------- ...drop-Marvell-Prestera-firmware-files.patch | 28 ------------- ...exclude-liquidio-and-netronome-firmw.patch | 41 ------------------- lorax.spec | 24 +++++------ sources | 2 +- 6 files changed, 14 insertions(+), 111 deletions(-) delete mode 100644 0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch delete mode 100644 0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch delete mode 100644 0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch diff --git a/.gitignore b/.gitignore index 0303f4d..8780d0c 100644 --- a/.gitignore +++ b/.gitignore @@ -203,3 +203,4 @@ /lorax-35.5.tar.gz /lorax-35.6.tar.gz /lorax-35.7.tar.gz +/lorax-36.0.tar.gz diff --git a/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch b/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch deleted file mode 100644 index 43052d6..0000000 --- a/0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a70fcd5ea015580f83e9470fa65d7e5a657243f4 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:19:47 -0700 -Subject: [PATCH 1/3] runtime-cleanup: drop some Qualcomm smartphone firmwares - -These firmwares are for Qualcomm smartphone chipsets (SM845 and -SM8250). Don't think they're any use in network install images. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 37c45338..5960c82b 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -231,6 +231,8 @@ removefrom linux-firmware /usr/lib/firmware/intel/IntcSST2.bin - removefrom linux-firmware /usr/lib/firmware/intel/fw_sst* - removefrom linux-firmware /usr/lib/firmware/intel/dsp* - removefrom linux-firmware /usr/lib/firmware/as102* -+removefrom linux-firmware /usr/lib/firmware/qcom/sdm845/* -+removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* - removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* - removefrom linux-firmware /usr/lib/firmware/meson/vdec/* - removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* --- -2.32.0 - diff --git a/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch b/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch deleted file mode 100644 index e0e27bf..0000000 --- a/0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8f4a66bf53acc4beae9530361de96fdbb81b44f9 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:21:34 -0700 -Subject: [PATCH 2/3] runtime-cleanup: drop Marvell Prestera firmware files - -These add up to 26MB and they are for high-end switches, unlikely -targets for network installs. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 5960c82b..827465f0 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -236,6 +236,7 @@ removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* - removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* - removefrom linux-firmware /usr/lib/firmware/meson/vdec/* - removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* -+removefrom linux-firmware /usr/lib/firmware/mrvl/prestera/* - %if basearch != "aarch64": - removefrom linux-firmware /usr/lib/firmware/dpaa2/* - %endif --- -2.32.0 - diff --git a/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch b/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch deleted file mode 100644 index 327cbd2..0000000 --- a/0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8514ce1ceb9b31cc5b0ab7d00951b70e9c237609 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 6 Oct 2021 14:43:21 -0700 -Subject: [PATCH 3/3] runtime-install: exclude liquidio and netronome firmwares - -As Peter Robinson explains here: -https://bugzilla.redhat.com/show_bug.cgi?id=2011615#c3 -these are not useful, as the devices they're for do not support -netinst-style deployment. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 4aabe292..fddac051 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -17,12 +17,16 @@ installpkg grubby - %if basearch != "s390x": - ## skip the firmware for sound, video, and scanners, none of which will - ## do much good for the installer. Also skip uhd-firmware which is not -- ## even a kernel firmware package. -+ ## even a kernel firmware package. liquidio and netronome firmwares are -+ ## for enterprise switch devices, netinst deployment does not work on -+ ## these so there is no point shipping them - see -+ ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 - installpkg --optional *-firmware --except alsa* --except midisport-firmware \ - --except crystalhd-firmware --except ivtv-firmware \ - --except cx18-firmware --except iscan-firmware \ - --except uhd-firmware --except lulzbot-marlin-firmware \ -- --except gnome-firmware --except sigrok-firmware -+ --except gnome-firmware --except sigrok-firmware \ -+ --except liquidio-firmware --except netronome-firmware - installpkg b43-openfwwf - %endif - --- -2.32.0 - diff --git a/lorax.spec b/lorax.spec index 60c4f10..58c3fcb 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 35.7 -Release: 2%{?dist} +Version: 36.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,13 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Trim some unneeded firmware files to reduce size of netinsts -# https://bugzilla.redhat.com/show_bug.cgi?id=2009730 -# https://bugzilla.redhat.com/show_bug.cgi?id=2009731 -# https://github.com/weldr/lorax/pull/1175 -Patch0: 0001-runtime-cleanup-drop-some-Qualcomm-smartphone-firmwa.patch -Patch1: 0002-runtime-cleanup-drop-Marvell-Prestera-firmware-files.patch -Patch2: 0003-runtime-install-exclude-liquidio-and-netronome-firmw.patch BuildRequires: python3-devel BuildRequires: make @@ -141,7 +134,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%autosetup -p1 -n %{name}-%{version} +%setup -q -n %{name}-%{version} %build @@ -182,8 +175,15 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Oct 08 2021 Adam Williamson - 35.7-2 -- Backport PR #1175 to reduce size of netinsts (#2009730, #2009731) +* Mon Oct 11 2021 Brian C. Lane 36.0-1 +- New lorax documentation - 36.0 (bcl@redhat.com) +- docs: Remove logging command from examples (bcl@redhat.com) +- runtime-install: exclude liquidio and netronome firmwares (awilliam@redhat.com) +- runtime-cleanup: drop Marvell Prestera firmware files (awilliam@redhat.com) +- runtime-cleanup: drop some Qualcomm smartphone firmwares (awilliam@redhat.com) +- Fix pylint warnings about string formatting (bcl@redhat.com) +- tests: Ignore new pylint warnings (bcl@redhat.com) +- Add fstrim to disk and filesystem image creation (bcl@redhat.com) * Tue Sep 07 2021 Brian C. Lane 35.7-1 - templates: Remove memtest86+ (bcl@redhat.com) diff --git a/sources b/sources index b9bc57f..a31122f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-35.7.tar.gz) = 21ee1fb8bf2228aa802ae13244955a7b1c14f655ed5d9ef40caee0f3ae9085c2b327e611518a60c57e4ea9ee85f1579242804dfc49a5e53cf60fa586dee38530 +SHA512 (lorax-36.0.tar.gz) = a43a68523769adeb029ab874ae95aa23ae066801b92e9b4e2c3fbecb76fbe48b56b1c643cd3db3089f766e20b540f0d8818bcb959770376f495a3693f7a42a36 From fe817d06d864c518f1ce97cb26721163388b63aa Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 28 Oct 2021 14:31:25 -0700 Subject: [PATCH 098/203] - dnfbase: Handle defaults better (bcl@redhat.com) - ltmpl: Add version compare support to installpkg (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8780d0c..79efb37 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,4 @@ /lorax-35.6.tar.gz /lorax-35.7.tar.gz /lorax-36.0.tar.gz +/lorax-36.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 58c3fcb..ad4d1e9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.0 +Version: 36.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Oct 28 2021 Brian C. Lane 36.1-1 +- dnfbase: Handle defaults better (bcl@redhat.com) +- ltmpl: Add version compare support to installpkg (bcl@redhat.com) + * Mon Oct 11 2021 Brian C. Lane 36.0-1 - New lorax documentation - 36.0 (bcl@redhat.com) - docs: Remove logging command from examples (bcl@redhat.com) diff --git a/sources b/sources index a31122f..e18de65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.0.tar.gz) = a43a68523769adeb029ab874ae95aa23ae066801b92e9b4e2c3fbecb76fbe48b56b1c643cd3db3089f766e20b540f0d8818bcb959770376f495a3693f7a42a36 +SHA512 (lorax-36.1.tar.gz) = 4ccb514ac867ff1d52d3458c5a21561ddafe79a9b5c7d536911e500114ec4ee363798d8e720a11e45ff78d1b640797bf7b723ffc3251e4def93c1fce5f9b970f From a3bb519e918490aa1aa2b9473f73bebdd5285894 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 10 Nov 2021 15:46:29 -0800 Subject: [PATCH 099/203] - Remove memtest86+ from example kickstarts (bcl@redhat.com) - fedora-livemedia: Update example kickstart (bcl@redhat.com) - mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) - Move default releasever into pylorax DEFAULT_RELEASEVER (bcl@redhat.com) - runtime-postinstall: Drop raidstart/stop stub code (bcl@redhat.com) - runtime-install: Fix grub2 epoch, it is 1 not 0 (bcl@redhat.com) - Update runtime-install/cleanup for Marvell Prestera fw split (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79efb37..5e9746f 100644 --- a/.gitignore +++ b/.gitignore @@ -205,3 +205,4 @@ /lorax-35.7.tar.gz /lorax-36.0.tar.gz /lorax-36.1.tar.gz +/lorax-36.2.tar.gz diff --git a/lorax.spec b/lorax.spec index ad4d1e9..3826300 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.1 +Version: 36.2 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,15 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Nov 10 2021 Brian C. Lane 36.2-1 +- Remove memtest86+ from example kickstarts (bcl@redhat.com) +- fedora-livemedia: Update example kickstart (bcl@redhat.com) +- mount: Switch to using pycdio instead of pycdlib (bcl@redhat.com) +- Move default releasever into pylorax DEFAULT_RELEASEVER (bcl@redhat.com) +- runtime-postinstall: Drop raidstart/stop stub code (bcl@redhat.com) +- runtime-install: Fix grub2 epoch, it is 1 not 0 (bcl@redhat.com) +- Update runtime-install/cleanup for Marvell Prestera fw split (awilliam@redhat.com) + * Thu Oct 28 2021 Brian C. Lane 36.1-1 - dnfbase: Handle defaults better (bcl@redhat.com) - ltmpl: Add version compare support to installpkg (bcl@redhat.com) diff --git a/sources b/sources index e18de65..206f94c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.1.tar.gz) = 4ccb514ac867ff1d52d3458c5a21561ddafe79a9b5c7d536911e500114ec4ee363798d8e720a11e45ff78d1b640797bf7b723ffc3251e4def93c1fce5f9b970f +SHA512 (lorax-36.2.tar.gz) = 8f71f8001513c3da834bbfbc3bd71865754b175b3565d4dd1fb286fb5dbad1d0d6fb0590fe79f46fa3e257288f772d68c772947f0a92302eb36c6a151568b1c2 From 32ec53c728f77cf2fd1a68acb4c37abdea6c1a24 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 11 Nov 2021 10:18:50 -0800 Subject: [PATCH 100/203] gating: Use lazy unmount --- tests/scripts/run_tests.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 4894eb5..8cd29e9 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -30,6 +30,12 @@ function running { echo -e "\n\n#### RUN: $1\n" } +# unmount the dirs lazily because sometimes some outside thing is still touching them +function umount_dirs { + umount --lazy "$IMGDIR" + umount --lazy "$ISODIR" +} + [ -e "$ISODIR" ] || mkdir "$ISODIR" [ -e "$IMGDIR" ] || mkdir "$IMGDIR" @@ -43,8 +49,7 @@ function ks_only { test_ks status "Add kickstart" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_ks { @@ -71,8 +76,7 @@ function ks_serial { test_ks_serial status "Add kickstart and serial cmdline" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_ks_serial { @@ -95,8 +99,7 @@ function new_volid { test_volid status "Use a new VOLID" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_volid { @@ -118,8 +121,7 @@ function add_files { test_files status "Add files" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } function test_files { @@ -139,8 +141,7 @@ function run_all { test_files status "Use all the options" - umount "$IMGDIR" - umount "$ISODIR" + umount_dirs } From e09af460262c20817023e72ca542402440fb32fe Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 9 Dec 2021 09:59:21 -0800 Subject: [PATCH 101/203] - mkksiso: Check the length of the filenames (bcl@redhat.com) - mkksiso: Check the iso's arch against the host's (bcl@redhat.com) - mkksiso: Add missing implantisomd5 tool requirements (bcl@redhat.com) - mkksiso: Raise error if no volume id is found (bcl@redhat.com) - mount: Add s390x support to IsoMountopoint (bcl@redhat.com) - mkksiso: Skip mkefiboot for non-UEFI isos (bcl@redhat.com) - mkksiso: Add -joliet-long (bcl@redhat.com) - mkksiso: Return 1 on errors (bcl@redhat.com) - Fix monitor problem with split UTF8 characters (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 13 ++++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5e9746f..fd16523 100644 --- a/.gitignore +++ b/.gitignore @@ -206,3 +206,4 @@ /lorax-36.0.tar.gz /lorax-36.1.tar.gz /lorax-36.2.tar.gz +/lorax-36.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 3826300..7fe8694 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.2 +Version: 36.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,17 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Dec 09 2021 Brian C. Lane 36.3-1 +- mkksiso: Check the length of the filenames (bcl@redhat.com) +- mkksiso: Check the iso's arch against the host's (bcl@redhat.com) +- mkksiso: Add missing implantisomd5 tool requirements (bcl@redhat.com) +- mkksiso: Raise error if no volume id is found (bcl@redhat.com) +- mount: Add s390x support to IsoMountopoint (bcl@redhat.com) +- mkksiso: Skip mkefiboot for non-UEFI isos (bcl@redhat.com) +- mkksiso: Add -joliet-long (bcl@redhat.com) +- mkksiso: Return 1 on errors (bcl@redhat.com) +- Fix monitor problem with split UTF8 characters (bcl@redhat.com) + * Wed Nov 10 2021 Brian C. Lane 36.2-1 - Remove memtest86+ from example kickstarts (bcl@redhat.com) - fedora-livemedia: Update example kickstart (bcl@redhat.com) diff --git a/sources b/sources index 206f94c..d584e42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.2.tar.gz) = 8f71f8001513c3da834bbfbc3bd71865754b175b3565d4dd1fb286fb5dbad1d0d6fb0590fe79f46fa3e257288f772d68c772947f0a92302eb36c6a151568b1c2 +SHA512 (lorax-36.3.tar.gz) = aab93d4fbc2b1df201af1c1e2a6ea390805c3830c682cbe9c3b95603fc8686baddcdf9a3e23e42dbec690ea07b5832f84ebf8648b63432dfe74ae8c6803358c5 From 02601e51fa4ae0741700d87ec923368d40707953 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Dec 2021 13:39:56 -0800 Subject: [PATCH 102/203] - cleanup: remove binaries from lilv (awilliam@redhat.com) - runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) - New lorax documentation - 36.3 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fd16523..36e2d46 100644 --- a/.gitignore +++ b/.gitignore @@ -207,3 +207,4 @@ /lorax-36.1.tar.gz /lorax-36.2.tar.gz /lorax-36.3.tar.gz +/lorax-36.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 7fe8694..66e8790 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.3 +Version: 36.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -175,6 +175,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 14 2021 Brian C. Lane 36.4-1 +- cleanup: remove binaries from lilv (awilliam@redhat.com) +- runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) +- New lorax documentation - 36.3 (bcl@redhat.com) + * Thu Dec 09 2021 Brian C. Lane 36.3-1 - mkksiso: Check the length of the filenames (bcl@redhat.com) - mkksiso: Check the iso's arch against the host's (bcl@redhat.com) diff --git a/sources b/sources index d584e42..88660d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.3.tar.gz) = aab93d4fbc2b1df201af1c1e2a6ea390805c3830c682cbe9c3b95603fc8686baddcdf9a3e23e42dbec690ea07b5832f84ebf8648b63432dfe74ae8c6803358c5 +SHA512 (lorax-36.4.tar.gz) = a0ca273d82498b2f568524b1d563f1a54b4211c8081e47068376b9e1bfe08520ea4aa299461a602c13aea14f88b2b923676cfdfec23f32b8d3f49f56530c0828 From c4f3b640ee5589ca2afa2e41fd36a7c230c6687d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:05:52 +0000 Subject: [PATCH 103/203] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 66e8790..4aee482 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 36.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -175,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 36.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Brian C. Lane 36.4-1 - cleanup: remove binaries from lilv (awilliam@redhat.com) - runtime-cleanup: remove pipewire-related packages (awilliam@redhat.com) From 5bf63051fc283be38b36966a3d540b80816628a4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 3 Feb 2022 14:12:38 -0800 Subject: [PATCH 104/203] Switch to using tmt testing instead of STI --- {tests/.fmf => .fmf}/version | 0 plans/build-iso.fmf | 7 +++++++ tests/provision.fmf | 5 ----- tests/tests.yml | 15 --------------- 4 files changed, 7 insertions(+), 20 deletions(-) rename {tests/.fmf => .fmf}/version (100%) create mode 100644 plans/build-iso.fmf delete mode 100644 tests/provision.fmf delete mode 100644 tests/tests.yml diff --git a/tests/.fmf/version b/.fmf/version similarity index 100% rename from tests/.fmf/version rename to .fmf/version diff --git a/plans/build-iso.fmf b/plans/build-iso.fmf new file mode 100644 index 0000000..ae03eff --- /dev/null +++ b/plans/build-iso.fmf @@ -0,0 +1,7 @@ +summary: Run Lorax tests (build an iso, run mkksiso on it) +prepare: + how: install + package: + - lorax +execute: + script: ./tests/scripts/run_tests.sh diff --git a/tests/provision.fmf b/tests/provision.fmf deleted file mode 100644 index dd69f34..0000000 --- a/tests/provision.fmf +++ /dev/null @@ -1,5 +0,0 @@ ---- - -standard-inventory-qcow2: - qemu: - m: 4G diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d39d256..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# 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 64b74a534384a89ecff85f079a8c4efe5482b338 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 3 Feb 2022 16:11:20 -0800 Subject: [PATCH 105/203] - switch to tmt testing instead of STI - drop unused patch incorporated upstream last year - mkksiso: Improve debug message about unsupported arch (bcl@redhat.com) - mkksiso: Fix the order of the ppc mkisofs command (bcl@redhat.com) - mkksiso: mkfsiso argument order matters (bcl@redhat.com) - mkksiso: Add kickstart to s390x cdboot.prm (bcl@redhat.com) - cleanup: handle RPM database move to /usr (awilliam@redhat.com) - Install the variable font of the Cantarell font (akira@tagoh.org) - Update the template for f36 Change proposal: https://fedoraproject.org/wiki/Changes/DefaultToNotoFonts (akira@tagoh.org) - Update Malayalam font to its new renamed package name rit-meera-new-fonts (pnemade@fedoraproject.org) - Enable sftp when using inst.sshd (bcl@redhat.com) - Add inst.rngd cmdline option (bcl@redhat.com) - docs: Update docs for image-minimizer (bcl@redhat.com) - tests: Add tests for image-minimizer (bcl@redhat.com) - image-minimizer: Check for missing root directory (bcl@redhat.com) - image-minimizer: Fix utf8 error and add docs (bcl@redhat.com) --- .gitignore | 1 + icfg-retire.patch | 25 ------------------------- lorax.spec | 23 +++++++++++++++++++---- sources | 2 +- 4 files changed, 21 insertions(+), 30 deletions(-) delete mode 100644 icfg-retire.patch diff --git a/.gitignore b/.gitignore index 36e2d46..afb1822 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,4 @@ /lorax-36.2.tar.gz /lorax-36.3.tar.gz /lorax-36.4.tar.gz +/lorax-36.5.tar.gz diff --git a/icfg-retire.patch b/icfg-retire.patch deleted file mode 100644 index dddff62..0000000 --- a/icfg-retire.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 568462d98313ef6796304d760a620e535f110d77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 9 Jun 2021 09:17:59 +0200 -Subject: [PATCH] Drop retired icfg - -Rawhide compose failed because icfg was retired yesterday: -https://src.fedoraproject.org/rpms/icfg/c/64ef393a109dd468b1b6950bfef70b2c45b5b903?branch=rawhide -https://pagure.io/releng/failed-composes/issue/2557 ---- - share/templates.d/99-generic/runtime-install.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 83ec12835..1aaac0907 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -173,7 +173,7 @@ installpkg python3-pyatspi - installpkg nano nano-default-editor - installpkg vim-minimal strace lsof dump xz less - installpkg wget rsync bind-utils ftp mtr vconfig --installpkg icfg spice-vdagent -+installpkg spice-vdagent - installpkg gdisk hexedit sg3_utils - - ## actually install all the requested packages diff --git a/lorax.spec b/lorax.spec index 4aee482..569626b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 36.4 -Release: 2%{?dist} +Version: 36.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -161,6 +161,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/lorax.1* %{_mandir}/man1/livemedia-creator.1* %{_mandir}/man1/mkksiso.1* +%{_mandir}/man1/image-minimizer.1* %{_tmpfilesdir}/lorax.conf %files docs @@ -175,8 +176,22 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 36.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Thu Feb 03 2022 Brian C. Lane 36.5-1 +- mkksiso: Improve debug message about unsupported arch (bcl@redhat.com) +- mkksiso: Fix the order of the ppc mkisofs command (bcl@redhat.com) +- mkksiso: mkfsiso argument order matters (bcl@redhat.com) +- mkksiso: Add kickstart to s390x cdboot.prm (bcl@redhat.com) +- cleanup: handle RPM database move to /usr (awilliam@redhat.com) +- Install the variable font of the Cantarell font (akira@tagoh.org) +- Update the template for f36 Change proposal: + https://fedoraproject.org/wiki/Changes/DefaultToNotoFonts (akira@tagoh.org) +- Update Malayalam font to its new renamed package name rit-meera-new-fonts (pnemade@fedoraproject.org) +- Enable sftp when using inst.sshd (bcl@redhat.com) +- Add inst.rngd cmdline option (bcl@redhat.com) +- docs: Update docs for image-minimizer (bcl@redhat.com) +- tests: Add tests for image-minimizer (bcl@redhat.com) +- image-minimizer: Check for missing root directory (bcl@redhat.com) +- image-minimizer: Fix utf8 error and add docs (bcl@redhat.com) * Tue Dec 14 2021 Brian C. Lane 36.4-1 - cleanup: remove binaries from lilv (awilliam@redhat.com) diff --git a/sources b/sources index 88660d7..fbeace6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.4.tar.gz) = a0ca273d82498b2f568524b1d563f1a54b4211c8081e47068376b9e1bfe08520ea4aa299461a602c13aea14f88b2b923676cfdfec23f32b8d3f49f56530c0828 +SHA512 (lorax-36.5.tar.gz) = faefa1ff167e7b947b543d22735b93ab9167aa0ff0223108855c855405cee4219e6e3c5fa7b914081ac69d905e29554531485f559876fa3795573e5b3c6473e1 From 485bb63b9bbc19bea7a91ae3aaeff74ba78ff63e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 4 Feb 2022 08:44:41 -0800 Subject: [PATCH 106/203] - mkksiso: Fix check for unsupported arch error (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index afb1822..4813766 100644 --- a/.gitignore +++ b/.gitignore @@ -209,3 +209,4 @@ /lorax-36.3.tar.gz /lorax-36.4.tar.gz /lorax-36.5.tar.gz +/lorax-36.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 569626b..04ffb45 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.5 +Version: 36.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Feb 04 2022 Brian C. Lane 36.6-1 +- mkksiso: Fix check for unsupported arch error (bcl@redhat.com) + * Thu Feb 03 2022 Brian C. Lane 36.5-1 - mkksiso: Improve debug message about unsupported arch (bcl@redhat.com) - mkksiso: Fix the order of the ppc mkisofs command (bcl@redhat.com) diff --git a/sources b/sources index fbeace6..e98fcbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.5.tar.gz) = faefa1ff167e7b947b543d22735b93ab9167aa0ff0223108855c855405cee4219e6e3c5fa7b914081ac69d905e29554531485f559876fa3795573e5b3c6473e1 +SHA512 (lorax-36.6.tar.gz) = 5d0b9f88ff0870579ce94e4e7f670a0d02c76a63d132dcb0a937c72a83f2bc09e826dd02ce2ce097f37e0fa2160a54c5516e851748d907f32aa2b57756ffcb50 From dd1cf78be58fe258972604cf323ce0a3cb96a197 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 14 Feb 2022 14:58:41 -0800 Subject: [PATCH 107/203] - postinstall: Restore reproducible build timestamps on /usr/share/fonts (bcl@redhat.com) - tests: Fix the image minimizer test dnf usage (bcl@redhat.com) - runtime-cleanup: drop kernel drivers/iio (awilliam@redhat.com) - runtime-cleanup: drop gallium-pipe drivers from mesa-dri-drivers (awilliam@redhat.com) - runtime-cleanup: drop yelp's local MathJax library copy (awilliam@redhat.com) - runtime-cleanup: drop eapol_test from wpa_supplicant (awilliam@redhat.com) - runtime-cleanup: drop /usr/bin/cyrusbdb2current (awilliam@redhat.com) - runtime-cleanup: drop systemd-analyze (awilliam@redhat.com) - runtime-cleanup: drop mtools and glibc-gconv-extra (awilliam@redhat.com) - runtime-cleanup: drop guile22's ccache (awilliam@redhat.com) - runtime-cleanup: fix warnings from old or changed packages (awilliam@redhat.com) - runtime-cleanup: drop Italic from google-noto-sans-vf-fonts (awilliam@redhat.com) - runtime-install: drop some unnecessary font packages (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4813766..463974f 100644 --- a/.gitignore +++ b/.gitignore @@ -210,3 +210,4 @@ /lorax-36.4.tar.gz /lorax-36.5.tar.gz /lorax-36.6.tar.gz +/lorax-36.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 04ffb45..ffeb925 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.6 +Version: 36.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,21 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Feb 14 2022 Brian C. Lane 36.7-1 +- postinstall: Restore reproducible build timestamps on /usr/share/fonts (bcl@redhat.com) +- tests: Fix the image minimizer test dnf usage (bcl@redhat.com) +- runtime-cleanup: drop kernel drivers/iio (awilliam@redhat.com) +- runtime-cleanup: drop gallium-pipe drivers from mesa-dri-drivers (awilliam@redhat.com) +- runtime-cleanup: drop yelp's local MathJax library copy (awilliam@redhat.com) +- runtime-cleanup: drop eapol_test from wpa_supplicant (awilliam@redhat.com) +- runtime-cleanup: drop /usr/bin/cyrusbdb2current (awilliam@redhat.com) +- runtime-cleanup: drop systemd-analyze (awilliam@redhat.com) +- runtime-cleanup: drop mtools and glibc-gconv-extra (awilliam@redhat.com) +- runtime-cleanup: drop guile22's ccache (awilliam@redhat.com) +- runtime-cleanup: fix warnings from old or changed packages (awilliam@redhat.com) +- runtime-cleanup: drop Italic from google-noto-sans-vf-fonts (awilliam@redhat.com) +- runtime-install: drop some unnecessary font packages (awilliam@redhat.com) + * Fri Feb 04 2022 Brian C. Lane 36.6-1 - mkksiso: Fix check for unsupported arch error (bcl@redhat.com) diff --git a/sources b/sources index e98fcbe..90108f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.6.tar.gz) = 5d0b9f88ff0870579ce94e4e7f670a0d02c76a63d132dcb0a937c72a83f2bc09e826dd02ce2ce097f37e0fa2160a54c5516e851748d907f32aa2b57756ffcb50 +SHA512 (lorax-36.7.tar.gz) = 940935f9ea33050686561beb2e9aa3fd60769665f08c00534082314d9cfb9c653700146b14ae8bcbf407658948f58a0851485edfe8b3ba9f03143ab71fb4d655 From 0348f377e25169c87cd9d9df72877b44746e9a71 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 16 Feb 2022 12:01:51 -0800 Subject: [PATCH 108/203] - runtime-cleanup: Remove ncurses package (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 463974f..9116702 100644 --- a/.gitignore +++ b/.gitignore @@ -211,3 +211,4 @@ /lorax-36.5.tar.gz /lorax-36.6.tar.gz /lorax-36.7.tar.gz +/lorax-36.8.tar.gz diff --git a/lorax.spec b/lorax.spec index ffeb925..45b2e86 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.7 +Version: 36.8 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Feb 16 2022 Brian C. Lane 36.8-1 +- runtime-cleanup: Remove ncurses package (bcl@redhat.com) + * Mon Feb 14 2022 Brian C. Lane 36.7-1 - postinstall: Restore reproducible build timestamps on /usr/share/fonts (bcl@redhat.com) - tests: Fix the image minimizer test dnf usage (bcl@redhat.com) diff --git a/sources b/sources index 90108f7..143c114 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.7.tar.gz) = 940935f9ea33050686561beb2e9aa3fd60769665f08c00534082314d9cfb9c653700146b14ae8bcbf407658948f58a0851485edfe8b3ba9f03143ab71fb4d655 +SHA512 (lorax-36.8.tar.gz) = c1a800a9abd43c0bce47233faa7eb95bb8fe4ac226a325e61257f711bdcd2274d448d89a006c9cfaf67a3c67fdc67375923471740ed102f7954f7f1ffb89007c From 1bb7d2d70c6a84b10e13913cdd9d52640a19e3bd Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Feb 2022 14:36:44 -0800 Subject: [PATCH 109/203] - Don't move the restart-anaconda file (vponcova@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9116702..3387c37 100644 --- a/.gitignore +++ b/.gitignore @@ -212,3 +212,4 @@ /lorax-36.6.tar.gz /lorax-36.7.tar.gz /lorax-36.8.tar.gz +/lorax-36.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 45b2e86..6f93390 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.8 +Version: 36.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Feb 28 2022 Brian C. Lane 36.9-1 +- Don't move the restart-anaconda file (vponcova@redhat.com) + * Wed Feb 16 2022 Brian C. Lane 36.8-1 - runtime-cleanup: Remove ncurses package (bcl@redhat.com) diff --git a/sources b/sources index 143c114..8036d08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.8.tar.gz) = c1a800a9abd43c0bce47233faa7eb95bb8fe4ac226a325e61257f711bdcd2274d448d89a006c9cfaf67a3c67fdc67375923471740ed102f7954f7f1ffb89007c +SHA512 (lorax-36.9.tar.gz) = 5bcfc55e984e96daf2d181ec746732280c9090bfb1095b9e797b2ae0a226520fdc2cfb88b0a22a788a70a7f178b18458ae292f751421dd73b8e073a95e66d58a From 683ca95f17969acf108666004f83629170cfb29c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Mar 2022 11:57:10 -0700 Subject: [PATCH 110/203] - New lorax documentation - 37.0 (bcl@redhat.com) - runtime-cleanup: keep 'unshare' binary present from util-linux-core (kkoukiou@redhat.com) --- .gitignore | 1 + lorax.spec | 70 ++++-------------------------------------------------- sources | 2 +- 3 files changed, 7 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 3387c37..f60e860 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,4 @@ /lorax-36.7.tar.gz /lorax-36.8.tar.gz /lorax-36.9.tar.gz +/lorax-37.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 6f93390..ab3c8f6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 36.9 +Version: 37.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -176,6 +176,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Mar 28 2022 Brian C. Lane 37.0-1 +- New lorax documentation - 37.0 (bcl@redhat.com) +- runtime-cleanup: keep 'unshare' binary present from util-linux-core (kkoukiou@redhat.com) + * Mon Feb 28 2022 Brian C. Lane 36.9-1 - Don't move the restart-anaconda file (vponcova@redhat.com) @@ -312,67 +316,3 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - Makefile: Add test-in-podman and docs-in-podman build targets (bcl@redhat.com) - isolinux.cfg: Rename the 'vesa' menu entry to 'basic' (bcl@redhat.com) - composer-cli: Add support for start-ostree --url URL (bcl@redhat.com) - -* Mon Feb 15 2021 Brian C. Lane 34.9-1 -- Use inst.rescue to trigger rescue mode (awilliam@redhat.com) - Resolves: rhbz#1928318 -* Mon Feb 08 2021 Brian C. Lane 34.8-1 -- Use image dependencies metapackage (vslavik@redhat.com) -- tests: Include the fedora-updates repo when testing boot.iso building (bcl@redhat.com) - -* Wed Jan 20 2021 Brian C. Lane 34.7-1 -- live/x86.tmpl: Copy livecd-iso-to-disk script, if installed (david.ward@ll.mit.edu) -- templates: Copy license files from the correct path (david.ward@ll.mit.edu) -- test: Fix vm.install for non-LVM cloud images (martin@piware.de) - -* Wed Dec 16 2020 Brian C. Lane 34.6-1 -- Remove LD_PRELOAD libgomp.so.1 from lmc --no-virt (bcl@redhat.com) -- Add POSTIN scriptlet error to the log monitor list (bcl@redhat.com) -- Improve lmc no-virt error handling (bcl@redhat.com) -- lorax.spec: Drop GConf2 requirement (bcl@redhat.com) - -* Mon Nov 30 2020 Brian C. Lane 34.5-1 -- Don't remove libldap_r libraries during runtime-cleanup.tmpl (spichugi@redhat.com) -- Do not use '--loglevel' option when running Anaconda (vtrefny@redhat.com) -- Makefile: quiet rsync use in testing (bcl@redhat.com) -- Switch to using GitHub Actions instead of Travis CI (bcl@redhat.com) - -* Mon Nov 02 2020 Brian C. Lane 34.4-1 -- Update the default release version to 34 (bcl@redhat.com) -- Remove mdmonitor service from boot.iso (bcl@redhat.com) -- Switch to using upstream mk-s390image for s390 cdboot.img creation (bcl@redhat.com) -- sshd_config: Apply suggested changes (bcl@redhat.com) -- lorax.spec: Add BuildRequires on systemd-rpm-macros for tmpfilesdir macro (bcl@redhat.com) - -* Wed Oct 07 2020 Brian C. Lane 34.3-1 -- composer: Fix open file warnings (bcl@redhat.com) -- ltmpl: Fix deprecated escape in docstring (bcl@redhat.com) -- tests: Fix open file warning in test_execWithRedirect (bcl@redhat.com) -- Cleanup imgutil open files and processes (bcl@redhat.com) -- tests: Remove test_del_execReadlines (bcl@redhat.com) -- Fix unclosed files (bcl@redhat.com) -- test: Use Python dev mode during testing (bcl@redhat.com) -- tests: Update composer-cli blueprint server tests (bcl@redhat.com) -- runtime-cleanup: Delete .pyc files (bcl@redhat.com) -- New lorax documentation - 34.3 (bcl@redhat.com) -- doc: Add Blueprint documentation and example to composer-cli.rst (bcl@redhat.com) -- docs: Update docs for lorax-composer removal (bcl@redhat.com) -- tests: Remove unused lorax-composer tests (bcl@redhat.com) -- Remove lorax-composer, it has been replaced by osbuild-composer (bcl@redhat.com) - -* Tue Sep 29 2020 Brian C. Lane 34.2-1 -- runtime-cleanup: Remove ncurses package (bcl@redhat.com) - -* Mon Sep 14 2020 Brian C. Lane 34.1-1 -- Fix broken single-item tuples in a few places (awilliam@redhat.com) -- Drop dpaa2 firmware on non-aarch64 arches (awilliam@redhat.com) -- Drop firmware for Mellanox Spectrum (awilliam@redhat.com) -- runtime-cleanup: big refresh of stale things (awilliam@redhat.com) - -* Tue Sep 08 2020 Brian C. Lane 34.0-1 -- New lorax documentation - 34.0 (bcl@redhat.com) -- runtime-cleanup: strip a bunch of unnecessary firmwares (awilliam@redhat.com) -- runtime-install: specify polkit-gnome to avoid lxpolkit and GTK2 (awilliam@redhat.com) -- runtime-install: exclude gnome-firmware and sigrok-firmware (awilliam@redhat.com) -- runtime-cleanup: Drop video playback acceleration drivers (awilliam@redhat.com) -- runtime-install: don't install notification-daemon (awilliam@redhat.com) diff --git a/sources b/sources index 8036d08..369f7e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-36.9.tar.gz) = 5bcfc55e984e96daf2d181ec746732280c9090bfb1095b9e797b2ae0a226520fdc2cfb88b0a22a788a70a7f178b18458ae292f751421dd73b8e073a95e66d58a +SHA512 (lorax-37.0.tar.gz) = cc2ae4bb84c2fdfc056b2dc96b6e0948014c092b419821c9bf159fdd5b92fe908009614d42a54a1b5b9dfd3e9ab605df0861386735363b7e4bbd3598f78e8938 From 52072bb3c5cda600f6f6148acc59577a996feb40 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 11 May 2022 12:08:00 -0700 Subject: [PATCH 111/203] tests: Update run_tests.sh for new mkksiso --- tests/scripts/run_tests.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 8cd29e9..0cd66f5 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -7,7 +7,6 @@ KSNAME=fedora-minimal.ks KS="/usr/share/doc/lorax/$KSNAME" OUTISO=/var/tmp/out.iso ISODIR=/var/tmp/iso -IMGDIR=/var/tmp/img ## Functions for testing mkkiso @@ -32,12 +31,11 @@ function running { # unmount the dirs lazily because sometimes some outside thing is still touching them function umount_dirs { - umount --lazy "$IMGDIR" umount --lazy "$ISODIR" + rm -f "$OUTISO" } [ -e "$ISODIR" ] || mkdir "$ISODIR" -[ -e "$IMGDIR" ] || mkdir "$IMGDIR" # Only add kickstart function ks_only { @@ -61,8 +59,7 @@ function test_ks { grep "inst.ks=.*$KSNAME" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" # Is the kickstart in the UEFI config? - mount "$ISODIR/images/efiboot.img" "$IMGDIR" || exit 1 - grep "inst.ks=.*$KSNAME" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" + grep "inst.ks=.*$KSNAME" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" } # Add ks and cmdline @@ -85,7 +82,7 @@ function test_ks_serial { grep "console=ttyS0,115200n8" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg cmdline entry" # Is the serial in the UEFI config? - grep "console=ttyS0,115200n8" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg cmdline entry" + grep "console=ttyS0,115200n8" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg cmdline entry" } # New VOLID @@ -107,7 +104,7 @@ function test_volid { grep "hd:LABEL=mkksiso-test" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" # Is the VOLID in the UEFI config? - grep "hd:LABEL=mkksiso-test" "$IMGDIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" + grep "hd:LABEL=mkksiso-test" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" } # Add extra files @@ -155,9 +152,11 @@ 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 -running "Build boot.iso with lorax" -lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ - $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 +if [ ! -e "$BOOTISO" ]; then + running "Build boot.iso with lorax" + lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ + $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 +fi # Test mkksiso on the new boot.iso ks_only From 1869e05bd2144620b9e86c3e8fcac27b72e5cb53 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 11 May 2022 12:11:59 -0700 Subject: [PATCH 112/203] - New lorax documentation - 37.1 (bcl@redhat.com) - docs: Update the mkksiso documentation (bcl@redhat.com) - setup.py: Install mkksiso to /usr/bin (bcl@redhat.com) - pylorax: Move variable out of try block (bcl@redhat.com) - setup.py: Use setup from setuptools not distutils (bcl@redhat.com) - Makefile: Remove -it options for test-in-podman (bcl@redhat.com) - mkksiso: Rewrite to use xorriso features (bcl@redhat.com) - docs: Fix typo in index.html (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f60e860..739638a 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,4 @@ /lorax-36.8.tar.gz /lorax-36.9.tar.gz /lorax-37.0.tar.gz +/lorax-37.1.tar.gz diff --git a/lorax.spec b/lorax.spec index ab3c8f6..36d97ce 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.0 +Version: 37.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -16,6 +16,7 @@ URL: https://github.com/weldr/lorax Source0: %{name}-%{version}.tar.gz BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros @@ -153,7 +154,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_sbindir}/lorax %{_sbindir}/mkefiboot %{_sbindir}/livemedia-creator -%{_sbindir}/mkksiso +%{_bindir}/mkksiso %{_bindir}/image-minimizer %dir %{_sysconfdir}/lorax %config(noreplace) %{_sysconfdir}/lorax/lorax.conf @@ -176,6 +177,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed May 11 2022 Brian C. Lane 37.1-1 +- New lorax documentation - 37.1 (bcl@redhat.com) +- docs: Update the mkksiso documentation (bcl@redhat.com) +- setup.py: Install mkksiso to /usr/bin (bcl@redhat.com) +- pylorax: Move variable out of try block (bcl@redhat.com) +- setup.py: Use setup from setuptools not distutils (bcl@redhat.com) +- Makefile: Remove -it options for test-in-podman (bcl@redhat.com) +- mkksiso: Rewrite to use xorriso features (bcl@redhat.com) +- docs: Fix typo in index.html (bcl@redhat.com) + * Mon Mar 28 2022 Brian C. Lane 37.0-1 - New lorax documentation - 37.0 (bcl@redhat.com) - runtime-cleanup: keep 'unshare' binary present from util-linux-core (kkoukiou@redhat.com) diff --git a/sources b/sources index 369f7e0..e2edd0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.0.tar.gz) = cc2ae4bb84c2fdfc056b2dc96b6e0948014c092b419821c9bf159fdd5b92fe908009614d42a54a1b5b9dfd3e9ab605df0861386735363b7e4bbd3598f78e8938 +SHA512 (lorax-37.1.tar.gz) = f2fb20119e0b580a311b8d06d93d2f91e640dd66080674ed76b8d97611d2d51f47d100519486b13f70460bdc7968c7c6c8b0e5241ff48ab1bb8c2080bd23b9f7 From 7d701ad6539320ece725528f00200192dcb9d095 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 23 May 2022 11:24:31 -0700 Subject: [PATCH 113/203] - cleanup: drop phanfw.bin from linux-firmware (awilliam@redhat.com) - cleanup: strip more mellanox firmware files (awilliam@redhat.com) - cleanup: strip qcom/vpu* from linux-firmware (awilliam@redhat.com) - cleanup: drop qcom/apq8096 firmwares (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 739638a..462ef9a 100644 --- a/.gitignore +++ b/.gitignore @@ -215,3 +215,4 @@ /lorax-36.9.tar.gz /lorax-37.0.tar.gz /lorax-37.1.tar.gz +/lorax-37.2.tar.gz diff --git a/lorax.spec b/lorax.spec index 36d97ce..9839332 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.1 +Version: 37.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -177,6 +177,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon May 23 2022 Brian C. Lane 37.2-1 +- cleanup: drop phanfw.bin from linux-firmware (awilliam@redhat.com) +- cleanup: strip more mellanox firmware files (awilliam@redhat.com) +- cleanup: strip qcom/vpu* from linux-firmware (awilliam@redhat.com) +- cleanup: drop qcom/apq8096 firmwares (awilliam@redhat.com) + * Wed May 11 2022 Brian C. Lane 37.1-1 - New lorax documentation - 37.1 (bcl@redhat.com) - docs: Update the mkksiso documentation (bcl@redhat.com) diff --git a/sources b/sources index e2edd0f..413c05e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.1.tar.gz) = f2fb20119e0b580a311b8d06d93d2f91e640dd66080674ed76b8d97611d2d51f47d100519486b13f70460bdc7968c7c6c8b0e5241ff48ab1bb8c2080bd23b9f7 +SHA512 (lorax-37.2.tar.gz) = 18b6048bb7aedbcdd3ba60f920c632bb0f9fcd8e0ca0fdada24564f343531de611bf60eb1689435a198de88cc252b2263366e80e3f5f68faeffd6b7dc2d45d0e From fef70dbfd2060119de0ef370d272ff4d2da56363 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 1 Jun 2022 11:48:11 -0700 Subject: [PATCH 114/203] - Add grub2 BIOS boot support to live iso template (bcl@redhat.com) Resolves: rhbz#2092065 - Drop grafting variables (bcl@redhat.com) - Drop macboot.img and simplify efiboot.img use (bcl@redhat.com) - Add grub2 BIOS boot support (bcl@redhat.com) - Remove syslinux support (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 462ef9a..da339d4 100644 --- a/.gitignore +++ b/.gitignore @@ -216,3 +216,4 @@ /lorax-37.0.tar.gz /lorax-37.1.tar.gz /lorax-37.2.tar.gz +/lorax-37.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 9839332..e005764 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.2 +Version: 37.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -177,6 +177,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jun 01 2022 Brian C. Lane 37.3-1 +- Add grub2 BIOS boot support to live iso template (bcl@redhat.com) + Resolves: rhbz#2092065 +- Drop grafting variables (bcl@redhat.com) +- Drop macboot.img and simplify efiboot.img use (bcl@redhat.com) +- Add grub2 BIOS boot support (bcl@redhat.com) +- Remove syslinux support (bcl@redhat.com) + * Mon May 23 2022 Brian C. Lane 37.2-1 - cleanup: drop phanfw.bin from linux-firmware (awilliam@redhat.com) - cleanup: strip more mellanox firmware files (awilliam@redhat.com) diff --git a/sources b/sources index 413c05e..f8b6db7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.2.tar.gz) = 18b6048bb7aedbcdd3ba60f920c632bb0f9fcd8e0ca0fdada24564f343531de611bf60eb1689435a198de88cc252b2263366e80e3f5f68faeffd6b7dc2d45d0e +SHA512 (lorax-37.3.tar.gz) = 22b4b4bfe7f2dc802907491230b91de35d29edec6d9307a176d88825a46cc2266f0646d93b2c4492f4753c5292a156df44d0855cf8f35d2fb378b590c9155f66 From dcb51c3647e385e4899de604f784ed1bc233b869 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 1 Jun 2022 16:20:10 -0700 Subject: [PATCH 115/203] tests: Update tests for grub2 bios boot (cherry picked from commit ee85df30b44c98837e9f0ae2b5d4ee1e1c86f4a9) --- tests/scripts/run_tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 0cd66f5..5b62988 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -55,8 +55,8 @@ function test_ks { # Is there a kickstart in / of the iso? [ -e "$ISODIR/$KSNAME" ] || fail "Missing kickstart" - # Is the kickstart in the BIOS config? - grep "inst.ks=.*$KSNAME" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" + # Is the kickstart in the GRUB2 BIOS config? + grep "inst.ks=.*$KSNAME" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg kickstart entry" # Is the kickstart in the UEFI config? grep "inst.ks=.*$KSNAME" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" @@ -79,7 +79,7 @@ function ks_serial { function test_ks_serial { # Is the serial in the BIOS config? - grep "console=ttyS0,115200n8" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg cmdline entry" + grep "console=ttyS0,115200n8" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg cmdline entry" # Is the serial in the UEFI config? grep "console=ttyS0,115200n8" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg cmdline entry" @@ -101,7 +101,7 @@ function new_volid { function test_volid { # Is the VOLID in the BIOS config? - grep "hd:LABEL=mkksiso-test" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry" + grep "hd:LABEL=mkksiso-test" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg kickstart entry" # Is the VOLID in the UEFI config? grep "hd:LABEL=mkksiso-test" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry" From 0d56ec6bff65bc243ff3c937fb3922dfa5e79b6a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 1 Jun 2022 16:24:31 -0700 Subject: [PATCH 116/203] - mkksiso: Fix grub2 editing error (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index da339d4..ff872dc 100644 --- a/.gitignore +++ b/.gitignore @@ -217,3 +217,4 @@ /lorax-37.1.tar.gz /lorax-37.2.tar.gz /lorax-37.3.tar.gz +/lorax-37.4.tar.gz diff --git a/lorax.spec b/lorax.spec index e005764..25577a9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.3 +Version: 37.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -177,6 +177,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jun 01 2022 Brian C. Lane 37.4-1 +- mkksiso: Fix grub2 editing error (bcl@redhat.com) + * Wed Jun 01 2022 Brian C. Lane 37.3-1 - Add grub2 BIOS boot support to live iso template (bcl@redhat.com) Resolves: rhbz#2092065 diff --git a/sources b/sources index f8b6db7..9a2eccd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.3.tar.gz) = 22b4b4bfe7f2dc802907491230b91de35d29edec6d9307a176d88825a46cc2266f0646d93b2c4492f4753c5292a156df44d0855cf8f35d2fb378b590c9155f66 +SHA512 (lorax-37.4.tar.gz) = d0623bfb85f0c45d65442a7c3a8ca894de43fcd989a3d6530af46776800753a32cf8dc5cca9947f3fad50228fb4b3e4059d6d3487559be8007d6c8be079e224e From a1d5d0afdd2b9c93f0a9cfa69ff10f28966a687e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 3 Jun 2022 12:51:20 -0700 Subject: [PATCH 117/203] - example ks: Drop syslinux and add grub2-tools package for livemedia (bcl@redhat.com) - templates: Set @ISOLABEL@ in the bios-grub.cfg file to the isolabel (bcl@redhat.com) - Update spec for syslinux->grub2 switch (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ff872dc..92253d2 100644 --- a/.gitignore +++ b/.gitignore @@ -218,3 +218,4 @@ /lorax-37.2.tar.gz /lorax-37.3.tar.gz /lorax-37.4.tar.gz +/lorax-37.5.tar.gz diff --git a/lorax.spec b/lorax.spec index 25577a9..56a41eb 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.4 +Version: 37.5 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -61,12 +61,7 @@ Requires: hfsplus-tools %endif %endif -%ifarch %{ix86} x86_64 -Requires: syslinux >= 6.03-1 -Requires: syslinux-nonlinux >= 6.03-1 -%endif - -%ifarch ppc64le +%ifarch %{ix86} x86_64 ppc64le Requires: grub2 Requires: grub2-tools %endif @@ -177,6 +172,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jun 03 2022 Brian C. Lane 37.5-1 +- example ks: Drop syslinux and add grub2-tools package for livemedia (bcl@redhat.com) +- templates: Set @ISOLABEL@ in the bios-grub.cfg file to the isolabel (bcl@redhat.com) +- Update spec for syslinux->grub2 switch (awilliam@redhat.com) + * Wed Jun 01 2022 Brian C. Lane 37.4-1 - mkksiso: Fix grub2 editing error (bcl@redhat.com) diff --git a/sources b/sources index 9a2eccd..6d66077 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.4.tar.gz) = d0623bfb85f0c45d65442a7c3a8ca894de43fcd989a3d6530af46776800753a32cf8dc5cca9947f3fad50228fb4b3e4059d6d3487559be8007d6c8be079e224e +SHA512 (lorax-37.5.tar.gz) = 0545c2434058b4cfa984fe04788ac7f4130cd2f7174171b7936ddc9c3cb0beb6cafa720ffb864fae6635d30063675a8fac3eba191e4274b188e0c6d5a7e62cff From bb692f7caea7a29122a976cd833931bc494e0abc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:51:14 +0200 Subject: [PATCH 118/203] Rebuilt for Python 3.11 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 56a41eb..50ca705 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 37.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -172,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Jun 13 2022 Python Maint - 37.5-2 +- Rebuilt for Python 3.11 + * Fri Jun 03 2022 Brian C. Lane 37.5-1 - example ks: Drop syslinux and add grub2-tools package for livemedia (bcl@redhat.com) - templates: Set @ISOLABEL@ in the bios-grub.cfg file to the isolabel (bcl@redhat.com) From 0dc57a017e49825dd867dbc6e5b141cd758037ca Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 26 May 2022 14:51:22 -0700 Subject: [PATCH 119/203] tests: Update for new mkksiso changes Requires using --ks to pass the kickstart. Adds tests for only adding cmdline parameters, and for removing existing ones. --- tests/scripts/run_tests.sh | 54 ++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 5b62988..0be981b 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -41,7 +41,7 @@ function umount_dirs { function ks_only { running "Add kickstart to iso" - mkksiso $KS $BOOTISO $OUTISO || exit 1 + mkksiso --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -66,17 +66,30 @@ function test_ks { function ks_serial { running "Add kickstart and serial cmdline" - mkksiso -c "console=ttyS0,115200n8" $KS $BOOTISO $OUTISO || exit 1 + mkksiso -c "console=ttyS0,115200n8" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks - test_ks_serial + test_serial status "Add kickstart and serial cmdline" umount_dirs } -function test_ks_serial { +# Only add serial console to cmdline +function only_serial { + running "Add serial cmdline (no ks)" + + mkksiso -c "console=ttyS0,115200n8" $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_serial + + status "Add kickstart and serial cmdline" + umount_dirs +} + +function test_serial { # Is the serial in the BIOS config? grep "console=ttyS0,115200n8" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg cmdline entry" @@ -89,7 +102,7 @@ function test_ks_serial { function new_volid { running "Use a new VOLID" - mkksiso -V "mkksiso-test" $KS $BOOTISO $OUTISO || exit 1 + mkksiso -V "mkksiso-test" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -111,7 +124,7 @@ function test_volid { function add_files { running "Add files" - mkksiso -a /etc/services $KS $BOOTISO $OUTISO || exit 1 + mkksiso -a /etc/services --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -121,6 +134,28 @@ function add_files { umount_dirs } +# Remove quiet from the cmdline +function remove_quiet { + running "remove quiet from cmdline (no ks)" + + mkksiso --rm "quiet" $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_quiet + + status "Remove quiet from cmdline" + umount_dirs +} + +function test_quiet { + # Is quiet in the BIOS config? + ! grep "append.*quiet" "$ISODIR/boot/grub2/grub.cfg" || fail "quiet not removed from BIOS grub.cfg cmdline entry" + + # Is quiet in the UEFI config? + ! grep "linux.*quiet" "$ISODIR/EFI/BOOT/grub.cfg" || fail "quiet not removed from UEFI grub.cfg cmdline entry" +} + + function test_files { [ -e "$ISODIR/services" ] || fail "Missing file from iso" } @@ -129,13 +164,14 @@ function test_files { function run_all { running "Use all the options" - mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" $KS $BOOTISO $OUTISO || exit 1 + mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks - test_ks_serial + test_serial test_volid test_files + test_quiet status "Use all the options" umount_dirs @@ -161,8 +197,10 @@ fi # Test mkksiso on the new boot.iso ks_only ks_serial +only_serial new_volid add_files +remove_quiet run_all exit $FAILANY From 45a8c066609ed0dda1f65a9a1f0fa3a139205e1a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 28 Jun 2022 16:53:21 -0700 Subject: [PATCH 120/203] - tests: Use Fedora 36 for test-in-podman (bcl@redhat.com) - Add include for architecture specific packages to example kickstarts (bcl@redhat.com) - templates: adjust for mellanox firmware split to subpackage (awilliam@redhat.com) - mkksiso: Fix s390x support (bcl@redhat.com) - spec: Don't require grub2 on x86-32 (bcl@redhat.com) - mkksiso: Remove use of os.path.join (bcl@redhat.com) - Makefile: Add mkksiso and image-minimizer to coverage report (bcl@redhat.com) - tests: Add tests for mkksiso (bcl@redhat.com) - mkksiso: Add kernel cmdline customization support (bcl@redhat.com) - mkksiso: Move kickstart to --ks KICKSTART (bcl@redhat.com) - mkksiso: Add helper functions for kernel cmdline modifications (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 20 +++++++++++++++----- sources | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 92253d2..202cbcf 100644 --- a/.gitignore +++ b/.gitignore @@ -219,3 +219,4 @@ /lorax-37.3.tar.gz /lorax-37.4.tar.gz /lorax-37.5.tar.gz +/lorax-37.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 50ca705..783ab19 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 37.5 -Release: 2%{?dist} +Version: 37.6 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -61,7 +61,7 @@ Requires: hfsplus-tools %endif %endif -%ifarch %{ix86} x86_64 ppc64le +%ifarch x86_64 ppc64le Requires: grub2 Requires: grub2-tools %endif @@ -172,8 +172,18 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Mon Jun 13 2022 Python Maint - 37.5-2 -- Rebuilt for Python 3.11 +* Tue Jun 28 2022 Brian C. Lane 37.6-1 +- tests: Use Fedora 36 for test-in-podman (bcl@redhat.com) +- Add include for architecture specific packages to example kickstarts (bcl@redhat.com) +- templates: adjust for mellanox firmware split to subpackage (awilliam@redhat.com) +- mkksiso: Fix s390x support (bcl@redhat.com) +- spec: Don't require grub2 on x86-32 (bcl@redhat.com) +- mkksiso: Remove use of os.path.join (bcl@redhat.com) +- Makefile: Add mkksiso and image-minimizer to coverage report (bcl@redhat.com) +- tests: Add tests for mkksiso (bcl@redhat.com) +- mkksiso: Add kernel cmdline customization support (bcl@redhat.com) +- mkksiso: Move kickstart to --ks KICKSTART (bcl@redhat.com) +- mkksiso: Add helper functions for kernel cmdline modifications (bcl@redhat.com) * Fri Jun 03 2022 Brian C. Lane 37.5-1 - example ks: Drop syslinux and add grub2-tools package for livemedia (bcl@redhat.com) diff --git a/sources b/sources index 6d66077..6d1b3b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.5.tar.gz) = 0545c2434058b4cfa984fe04788ac7f4130cd2f7174171b7936ddc9c3cb0beb6cafa720ffb864fae6635d30063675a8fac3eba191e4274b188e0c6d5a7e62cff +SHA512 (lorax-37.6.tar.gz) = b7b34c01d33065e3221ca038c41a52dd5592d71cb613637d81cc4c7f8b2808d067d1d7ab273fb46271411ad8de1baff868adbaf799510c0fcc39c1dd7aa022fc From 6f034f08b726401eaa9687d3a1e433eeb781dddd Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 13 Jul 2022 15:23:16 -0700 Subject: [PATCH 121/203] tests: Add a test to run mkksiso as a user Make sure that running mkksiso as a user works with the boot.iso. Note that this won't catch problems with other isos with different permissions, like the dvd. --- tests/scripts/run_tests.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 0be981b..ea1e625 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -177,6 +177,24 @@ function run_all { umount_dirs } +# All of the changes as a user (lorax-ted) +function run_as_user { + running "Use all the options as a user" + + [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted + su - lorax-ted -c "mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_ks + test_serial + test_volid + test_files + test_quiet + + status "Use all the options as a user" + umount_dirs +} + # Gather up the list of system repo files and use them for lorax @@ -202,5 +220,6 @@ new_volid add_files remove_quiet run_all +run_as_user exit $FAILANY From 4689fced5d695c0439bf51f16552b0f895a6feb5 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 13 Jul 2022 15:24:51 -0700 Subject: [PATCH 122/203] - mkksiso: Set u+rw permission on extracted files and directories (bcl@redhat.com) - Add option to boot local drive to the x86 BIOS grub2 menu (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 202cbcf..e9fa447 100644 --- a/.gitignore +++ b/.gitignore @@ -220,3 +220,4 @@ /lorax-37.4.tar.gz /lorax-37.5.tar.gz /lorax-37.6.tar.gz +/lorax-37.7.tar.gz diff --git a/lorax.spec b/lorax.spec index 783ab19..d32bd67 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.6 +Version: 37.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -172,6 +172,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jul 13 2022 Brian C. Lane 37.7-1 +- mkksiso: Set u+rw permission on extracted files and directories (bcl@redhat.com) +- Add option to boot local drive to the x86 BIOS grub2 menu (bcl@redhat.com) + * Tue Jun 28 2022 Brian C. Lane 37.6-1 - tests: Use Fedora 36 for test-in-podman (bcl@redhat.com) - Add include for architecture specific packages to example kickstarts (bcl@redhat.com) diff --git a/sources b/sources index 6d1b3b7..161fd22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.6.tar.gz) = b7b34c01d33065e3221ca038c41a52dd5592d71cb613637d81cc4c7f8b2808d067d1d7ab273fb46271411ad8de1baff868adbaf799510c0fcc39c1dd7aa022fc +SHA512 (lorax-37.7.tar.gz) = 23a4a56bc83e160b3a00dde23a9c590329db2732a23928938444b8a9c1c191dee9e1c9a6bf5166dceb9a0386e341e6dee484e4222f365f7a89746ee65f35791e From 131e3892a16a638160a584ef2744865599c44640 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:53:14 +0000 Subject: [PATCH 123/203] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index d32bd67..43869d1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 37.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -172,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 37.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 13 2022 Brian C. Lane 37.7-1 - mkksiso: Set u+rw permission on extracted files and directories (bcl@redhat.com) - Add option to boot local drive to the x86 BIOS grub2 menu (bcl@redhat.com) From 76539177e1a3bcfade02d55c94fbb18a4a119258 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 25 Jul 2022 10:39:21 -0700 Subject: [PATCH 124/203] tests: Add test for positional kickstart usage --- tests/scripts/run_tests.sh | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index ea1e625..d544946 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -39,14 +39,27 @@ function umount_dirs { # Only add kickstart function ks_only { - running "Add kickstart to iso" + running "Add kickstart to iso using --ks" mkksiso --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks - status "Add kickstart" + status "Add kickstart to iso using --ks" + umount_dirs +} + +# Only add kickstart +function ks_pos_only { + running "Add kickstart to iso using positional argument" + + mkksiso $KS $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_ks + + status "Add kickstart to iso using positional argument" umount_dirs } @@ -155,6 +168,15 @@ function test_quiet { ! grep "linux.*quiet" "$ISODIR/EFI/BOOT/grub.cfg" || fail "quiet not removed from UEFI grub.cfg cmdline entry" } +# Test error if passing both --ks FILE and 3 arguments +function test_two_kickstarts { + running "Test two kickstart error" + + mkksiso --ks $KS $KS $BOOTISO $OUTISO && fail "No error using --ks and positional argument" + + status "Test two kickstart error" +} + function test_files { [ -e "$ISODIR/services" ] || fail "Missing file from iso" @@ -214,11 +236,13 @@ fi # Test mkksiso on the new boot.iso ks_only +ks_pos_only ks_serial only_serial new_volid add_files remove_quiet +test_two_kickstarts run_all run_as_user From 32547351b37d6624da8febd0e59e49dddea5471d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 25 Jul 2022 10:39:44 -0700 Subject: [PATCH 125/203] - mkksiso: Optionally support 3 arguments or --ks (bcl@redhat.com) - mkksiso: Add -U to xorriso on ppc64le (bcl@redhat.com) - mkksiso: Fix passing -iso-level to xorriso (bcl@redhat.com) - pylorax: SafeConfigParser is now ConfigParser (bcl@redhat.com) - test: Update test code for new pylint version (bcl@redhat.com) - tests: Switch back to rawhide for tests (bcl@redhat.com) - workflow: Remove sudo from workflow (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e9fa447..4408cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ /lorax-37.5.tar.gz /lorax-37.6.tar.gz /lorax-37.7.tar.gz +/lorax-37.8.tar.gz diff --git a/lorax.spec b/lorax.spec index 43869d1..fb056d1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 37.7 -Release: 2%{?dist} +Version: 37.8 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -172,8 +172,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 21 2022 Fedora Release Engineering - 37.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Mon Jul 25 2022 Brian C. Lane 37.8-1 +- mkksiso: Optionally support 3 arguments or --ks (bcl@redhat.com) +- mkksiso: Add -U to xorriso on ppc64le (bcl@redhat.com) +- mkksiso: Fix passing -iso-level to xorriso (bcl@redhat.com) +- pylorax: SafeConfigParser is now ConfigParser (bcl@redhat.com) +- test: Update test code for new pylint version (bcl@redhat.com) +- tests: Switch back to rawhide for tests (bcl@redhat.com) +- workflow: Remove sudo from workflow (bcl@redhat.com) * Wed Jul 13 2022 Brian C. Lane 37.7-1 - mkksiso: Set u+rw permission on extracted files and directories (bcl@redhat.com) diff --git a/sources b/sources index 161fd22..7dfc877 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.7.tar.gz) = 23a4a56bc83e160b3a00dde23a9c590329db2732a23928938444b8a9c1c191dee9e1c9a6bf5166dceb9a0386e341e6dee484e4222f365f7a89746ee65f35791e +SHA512 (lorax-37.8.tar.gz) = 8669ea6b873f4376cf5cace5d2eaab969bfe49f5f594f3bb0968319049c99d052379bfb7c6e5233bae7aa6a525c61c5220a3a0b3e58c7bbbecf1d72498ded25f From aa53f6d1f3925044c4a0ce8d6be5a0689460c187 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 30 Sep 2022 09:44:18 -0700 Subject: [PATCH 126/203] - New lorax documentation - 38.0 (bcl@redhat.com) - tests: Update test_creator.py for new cmdline options (bcl@redhat.com) - livemedia-creator: Add release, variant, bugurl, and isfinal cmdline flags (cappy@cappuchino.xyz) - Drop 32-bit ARM and x86 support (awilliam@redhat.com) - Update anaconda's crash messages to watch (vslavik@redhat.com) - livemedia-creator: Add --product to cmdline args (bcl@redhat.com) - fedora-livemedia: Make sure GNOME Software service isn't started (bcl@redhat.com) - fonts packages syncup in template files (akira@tagoh.org) - tests: Add tzdata package to minimizer test setup (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 19 +++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4408cb5..849e4da 100644 --- a/.gitignore +++ b/.gitignore @@ -222,3 +222,4 @@ /lorax-37.6.tar.gz /lorax-37.7.tar.gz /lorax-37.8.tar.gz +/lorax-38.0.tar.gz diff --git a/lorax.spec b/lorax.spec index fb056d1..ab5414f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.8 +Version: 38.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -71,10 +71,6 @@ Requires: openssh Requires: s390utils >= 2.15.0-2 %endif -%ifarch %{arm} -Requires: uboot-tools -%endif - # Moved image-minimizer tool to lorax Provides: appliance-tools-minimizer = %{version}-%{release} Obsoletes: appliance-tools-minimizer < 007.7-3 @@ -99,7 +95,7 @@ Requires: lorax = %{version}-%{release} Requires: qemu # Fedora edk2 builds currently only support these arches -%ifarch %{ix86} x86_64 %{arm} aarch64 +%ifarch x86_64 aarch64 Requires: edk2-ovmf %endif Recommends: qemu-kvm @@ -172,6 +168,17 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Sep 30 2022 Brian C. Lane 38.0-1 +- New lorax documentation - 38.0 (bcl@redhat.com) +- tests: Update test_creator.py for new cmdline options (bcl@redhat.com) +- livemedia-creator: Add release, variant, bugurl, and isfinal cmdline flags (cappy@cappuchino.xyz) +- Drop 32-bit ARM and x86 support (awilliam@redhat.com) +- Update anaconda's crash messages to watch (vslavik@redhat.com) +- livemedia-creator: Add --product to cmdline args (bcl@redhat.com) +- fedora-livemedia: Make sure GNOME Software service isn't started (bcl@redhat.com) +- fonts packages syncup in template files (akira@tagoh.org) +- tests: Add tzdata package to minimizer test setup (bcl@redhat.com) + * Mon Jul 25 2022 Brian C. Lane 37.8-1 - mkksiso: Optionally support 3 arguments or --ks (bcl@redhat.com) - mkksiso: Add -U to xorriso on ppc64le (bcl@redhat.com) diff --git a/sources b/sources index 7dfc877..de17f28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.8.tar.gz) = 8669ea6b873f4376cf5cace5d2eaab969bfe49f5f594f3bb0968319049c99d052379bfb7c6e5233bae7aa6a525c61c5220a3a0b3e58c7bbbecf1d72498ded25f +SHA512 (lorax-38.0.tar.gz) = f2ab184cc5654065631a13ad25a5f990c967f1f372ede6cd6221a51ed2d40cc87d14fd1a40e2c8b62b4e10fdc3c6805eecef64623f736687d83f15691a01ab56 From 78348e8ac30d11242bf0dc266e636f6d0ec0bc52 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 11 Oct 2022 09:54:46 -0700 Subject: [PATCH 127/203] - livemedia-creator: Allow file: url without networking (bcl@redhat.com) - Update kdump addon package name (vslavik@redhat.com) - Drop anaconda auditd replacement (vslavik@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 849e4da..80d7e60 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,4 @@ /lorax-37.7.tar.gz /lorax-37.8.tar.gz /lorax-38.0.tar.gz +/lorax-38.1.tar.gz diff --git a/lorax.spec b/lorax.spec index ab5414f..681ab46 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.0 +Version: 38.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Oct 11 2022 Brian C. Lane 38.1-1 +- livemedia-creator: Allow file: url without networking (bcl@redhat.com) +- Update kdump addon package name (vslavik@redhat.com) +- Drop anaconda auditd replacement (vslavik@redhat.com) + * Fri Sep 30 2022 Brian C. Lane 38.0-1 - New lorax documentation - 38.0 (bcl@redhat.com) - tests: Update test_creator.py for new cmdline options (bcl@redhat.com) diff --git a/sources b/sources index de17f28..5cd177c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.0.tar.gz) = f2ab184cc5654065631a13ad25a5f990c967f1f372ede6cd6221a51ed2d40cc87d14fd1a40e2c8b62b4e10fdc3c6805eecef64623f736687d83f15691a01ab56 +SHA512 (lorax-38.1.tar.gz) = 58b5e0a1a1cf4a0fe8167ec9913b5ef7aec7f6715ac3983ed69911ab0945834f5b9f23b824da3efd6bf5f1305c5c33b1640e1483b78269acaea992a531c7ac63 From 5982dc4e712683a17bd6201564469144cda77ad9 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 9 Nov 2022 15:44:53 -0800 Subject: [PATCH 128/203] - runtime-postinstall: Disable sshd.socket (bcl@redhat.com) - docs: Document mock and SELinux not working together (bcl@redhat.com) - imgutils: Don't delete dirs created for DracutChroot (bcl@redhat.com) - tito: Use .tito instead of old ./rel-eng directory (bcl@redhat.com) - setup.py: Set the version number (bcl@redhat.com) - Improvement of unmounting /proc, /dev and binds (soksanichenko@cloudlinux.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 80d7e60..3f2728e 100644 --- a/.gitignore +++ b/.gitignore @@ -224,3 +224,4 @@ /lorax-37.8.tar.gz /lorax-38.0.tar.gz /lorax-38.1.tar.gz +/lorax-38.2.tar.gz diff --git a/lorax.spec b/lorax.spec index 681ab46..4261eac 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.1 +Version: 38.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Nov 09 2022 Brian C. Lane 38.2-1 +- runtime-postinstall: Disable sshd.socket (bcl@redhat.com) +- docs: Document mock and SELinux not working together (bcl@redhat.com) +- imgutils: Don't delete dirs created for DracutChroot (bcl@redhat.com) +- tito: Use .tito instead of old ./rel-eng directory (bcl@redhat.com) +- setup.py: Set the version number (bcl@redhat.com) +- Improvement of unmounting /proc, /dev and binds (soksanichenko@cloudlinux.com) + * Tue Oct 11 2022 Brian C. Lane 38.1-1 - livemedia-creator: Allow file: url without networking (bcl@redhat.com) - Update kdump addon package name (vslavik@redhat.com) diff --git a/sources b/sources index 5cd177c..8d2b0fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.1.tar.gz) = 58b5e0a1a1cf4a0fe8167ec9913b5ef7aec7f6715ac3983ed69911ab0945834f5b9f23b824da3efd6bf5f1305c5c33b1640e1483b78269acaea992a531c7ac63 +SHA512 (lorax-38.2.tar.gz) = a11aa2bd0db5506b123ed23c369acc39c52fd3d64e669c4282152d7347a800227446678c976977f7677d4ee56d5b7fc2974389e5eca69c7a586aa1cb9d8204e5 From 0e886e07cc3eec18becc1cfccb4b62aa14239c75 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Nov 2022 14:42:19 -0800 Subject: [PATCH 129/203] - Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) - On ppc64le Use core.elf from grub2 package (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f2728e..a77295a 100644 --- a/.gitignore +++ b/.gitignore @@ -225,3 +225,4 @@ /lorax-38.0.tar.gz /lorax-38.1.tar.gz /lorax-38.2.tar.gz +/lorax-38.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 4261eac..59dd0da 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.2 +Version: 38.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Nov 28 2022 Brian C. Lane 38.3-1 +- Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) +- On ppc64le Use core.elf from grub2 package (bcl@redhat.com) + * Wed Nov 09 2022 Brian C. Lane 38.2-1 - runtime-postinstall: Disable sshd.socket (bcl@redhat.com) - docs: Document mock and SELinux not working together (bcl@redhat.com) diff --git a/sources b/sources index 8d2b0fa..6d6f53b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.2.tar.gz) = a11aa2bd0db5506b123ed23c369acc39c52fd3d64e669c4282152d7347a800227446678c976977f7677d4ee56d5b7fc2974389e5eca69c7a586aa1cb9d8204e5 +SHA512 (lorax-38.3.tar.gz) = 9ef2d8fd05ae718298d176f76d21fe2ac557edd896ee4e87a25ff62f0d9fe5f2c8e818a1ca28484619a01b3b9d6fe6716640087e150791abd6644e4d4db338b1 From 1d493d6f0168fcf6e5b13784ea98317a3d51453f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 12 Dec 2022 14:23:28 -0800 Subject: [PATCH 130/203] - runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) - runtime-cleanup: drop Mediatek SoC firmwares (awilliam@redhat.com) - runtime-install: drop bfa-firmware (awilliam@redhat.com) - mkksiso: Disable running mkefiboot in container tests (bcl@redhat.com) - mkksiso: Rebuild efiboot.img for UEFI enabled isos (bcl@redhat.com) - gitleaks: Add config file to ignore known fake secrets (bcl@redhat.com) - fedora-livemedia.ks: Use livesys-scripts (bcl@redhat.com) - workflows: Switch to actions/checkout@v3 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a77295a..6429710 100644 --- a/.gitignore +++ b/.gitignore @@ -226,3 +226,4 @@ /lorax-38.1.tar.gz /lorax-38.2.tar.gz /lorax-38.3.tar.gz +/lorax-38.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 59dd0da..81f509f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.3 +Version: 38.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Dec 12 2022 Brian C. Lane 38.4-1 +- runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) +- runtime-cleanup: drop Mediatek SoC firmwares (awilliam@redhat.com) +- runtime-install: drop bfa-firmware (awilliam@redhat.com) +- mkksiso: Disable running mkefiboot in container tests (bcl@redhat.com) +- mkksiso: Rebuild efiboot.img for UEFI enabled isos (bcl@redhat.com) +- gitleaks: Add config file to ignore known fake secrets (bcl@redhat.com) +- fedora-livemedia.ks: Use livesys-scripts (bcl@redhat.com) +- workflows: Switch to actions/checkout@v3 (bcl@redhat.com) + * Mon Nov 28 2022 Brian C. Lane 38.3-1 - Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) - On ppc64le Use core.elf from grub2 package (bcl@redhat.com) diff --git a/sources b/sources index 6d6f53b..03d03af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.3.tar.gz) = 9ef2d8fd05ae718298d176f76d21fe2ac557edd896ee4e87a25ff62f0d9fe5f2c8e818a1ca28484619a01b3b9d6fe6716640087e150791abd6644e4d4db338b1 +SHA512 (lorax-38.4.tar.gz) = 47dc632f7b03417b71b067c1a267b9570f417feb02dc84b5cc26d637711b07e40c255b26e4d2d09e961bb802b7beed41beb9a05f9a1d34ede120c6e187d8ae60 From 26136aa21011ea07c44c1855ce304b404d3aad70 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 13 Dec 2022 10:26:01 -0800 Subject: [PATCH 131/203] - Run user test with --skip-mkefiboot --- lorax.spec | 5 ++++- tests/scripts/run_tests.sh | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lorax.spec b/lorax.spec index 81f509f..a4c3e3c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 13 2022 Brian C. Lane - 38.4-2 +- Run user test with --skip-mkefiboot + * Mon Dec 12 2022 Brian C. Lane 38.4-1 - runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) - runtime-cleanup: drop Mediatek SoC firmwares (awilliam@redhat.com) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index d544946..3559b7d 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -199,12 +199,12 @@ function run_all { umount_dirs } -# All of the changes as a user (lorax-ted) +# All of the changes as a user (lorax-ted) with --skip-mkefiboot function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - su - lorax-ted -c "mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + su - lorax-ted -c "mkksiso --skip-mkefiboot -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -213,7 +213,7 @@ function run_as_user { test_files test_quiet - status "Use all the options as a user" + status "Use all the options as a user with --skip-mkefiboot" umount_dirs } From b7f754255297da7d70049ed0ad7a84677f619b93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:18:21 +0000 Subject: [PATCH 132/203] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index a4c3e3c..cc61649 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 38.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 13 2022 Brian C. Lane - 38.4-2 - Run user test with --skip-mkefiboot From 9e52dbb4bd3336d1f78640b6726af14e4c168241 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 8 Feb 2023 14:28:16 -0800 Subject: [PATCH 133/203] - Fix using --dracut-conf with DracutChroot (bcl@redhat.com) - tests: Fix DataHolder for CreatorTest (bcl@redhat.com) - runtime-install: Update for https://fedoraproject.org/wiki/Changes/NotoFontsForMoreLang (akira@tagoh.org) - SPDX migration (bcl@redhat.com) - rsyslogd.conf: Rewrite using current config syntax (bcl@redhat.com) - Add comment for squashfs-only (dick@mrns.nl) - runtime-install: exclude some more unneeded firmware packages (awilliam@redhat.com) - runtime-install: stop excluding bfa-firmware again (retired) (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6429710..5fa272f 100644 --- a/.gitignore +++ b/.gitignore @@ -227,3 +227,4 @@ /lorax-38.2.tar.gz /lorax-38.3.tar.gz /lorax-38.4.tar.gz +/lorax-38.5.tar.gz diff --git a/lorax.spec b/lorax.spec index cc61649..7a9989e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,11 +3,11 @@ %define debug_package %{nil} Name: lorax -Version: 38.4 -Release: 3%{?dist} +Version: 38.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/weldr/lorax # To generate Source0 do: # git clone https://github.com/weldr/lorax @@ -168,11 +168,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jan 19 2023 Fedora Release Engineering - 38.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Dec 13 2022 Brian C. Lane - 38.4-2 -- Run user test with --skip-mkefiboot +* Wed Feb 08 2023 Brian C. Lane 38.5-1 +- Fix using --dracut-conf with DracutChroot (bcl@redhat.com) +- tests: Fix DataHolder for CreatorTest (bcl@redhat.com) +- runtime-install: Update for + https://fedoraproject.org/wiki/Changes/NotoFontsForMoreLang (akira@tagoh.org) +- SPDX migration (bcl@redhat.com) +- rsyslogd.conf: Rewrite using current config syntax (bcl@redhat.com) +- Add comment for squashfs-only (dick@mrns.nl) +- runtime-install: exclude some more unneeded firmware packages (awilliam@redhat.com) +- runtime-install: stop excluding bfa-firmware again (retired) (awilliam@redhat.com) * Mon Dec 12 2022 Brian C. Lane 38.4-1 - runtime-cleanup: drop old versions of qed firmware (awilliam@redhat.com) diff --git a/sources b/sources index 03d03af..def9a8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.4.tar.gz) = 47dc632f7b03417b71b067c1a267b9570f417feb02dc84b5cc26d637711b07e40c255b26e4d2d09e961bb802b7beed41beb9a05f9a1d34ede120c6e187d8ae60 +SHA512 (lorax-38.5.tar.gz) = a48639502131b8a4d34bfb6c56ab7915c6d4329bcbc469f6cacd8cf54580ffce26e1a6effb971d61f9fa0f9e78849780c6aa01f672f4c4e28fce872453b0a907 From 6c25ce1056a57d9432effe245f4bf1c38d2d5b75 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Feb 2023 10:18:59 -0800 Subject: [PATCH 134/203] - templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) - Update for Noto CJK Variable Fonts (pwu@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5fa272f..b9fc9b0 100644 --- a/.gitignore +++ b/.gitignore @@ -228,3 +228,4 @@ /lorax-38.3.tar.gz /lorax-38.4.tar.gz /lorax-38.5.tar.gz +/lorax-38.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 7a9989e..1b3ee29 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 38.5 +Version: 38.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Feb 14 2023 Brian C. Lane 38.6-1 +- templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) +- Update for Noto CJK Variable Fonts (pwu@redhat.com) + * Wed Feb 08 2023 Brian C. Lane 38.5-1 - Fix using --dracut-conf with DracutChroot (bcl@redhat.com) - tests: Fix DataHolder for CreatorTest (bcl@redhat.com) diff --git a/sources b/sources index def9a8b..020d317 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.5.tar.gz) = a48639502131b8a4d34bfb6c56ab7915c6d4329bcbc469f6cacd8cf54580ffce26e1a6effb971d61f9fa0f9e78849780c6aa01f672f4c4e28fce872453b0a907 +SHA512 (lorax-38.6.tar.gz) = 1dc0f61203fa73f0bb923c6bc75ef9b2edad72b4b753c2340f0f3c6074bbcf3e3d9c4e98a59d9bb79d8e6bf139d9c720802e4a1bcd37d03f091f08b06b8933b2 From 78425032ee0dde61cad8ddf91d276166dda68736 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 15 Feb 2023 21:27:49 -0800 Subject: [PATCH 135/203] Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose --- 0001-Strip-some-things-from-gtk4.patch | 31 ++++++++++++++++++++++++++ lorax.spec | 10 ++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-Strip-some-things-from-gtk4.patch diff --git a/0001-Strip-some-things-from-gtk4.patch b/0001-Strip-some-things-from-gtk4.patch new file mode 100644 index 0000000..215da43 --- /dev/null +++ b/0001-Strip-some-things-from-gtk4.patch @@ -0,0 +1,31 @@ +From 633af4499c1387692fbd5e5760d0a42bb5fb70a2 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 15 Feb 2023 21:20:34 -0800 +Subject: [PATCH] Strip some things from gtk4 + +gtk4 is now getting sucked into installer images because mutter +depends on it (since 44-beta). Strip some stuff the installer +env currently doesn't need. The /usr/bin/* removal may not be +safe long-term, but it should be OK for now. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 31dd44ee..6e0d8e88 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -179,6 +179,8 @@ removefrom google-noto-sans-cjk-fonts /usr/share/fonts/google-noto-sans-cjk-font + removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf + removefrom grep /etc/* /usr/share/locale/* + removefrom gtk3 /usr/${libdir}/gtk-3.0/* ++removefrom gtk4 /usr/${libdir}/gtk-4.0/* ++removefrom gtk4 /usr/bin/* + removefrom guile22 /usr/${libdir}/guile/2.2/ccache* + removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} + removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids +-- +2.39.1 + diff --git a/lorax.spec b/lorax.spec index 1b3ee29..682c1ec 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,11 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Strip some stuff from gtk4, necessary for compose to work since +# gtk4-launch requires libtiff which is stripped itself +# https://github.com/weldr/lorax/pull/1309 +# https://pagure.io/releng/failed-composes/issue/4611 +Patch0: 0001-Strip-some-things-from-gtk4.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +173,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Feb 15 2023 Adam Williamson - 38.6-2 +- Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose + * Tue Feb 14 2023 Brian C. Lane 38.6-1 - templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) - Update for Noto CJK Variable Fonts (pwu@redhat.com) From c61ef2b61e46728bb754c96e19fbbb8b698b4088 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 15 Feb 2023 21:28:38 -0800 Subject: [PATCH 136/203] Apply the patch (using autosetup) --- lorax.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 682c1ec..25683d1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -131,7 +131,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build From c00cc2a98b99170c1f4a00269a58498554227bda Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 16 Feb 2023 10:30:09 -0800 Subject: [PATCH 137/203] Backport #1310 to disable persistence again, it's busted (#2170544) --- ....d-99-generic-live-Enable-automatic-.patch | 144 ++++++++++++++++++ lorax.spec | 9 +- 2 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch diff --git a/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch b/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch new file mode 100644 index 0000000..32d69ed --- /dev/null +++ b/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch @@ -0,0 +1,144 @@ +From 55aabe2102263465e4ecb8274697bab22cae780c Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 16 Feb 2023 09:53:05 -0800 +Subject: [PATCH] Revert "templates.d/99-generic/live: Enable automatic + persistence for live media" + +This reverts commit 7bedf613db8fbaf38747146775f00a2042f8424e. +Initial testing indicates it's busted: +https://bugzilla.redhat.com/show_bug.cgi?id=2170544 +--- + .../live/config_files/aarch64/grub2-efi.cfg | 26 ++++--------------- + .../live/config_files/x86/grub2-bios.cfg | 26 ++++--------------- + .../live/config_files/x86/grub2-efi.cfg | 26 ++++--------------- + 3 files changed, 15 insertions(+), 63 deletions(-) + +diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg +index d4f7bf5e..c874547f 100644 +--- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg ++++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg +@@ -26,32 +26,16 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb ++menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb + initrd @INITRDPATH@ + } +-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet +- initrd @INITRDPATH@ +-} +-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb ++menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { +- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb + initrd @INITRDPATH@ + } +diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg +index 486d8548..5987cf62 100644 +--- a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg ++++ b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg +@@ -17,32 +17,16 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb ++menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb + initrd @INITRDPATH@ + } +-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet +- initrd @INITRDPATH@ +-} +-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb ++menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { +- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb +- initrd @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb + initrd @INITRDPATH@ + } +diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg +index 7595571e..39069585 100644 +--- a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg ++++ b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg +@@ -20,32 +20,16 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb ++menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb + initrdefi @INITRDPATH@ + } +-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet +- initrdefi @INITRDPATH@ +-} +-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb ++menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet + initrdefi @INITRDPATH@ + } + submenu 'Troubleshooting -->' { +- menuentry 'Start @PRODUCT@ @VERSION@ without automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb +- initrdefi @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb +- initrdefi @INITRDPATH@ +- } +- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb +- initrdefi @INITRDPATH@ +- } +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb + initrdefi @INITRDPATH@ + } +-- +2.39.1 + diff --git a/lorax.spec b/lorax.spec index 25683d1..44e6f73 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -19,6 +19,10 @@ Source0: %{name}-%{version}.tar.gz # https://github.com/weldr/lorax/pull/1309 # https://pagure.io/releng/failed-composes/issue/4611 Patch0: 0001-Strip-some-things-from-gtk4.patch +# Disable default persistence, it's busted: +# https://bugzilla.redhat.com/show_bug.cgi?id=2170544 +# https://github.com/weldr/lorax/pull/1310 +Patch1: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -173,6 +177,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Feb 16 2023 Adam Williamson - 38.6-3 +- Backport PR #1310 to disable persistence again, it's busted (#2170544) + * Wed Feb 15 2023 Adam Williamson - 38.6-2 - Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose From e0d8f46b08f7f9432e37e3d59d98a9334e2bb88c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 17 Feb 2023 18:16:58 -0800 Subject: [PATCH 138/203] Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716) --- ...rip-gtk4-binaries-or-libtiff-2170716.patch | 42 +++++++++++++++++++ lorax.spec | 15 +++++-- 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch diff --git a/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch b/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch new file mode 100644 index 0000000..b588d34 --- /dev/null +++ b/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch @@ -0,0 +1,42 @@ +From b42349eada5674b84604592c2a32e749750fbf81 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 17 Feb 2023 08:55:02 -0800 +Subject: [PATCH] Don't strip gtk4 binaries or libtiff (#2170716) + +It turns out that, somehow, stripping the gtk4 binaries caused: +https://bugzilla.redhat.com/show_bug.cgi?id=2170716 +at least, I tested a scratch build with this change and that bug +didn't seem to happen any more. This puts the gtk4 binaries back, +and also stops stripping libtiff, because gtk4-launch depends on +it so we need to keep it in. This doesn't seem to cause too much +of a size difference; I see 723417088 bytes for the netinst with +this change, compared to 723197952 bytes for today's nightly. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 6e0d8e88..6577a45c 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -53,7 +53,6 @@ removepkg mtools glibc-gconv-extra + ## various other things we remove to save space + removepkg diffutils file + removepkg libasyncns +-removepkg libtiff + removepkg lvm2-libs + removepkg mobile-broadband-provider-info + removepkg rmt rpcbind squashfs-tools +@@ -180,7 +179,6 @@ removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-It + removefrom grep /etc/* /usr/share/locale/* + removefrom gtk3 /usr/${libdir}/gtk-3.0/* + removefrom gtk4 /usr/${libdir}/gtk-4.0/* +-removefrom gtk4 /usr/bin/* + removefrom guile22 /usr/${libdir}/guile/2.2/ccache* + removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} + removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids +-- +2.39.1 + diff --git a/lorax.spec b/lorax.spec index 44e6f73..b3ac0e9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,14 +15,20 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz # Strip some stuff from gtk4, necessary for compose to work since -# gtk4-launch requires libtiff which is stripped itself +# gtk4-launch requires libtiff which is stripped itself... # https://github.com/weldr/lorax/pull/1309 # https://pagure.io/releng/failed-composes/issue/4611 Patch0: 0001-Strip-some-things-from-gtk4.patch +# ...only it turns out we really need at least one of the binaries +# or a window in anaconda doesn't open, so this puts them back +# and stops stripping libtiff +# https://github.com/weldr/lorax/pull/1312 +# https://bugzilla.redhat.com/show_bug.cgi?id=2170716 +Patch1: 0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch # Disable default persistence, it's busted: # https://bugzilla.redhat.com/show_bug.cgi?id=2170544 # https://github.com/weldr/lorax/pull/1310 -Patch1: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch +Patch2: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -177,6 +183,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Feb 17 2023 Adam Williamson - 38.6-4 +- Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716) + * Thu Feb 16 2023 Adam Williamson - 38.6-3 - Backport PR #1310 to disable persistence again, it's busted (#2170544) From 00039d31afc9eddc3eb9ceba9da0b0221a25c0c8 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 14 Mar 2023 11:07:56 -0700 Subject: [PATCH 139/203] - Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) - livemedia-creator: Do not omit plymouth module from dracut (bcl@redhat.com) - New lorax documentation - 39.0 (bcl@redhat.com) - workflow: Update list of push branches for workflow tests (bcl@redhat.com) - Prepare for version 39.0 release (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 42 ++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index b9fc9b0..e4414ef 100644 --- a/.gitignore +++ b/.gitignore @@ -229,3 +229,4 @@ /lorax-38.4.tar.gz /lorax-38.5.tar.gz /lorax-38.6.tar.gz +/lorax-39.0.tar.gz diff --git a/lorax.spec b/lorax.spec index b3ac0e9..238ae88 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 38.6 -Release: 4%{?dist} +Version: 39.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,21 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Strip some stuff from gtk4, necessary for compose to work since -# gtk4-launch requires libtiff which is stripped itself... -# https://github.com/weldr/lorax/pull/1309 -# https://pagure.io/releng/failed-composes/issue/4611 -Patch0: 0001-Strip-some-things-from-gtk4.patch -# ...only it turns out we really need at least one of the binaries -# or a window in anaconda doesn't open, so this puts them back -# and stops stripping libtiff -# https://github.com/weldr/lorax/pull/1312 -# https://bugzilla.redhat.com/show_bug.cgi?id=2170716 -Patch1: 0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch -# Disable default persistence, it's busted: -# https://bugzilla.redhat.com/show_bug.cgi?id=2170544 -# https://github.com/weldr/lorax/pull/1310 -Patch2: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -183,14 +168,23 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Feb 17 2023 Adam Williamson - 38.6-4 -- Backport PR #1312 to put gtk4 binaries and libtiff back in (#2170716) +* Tue Mar 14 2023 Brian C. Lane 39.0-1 +- Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) +- livemedia-creator: Do not omit plymouth module from dracut (bcl@redhat.com) +- New lorax documentation - 39.0 (bcl@redhat.com) +- workflow: Update list of push branches for workflow tests (bcl@redhat.com) +- Prepare for version 39.0 release (bcl@redhat.com) -* Thu Feb 16 2023 Adam Williamson - 38.6-3 -- Backport PR #1310 to disable persistence again, it's busted (#2170544) - -* Wed Feb 15 2023 Adam Williamson - 38.6-2 -- Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose +* Mon Feb 20 2023 Brian C. Lane 38.7-1 +- Don't strip gtk4 binaries or libtiff (#2170716) (awilliam@redhat.com) +- image-minimizer: Use RuntimeError instead of Exception (bcl@redhat.com) +- creator: Use RuntimeError instead of Exception (bcl@redhat.com) +- treebuilder: Use RuntimeError instead of Exception (bcl@redhat.com) +- mount: Use RuntimeError instead of Exception (bcl@redhat.com) +- ltmpl: Use RuntimeError instead of Exception (bcl@redhat.com) +- spec: Use autosetup to make patching easier (bcl@redhat.com) +- Revert "templates.d/99-generic/live: Enable automatic persistence for live media" (awilliam@redhat.com) +- Strip some things from gtk4 (awilliam@redhat.com) * Tue Feb 14 2023 Brian C. Lane 38.6-1 - templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) diff --git a/sources b/sources index 020d317..cdfb939 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-38.6.tar.gz) = 1dc0f61203fa73f0bb923c6bc75ef9b2edad72b4b753c2340f0f3c6074bbcf3e3d9c4e98a59d9bb79d8e6bf139d9c720802e4a1bcd37d03f091f08b06b8933b2 +SHA512 (lorax-39.0.tar.gz) = 645500331f5226df833535982f2bfe6fdb17132168a24020928a0a36f42ed058520247a6019356e2bd308a5936b2a0f576323c2d3c322d9a9c31e8b8ca115ea1 From 13a5a44a48acbc9750f760def55ab09a1e52e171 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 31 May 2023 13:51:40 -0700 Subject: [PATCH 140/203] - livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) - Make sure -machine is passed to qemu (hadess@hadess.net) - Only allow UEFI support to be enabled on x86_64 (hadess@hadess.net) - Throw an error when KVM is enabled on non-native installs (hadess@hadess.net) - docs: Clarify that kickstarts need a part command (bcl@redhat.com) - livemedia-creator: Raise an error when no partitions are in the ks (bcl@redhat.com) - monitor: Skip repo errors involving CDROM/file source (bcl@redhat.com) - logging: Remove duplicate stream logging (bcl@redhat.com) - Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) - livemedia-creator: Use -cpu host by default, add -cpu option to override (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e4414ef..05c4d25 100644 --- a/.gitignore +++ b/.gitignore @@ -230,3 +230,4 @@ /lorax-38.5.tar.gz /lorax-38.6.tar.gz /lorax-39.0.tar.gz +/lorax-39.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 238ae88..82c23f3 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 39.0 +Version: 39.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,18 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed May 31 2023 Brian C. Lane 39.1-1 +- livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) +- Make sure -machine is passed to qemu (hadess@hadess.net) +- Only allow UEFI support to be enabled on x86_64 (hadess@hadess.net) +- Throw an error when KVM is enabled on non-native installs (hadess@hadess.net) +- docs: Clarify that kickstarts need a part command (bcl@redhat.com) +- livemedia-creator: Raise an error when no partitions are in the ks (bcl@redhat.com) +- monitor: Skip repo errors involving CDROM/file source (bcl@redhat.com) +- logging: Remove duplicate stream logging (bcl@redhat.com) +- Pass vga=791 for live basic graphics mode on BIOS (#2176782) (awilliam@redhat.com) +- livemedia-creator: Use -cpu host by default, add -cpu option to override (bcl@redhat.com) + * Tue Mar 14 2023 Brian C. Lane 39.0-1 - Add setpriv as ostree containers dependency (#2125655) (jkonecny@redhat.com) - livemedia-creator: Do not omit plymouth module from dracut (bcl@redhat.com) diff --git a/sources b/sources index cdfb939..d9ffacb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.0.tar.gz) = 645500331f5226df833535982f2bfe6fdb17132168a24020928a0a36f42ed058520247a6019356e2bd308a5936b2a0f576323c2d3c322d9a9c31e8b8ca115ea1 +SHA512 (lorax-39.1.tar.gz) = b077849e56bdfb5d5a5a6d2b1e5dfe22f8e1ba625ad5b8bfcadb9f918565fa4897583cf105f78005ade316e6f85efac483c36d076896e4937f5fd1ee1756fb6e From 6d58144ab9c91ee30a0d9a3e1685d70553e0618b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:22:25 +0200 Subject: [PATCH 141/203] Rebuilt for Python 3.12 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 82c23f3..eb4ac72 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jun 13 2023 Python Maint - 39.1-2 +- Rebuilt for Python 3.12 + * Wed May 31 2023 Brian C. Lane 39.1-1 - livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) - Make sure -machine is passed to qemu (hadess@hadess.net) From a05a5b0c895e86bc5ac9c628849c3abbe1e17989 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 30 Jun 2023 10:34:27 -0700 Subject: [PATCH 142/203] Drop merged patch files --- ...rip-gtk4-binaries-or-libtiff-2170716.patch | 42 ----- ....d-99-generic-live-Enable-automatic-.patch | 144 ------------------ 0001-Strip-some-things-from-gtk4.patch | 31 ---- 3 files changed, 217 deletions(-) delete mode 100644 0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch delete mode 100644 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch delete mode 100644 0001-Strip-some-things-from-gtk4.patch diff --git a/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch b/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch deleted file mode 100644 index b588d34..0000000 --- a/0001-Don-t-strip-gtk4-binaries-or-libtiff-2170716.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b42349eada5674b84604592c2a32e749750fbf81 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 17 Feb 2023 08:55:02 -0800 -Subject: [PATCH] Don't strip gtk4 binaries or libtiff (#2170716) - -It turns out that, somehow, stripping the gtk4 binaries caused: -https://bugzilla.redhat.com/show_bug.cgi?id=2170716 -at least, I tested a scratch build with this change and that bug -didn't seem to happen any more. This puts the gtk4 binaries back, -and also stops stripping libtiff, because gtk4-launch depends on -it so we need to keep it in. This doesn't seem to cause too much -of a size difference; I see 723417088 bytes for the netinst with -this change, compared to 723197952 bytes for today's nightly. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 6e0d8e88..6577a45c 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -53,7 +53,6 @@ removepkg mtools glibc-gconv-extra - ## various other things we remove to save space - removepkg diffutils file - removepkg libasyncns --removepkg libtiff - removepkg lvm2-libs - removepkg mobile-broadband-provider-info - removepkg rmt rpcbind squashfs-tools -@@ -180,7 +179,6 @@ removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-It - removefrom grep /etc/* /usr/share/locale/* - removefrom gtk3 /usr/${libdir}/gtk-3.0/* - removefrom gtk4 /usr/${libdir}/gtk-4.0/* --removefrom gtk4 /usr/bin/* - removefrom guile22 /usr/${libdir}/guile/2.2/ccache* - removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} - removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids --- -2.39.1 - diff --git a/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch b/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch deleted file mode 100644 index 32d69ed..0000000 --- a/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 55aabe2102263465e4ecb8274697bab22cae780c Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 16 Feb 2023 09:53:05 -0800 -Subject: [PATCH] Revert "templates.d/99-generic/live: Enable automatic - persistence for live media" - -This reverts commit 7bedf613db8fbaf38747146775f00a2042f8424e. -Initial testing indicates it's busted: -https://bugzilla.redhat.com/show_bug.cgi?id=2170544 ---- - .../live/config_files/aarch64/grub2-efi.cfg | 26 ++++--------------- - .../live/config_files/x86/grub2-bios.cfg | 26 ++++--------------- - .../live/config_files/x86/grub2-efi.cfg | 26 ++++--------------- - 3 files changed, 15 insertions(+), 63 deletions(-) - -diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg -index d4f7bf5e..c874547f 100644 ---- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg -+++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg -@@ -26,32 +26,16 @@ set timeout=60 - search --no-floppy --set=root -l '@ISOLABEL@' - - ### BEGIN /etc/grub.d/10_linux ### --menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb -+menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb - initrd @INITRDPATH@ - } --menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet -- initrd @INITRDPATH@ --} --menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb -+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet - initrd @INITRDPATH@ - } - submenu 'Troubleshooting -->' { -- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -+ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb - initrd @INITRDPATH@ - } -diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg -index 486d8548..5987cf62 100644 ---- a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg -+++ b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg -@@ -17,32 +17,16 @@ set timeout=60 - search --no-floppy --set=root -l '@ISOLABEL@' - - ### BEGIN /etc/grub.d/10_linux ### --menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb -+menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb - initrd @INITRDPATH@ - } --menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet -- initrd @INITRDPATH@ --} --menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb -+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet - initrd @INITRDPATH@ - } - submenu 'Troubleshooting -->' { -- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb -- initrd @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -+ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb - initrd @INITRDPATH@ - } -diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg -index 7595571e..39069585 100644 ---- a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg -+++ b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg -@@ -20,32 +20,16 @@ set timeout=60 - search --no-floppy --set=root -l '@ISOLABEL@' - - ### BEGIN /etc/grub.d/10_linux ### --menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb -+menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb - initrdefi @INITRDPATH@ - } --menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet -- initrdefi @INITRDPATH@ --} --menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb -+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { -+ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet - initrdefi @INITRDPATH@ - } - submenu 'Troubleshooting -->' { -- menuentry 'Start @PRODUCT@ @VERSION@ without automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb -- initrdefi @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb -- initrdefi @INITRDPATH@ -- } -- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb -- initrdefi @INITRDPATH@ -- } -- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os { -+ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb - initrdefi @INITRDPATH@ - } --- -2.39.1 - diff --git a/0001-Strip-some-things-from-gtk4.patch b/0001-Strip-some-things-from-gtk4.patch deleted file mode 100644 index 215da43..0000000 --- a/0001-Strip-some-things-from-gtk4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 633af4499c1387692fbd5e5760d0a42bb5fb70a2 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 15 Feb 2023 21:20:34 -0800 -Subject: [PATCH] Strip some things from gtk4 - -gtk4 is now getting sucked into installer images because mutter -depends on it (since 44-beta). Strip some stuff the installer -env currently doesn't need. The /usr/bin/* removal may not be -safe long-term, but it should be OK for now. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl -index 31dd44ee..6e0d8e88 100644 ---- a/share/templates.d/99-generic/runtime-cleanup.tmpl -+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl -@@ -179,6 +179,8 @@ removefrom google-noto-sans-cjk-fonts /usr/share/fonts/google-noto-sans-cjk-font - removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf - removefrom grep /etc/* /usr/share/locale/* - removefrom gtk3 /usr/${libdir}/gtk-3.0/* -+removefrom gtk4 /usr/${libdir}/gtk-4.0/* -+removefrom gtk4 /usr/bin/* - removefrom guile22 /usr/${libdir}/guile/2.2/ccache* - removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} - removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids --- -2.39.1 - From 516d709e141d5370ffbb39e136d21d1b24c93a42 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 4 Jul 2023 12:31:16 -0700 Subject: [PATCH 143/203] Backport PR #1332 to handle renamed iwl firmware packages --- ...exclude-renamed-iwl-firmware-package.patch | 57 +++++++++++++++++++ lorax.spec | 9 ++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch diff --git a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch new file mode 100644 index 0000000..7dba08f --- /dev/null +++ b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch @@ -0,0 +1,57 @@ +From b0e04f47313eeb276ac57db6e769799cea25cc0b Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 4 Jul 2023 08:45:03 -0700 +Subject: [PATCH] runtime-install: exclude renamed iwl firmware packages + +@pbrobinson renamed the Intel wireless firmware packages in +the 20230625 build of linux-firmware. This causes installer +image builds to fail because they want to pull in the old packages +from the release repo because they fall in the "*-firmware" glob, +but those packages are now obsoleted by the newer ones from +updates/updates-testing, and dnf doesn't like that. This should +resolve the problem by specifically excluding all the renamed +packages from the glob. Of course, this change must go along +with the newer linux-firmware package, or else you'll get an +image that's missing a lot of wireless firmware. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index f8f988b8..15177467 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -28,6 +28,10 @@ installpkg grubby + ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 + ## bfa-firmware contains only obsolete files - see + ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202 ++ ## various iwl package names were changed in linux-firmware-20230625-151 ++ ## so need to be excluded or else dnf gets sad - see ++ ## https://pagure.io/releng/issue/11511 . These exclusions can ++ ## be dropped after F38 goes EOL + installpkg --optional *-firmware --except alsa* --except midisport-firmware \ + --except crystalhd-firmware --except ivtv-firmware \ + --except cx18-firmware --except iscan-firmware \ +@@ -36,7 +40,16 @@ installpkg grubby + --except liquidio-firmware --except netronome-firmware \ + --except mrvlprestera-firmware --except mlxsw_spectrum-firmware \ + --except hackrf-firmware --except python-virt-firmware \ +- --except python3-virt-firmware ++ --except python3-virt-firmware \ ++ --except iwl3945-firmware --except iwl4965-firmware \ ++ --except iwl100-firmware --except iwl105-firmware \ ++ --except iwl135-firmware --except iwl1000-firmware \ ++ --except iwl2000-firmware --except iwl2030-firmware \ ++ --except iwl5000-firmware --except iwl5150-firmware \ ++ --except iwl6000-firmware --except iwl6000g2a-firmware \ ++ --except iwl6000g2b-firmware --except iwl6050-firmware \ ++ --except iwl3160-firmware --except iwl7260-firmware \ ++ --except iwlax2xx-firmware + installpkg b43-openfwwf + %endif + +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index eb4ac72..5f71f4d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,10 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1332 +# https://pagure.io/releng/issue/11511 +# adapt to renamed iwl firmware packages +Patch0: 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 04 2023 Adam Williamson - 39.1-3 +- Backport PR #1332 to handle renamed iwl firmware packages + * Tue Jun 13 2023 Python Maint - 39.1-2 - Rebuilt for Python 3.12 From ff16001b692dac9b39c8dcd32502d703b7361601 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 4 Jul 2023 12:46:19 -0700 Subject: [PATCH 144/203] Rebuilt for Python 3.12 again --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 5f71f4d..91e7400 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -172,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 04 2023 Adam Williamson - 39.1-4 +- Rebuilt for Python 3.12 again + * Tue Jul 04 2023 Adam Williamson - 39.1-3 - Backport PR #1332 to handle renamed iwl firmware packages From 86e0a84b54e347e7be0ae61b269425d012704e6e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 14 Jul 2023 11:25:16 -0700 Subject: [PATCH 145/203] - drop included patches - pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) - tests: Fix image_minimizer test dnf usage (bcl@redhat.com) - tests: Fix HFS test to work with new get_file_magic output (bcl@redhat.com) - ltmpl: Use ProcMount while running the dnf transaction (bcl@redhat.com) - imgutils: Split part DracutChroot into ProcMount (bcl@redhat.com) - runtime-postinstall: Remove libuser.conf (bcl@redhat.com) - runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) - test_minimizer: dnf5 wants --use-host-config (bcl@redhat.com) - Install nvme-cli tool and remove machine specific nvme files (bcl@redhat.com) - Revert "Add blacklist_exceptions to multipath.conf" (jstodola@redhat.com) --- .gitignore | 1 + ...exclude-renamed-iwl-firmware-package.patch | 57 ------------------- lorax.spec | 27 +++++---- sources | 2 +- 4 files changed, 15 insertions(+), 72 deletions(-) delete mode 100644 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch diff --git a/.gitignore b/.gitignore index 05c4d25..e3411c8 100644 --- a/.gitignore +++ b/.gitignore @@ -231,3 +231,4 @@ /lorax-38.6.tar.gz /lorax-39.0.tar.gz /lorax-39.1.tar.gz +/lorax-39.2.tar.gz diff --git a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch deleted file mode 100644 index 7dba08f..0000000 --- a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b0e04f47313eeb276ac57db6e769799cea25cc0b Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 4 Jul 2023 08:45:03 -0700 -Subject: [PATCH] runtime-install: exclude renamed iwl firmware packages - -@pbrobinson renamed the Intel wireless firmware packages in -the 20230625 build of linux-firmware. This causes installer -image builds to fail because they want to pull in the old packages -from the release repo because they fall in the "*-firmware" glob, -but those packages are now obsoleted by the newer ones from -updates/updates-testing, and dnf doesn't like that. This should -resolve the problem by specifically excluding all the renamed -packages from the glob. Of course, this change must go along -with the newer linux-firmware package, or else you'll get an -image that's missing a lot of wireless firmware. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index f8f988b8..15177467 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -28,6 +28,10 @@ installpkg grubby - ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 - ## bfa-firmware contains only obsolete files - see - ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202 -+ ## various iwl package names were changed in linux-firmware-20230625-151 -+ ## so need to be excluded or else dnf gets sad - see -+ ## https://pagure.io/releng/issue/11511 . These exclusions can -+ ## be dropped after F38 goes EOL - installpkg --optional *-firmware --except alsa* --except midisport-firmware \ - --except crystalhd-firmware --except ivtv-firmware \ - --except cx18-firmware --except iscan-firmware \ -@@ -36,7 +40,16 @@ installpkg grubby - --except liquidio-firmware --except netronome-firmware \ - --except mrvlprestera-firmware --except mlxsw_spectrum-firmware \ - --except hackrf-firmware --except python-virt-firmware \ -- --except python3-virt-firmware -+ --except python3-virt-firmware \ -+ --except iwl3945-firmware --except iwl4965-firmware \ -+ --except iwl100-firmware --except iwl105-firmware \ -+ --except iwl135-firmware --except iwl1000-firmware \ -+ --except iwl2000-firmware --except iwl2030-firmware \ -+ --except iwl5000-firmware --except iwl5150-firmware \ -+ --except iwl6000-firmware --except iwl6000g2a-firmware \ -+ --except iwl6000g2b-firmware --except iwl6050-firmware \ -+ --except iwl3160-firmware --except iwl7260-firmware \ -+ --except iwlax2xx-firmware - installpkg b43-openfwwf - %endif - --- -2.41.0 - diff --git a/lorax.spec b/lorax.spec index 91e7400..18418cc 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 39.1 -Release: 4%{?dist} +Version: 39.2 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,10 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1332 -# https://pagure.io/releng/issue/11511 -# adapt to renamed iwl firmware packages -Patch0: 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -172,14 +168,17 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Tue Jul 04 2023 Adam Williamson - 39.1-4 -- Rebuilt for Python 3.12 again - -* Tue Jul 04 2023 Adam Williamson - 39.1-3 -- Backport PR #1332 to handle renamed iwl firmware packages - -* Tue Jun 13 2023 Python Maint - 39.1-2 -- Rebuilt for Python 3.12 +* Fri Jul 14 2023 Brian C. Lane 39.2-1 +- pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) +- tests: Fix image_minimizer test dnf usage (bcl@redhat.com) +- tests: Fix HFS test to work with new get_file_magic output (bcl@redhat.com) +- ltmpl: Use ProcMount while running the dnf transaction (bcl@redhat.com) +- imgutils: Split part DracutChroot into ProcMount (bcl@redhat.com) +- runtime-postinstall: Remove libuser.conf (bcl@redhat.com) +- runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) +- test_minimizer: dnf5 wants --use-host-config (bcl@redhat.com) +- Install nvme-cli tool and remove machine specific nvme files (bcl@redhat.com) +- Revert "Add blacklist_exceptions to multipath.conf" (jstodola@redhat.com) * Wed May 31 2023 Brian C. Lane 39.1-1 - livemedia-creator: Reorganize the qemu arch patch (bcl@redhat.com) diff --git a/sources b/sources index d9ffacb..c141579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.1.tar.gz) = b077849e56bdfb5d5a5a6d2b1e5dfe22f8e1ba625ad5b8bfcadb9f918565fa4897583cf105f78005ade316e6f85efac483c36d076896e4937f5fd1ee1756fb6e +SHA512 (lorax-39.2.tar.gz) = c3dbb812b06107e26e49d1d360b3f0808f640ebbf813d4a09b9088e6a447667791b8f8c9f5131703cb6e02313a467819f57ce0ce4732e5edab1fef784dfe5121 From f6fc8022a324ea9946212bf63bdbd0fff16518c2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 14 Jul 2023 15:16:38 -0700 Subject: [PATCH 146/203] plans: prepare is reported to be unneeded and causing issues --- lorax.spec | 5 ++++- plans/build-iso.fmf | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lorax.spec b/lorax.spec index 18418cc..c1fa8e9 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jul 14 2023 Brian C. Lane - 39.2-2 +- plans: prepare is reported to be unneeded and causing issues + * Fri Jul 14 2023 Brian C. Lane 39.2-1 - pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) - tests: Fix image_minimizer test dnf usage (bcl@redhat.com) diff --git a/plans/build-iso.fmf b/plans/build-iso.fmf index ae03eff..e3c3d28 100644 --- a/plans/build-iso.fmf +++ b/plans/build-iso.fmf @@ -1,7 +1,3 @@ summary: Run Lorax tests (build an iso, run mkksiso on it) -prepare: - how: install - package: - - lorax execute: script: ./tests/scripts/run_tests.sh From 3d87c95d48ece392472927d8e95c35c80ff126b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:03:30 +0000 Subject: [PATCH 147/203] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index c1fa8e9..423309a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 39.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jul 14 2023 Brian C. Lane - 39.2-2 - plans: prepare is reported to be unneeded and causing issues From ce70ae7edbe977424e187badba8b47ab47d3f0d3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 22 Jul 2023 10:06:12 -0700 Subject: [PATCH 148/203] Backport PR #1334 to fix installer with latest librsvg2 --- ...e-install-install-rsvg-pixbuf-loader.patch | 43 +++++++++++++++++++ lorax.spec | 8 +++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-install-rsvg-pixbuf-loader.patch diff --git a/0001-runtime-install-install-rsvg-pixbuf-loader.patch b/0001-runtime-install-install-rsvg-pixbuf-loader.patch new file mode 100644 index 0000000..a2685d2 --- /dev/null +++ b/0001-runtime-install-install-rsvg-pixbuf-loader.patch @@ -0,0 +1,43 @@ +From c1a8a65a98eaee8543f103ad6f02435ccc3372ea Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 21 Jul 2023 15:45:50 -0700 +Subject: [PATCH] runtime-install: install rsvg-pixbuf-loader + +This was split out of librsvg2 as a subpackage recently, and +is only Recommended by the parent (not Required). For size's +sake, we don't pull Recommends into the installer env by +default. But we do really need this package, because quite a +lot of icons used in the installer are only present as SVGs in +the installer environment, so if we don't have the SVG loader we +can't show the icons. + +Right now anaconda actually crashes if the SVG renderer isn't +present, which wasn't an expected outcome, but even if the crash +is fixed, the result would be that anaconda would run but not +show a lot of icons, which obviously isn't what we want. So we +should add this regardless of a fix for the crash. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 15177467..7ceec8f8 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -105,6 +105,11 @@ installpkg kbd kbd-misc + ## required for anaconda-dracut (img-lib etc.) + installpkg tar xz curl bzip2 + ++## this is only recommended by librsvg2 since 2023-07, but in the ++## installer environment many icons used are only present as SVGs, ++## so we really need it ++installpkg rsvg-pixbuf-loader ++ + ## basic system stuff + installpkg systemd-sysv systemd-units + installpkg rsyslog +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index 423309a..dc7b019 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,9 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1334 +# Ensure we have SVG pixbuf loader now it's split out of librsvg2 +Patch0: 0001-runtime-install-install-rsvg-pixbuf-loader.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Sat Jul 22 2023 Adam Williamson - 39.2-4 +- Backport PR #1334 to fix installer with latest librsvg2 + * Thu Jul 20 2023 Fedora Release Engineering - 39.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From fd747053b96f391d94901a8191bccc1656f960ec Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 22 Jul 2023 12:52:12 -0700 Subject: [PATCH 149/203] Rebuild with no changes on a side tag to resolve test problems --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index dc7b019..2e773b8 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Sat Jul 22 2023 Adam Williamson - 39.2-5 +- Rebuild with no changes on a side tag to resolve test problems + * Sat Jul 22 2023 Adam Williamson - 39.2-4 - Backport PR #1334 to fix installer with latest librsvg2 From a8825f7a07b9a5230edd2f365bce19a7bc0a68c2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 7 Aug 2023 11:34:02 -0700 Subject: [PATCH 150/203] - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) - drop unneeded patch for rsvg-pixbuf-loader librsvg2 now Requires it --- .gitignore | 1 + ...e-install-install-rsvg-pixbuf-loader.patch | 43 ------------------- lorax.spec | 22 +++------- sources | 2 +- 4 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 0001-runtime-install-install-rsvg-pixbuf-loader.patch diff --git a/.gitignore b/.gitignore index e3411c8..3ec29b6 100644 --- a/.gitignore +++ b/.gitignore @@ -232,3 +232,4 @@ /lorax-39.0.tar.gz /lorax-39.1.tar.gz /lorax-39.2.tar.gz +/lorax-39.3.tar.gz diff --git a/0001-runtime-install-install-rsvg-pixbuf-loader.patch b/0001-runtime-install-install-rsvg-pixbuf-loader.patch deleted file mode 100644 index a2685d2..0000000 --- a/0001-runtime-install-install-rsvg-pixbuf-loader.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c1a8a65a98eaee8543f103ad6f02435ccc3372ea Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 21 Jul 2023 15:45:50 -0700 -Subject: [PATCH] runtime-install: install rsvg-pixbuf-loader - -This was split out of librsvg2 as a subpackage recently, and -is only Recommended by the parent (not Required). For size's -sake, we don't pull Recommends into the installer env by -default. But we do really need this package, because quite a -lot of icons used in the installer are only present as SVGs in -the installer environment, so if we don't have the SVG loader we -can't show the icons. - -Right now anaconda actually crashes if the SVG renderer isn't -present, which wasn't an expected outcome, but even if the crash -is fixed, the result would be that anaconda would run but not -show a lot of icons, which obviously isn't what we want. So we -should add this regardless of a fix for the crash. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 15177467..7ceec8f8 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -105,6 +105,11 @@ installpkg kbd kbd-misc - ## required for anaconda-dracut (img-lib etc.) - installpkg tar xz curl bzip2 - -+## this is only recommended by librsvg2 since 2023-07, but in the -+## installer environment many icons used are only present as SVGs, -+## so we really need it -+installpkg rsvg-pixbuf-loader -+ - ## basic system stuff - installpkg systemd-sysv systemd-units - installpkg rsyslog --- -2.41.0 - diff --git a/lorax.spec b/lorax.spec index 2e773b8..3685147 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 39.2 -Release: 5%{?dist} +Version: 39.3 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,9 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1334 -# Ensure we have SVG pixbuf loader now it's split out of librsvg2 -Patch0: 0001-runtime-install-install-rsvg-pixbuf-loader.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -171,17 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Sat Jul 22 2023 Adam Williamson - 39.2-5 -- Rebuild with no changes on a side tag to resolve test problems - -* Sat Jul 22 2023 Adam Williamson - 39.2-4 -- Backport PR #1334 to fix installer with latest librsvg2 - -* Thu Jul 20 2023 Fedora Release Engineering - 39.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jul 14 2023 Brian C. Lane - 39.2-2 -- plans: prepare is reported to be unneeded and causing issues +* Mon Aug 07 2023 Brian C. Lane 39.3-1 +- runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) +- drop unneeded patch for rsvg-pixbuf-loader + librsvg2 now Requires it * Fri Jul 14 2023 Brian C. Lane 39.2-1 - pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) diff --git a/sources b/sources index c141579..1f6abb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.2.tar.gz) = c3dbb812b06107e26e49d1d360b3f0808f640ebbf813d4a09b9088e6a447667791b8f8c9f5131703cb6e02313a467819f57ce0ce4732e5edab1fef784dfe5121 +SHA512 (lorax-39.3.tar.gz) = a6b964a877175b45068cc60ef5900af04c73e8a91f14745f4248f88263196a0a35f1b7c579f929f0c75ff5e5dac07f012387f1aac2f305c386b165c86d75301b From a90f84e9728e526b4fcc7a6482a7f018c433d61b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 9 Aug 2023 10:52:48 -0700 Subject: [PATCH 151/203] - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) - Revert "test_minimizer: dnf5 wants --use-host-config" (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3ec29b6..6052f23 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ /lorax-39.1.tar.gz /lorax-39.2.tar.gz /lorax-39.3.tar.gz +/lorax-39.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 3685147..bff53f5 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 39.3 +Version: 39.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,10 +168,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Aug 09 2023 Brian C. Lane 39.4-1 +- Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) +- Revert "test_minimizer: dnf5 wants --use-host-config" (bcl@redhat.com) + * Mon Aug 07 2023 Brian C. Lane 39.3-1 - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) -- drop unneeded patch for rsvg-pixbuf-loader - librsvg2 now Requires it * Fri Jul 14 2023 Brian C. Lane 39.2-1 - pylint: Ignore false positive from pylint on rawhide (bcl@redhat.com) diff --git a/sources b/sources index 1f6abb1..6b7a17a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.3.tar.gz) = a6b964a877175b45068cc60ef5900af04c73e8a91f14745f4248f88263196a0a35f1b7c579f929f0c75ff5e5dac07f012387f1aac2f305c386b165c86d75301b +SHA512 (lorax-39.4.tar.gz) = 647bedf8963dff626feef56423656da4eb4249a6a46093ee88c4acfdca0a5c895d1da0248c7bb919bd0d705f9426213bbcb878d94b4b57e218b2d427a6fa194d From f767483b9eca2254d79b25f4ee4aa6b13fca8286 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 28 Aug 2023 16:47:14 -0700 Subject: [PATCH 152/203] Backport PR #1338 to cut qcom firmwares and save space --- ...only-pull-in-qcom-firmware-on-aarch6.patch | 47 +++++++++++++++++++ lorax.spec | 9 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch diff --git a/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch b/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch new file mode 100644 index 0000000..39101c6 --- /dev/null +++ b/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch @@ -0,0 +1,47 @@ +From ecd5934d942b36733c9dcc44d5ba98aba2a1a526 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 11 Aug 2023 09:39:20 -0700 +Subject: [PATCH] runtime-install: only pull in qcom-firmware on aarch64 + +See https://bugzilla.redhat.com/show_bug.cgi?id=2178852 . This +should save a chunk of space on the installer images for x86_64. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 0ae8bb53..93b76fb4 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -28,6 +28,8 @@ installpkg grubby + ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 + ## bfa-firmware contains only obsolete files - see + ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202 ++ ## qcom-firmware we pull in again lower down but *only* on aarch64, it is ++ ## no use on other arches - https://bugzilla.redhat.com/show_bug.cgi?id=2178852 + ## various iwl package names were changed in linux-firmware-20230625-151 + ## so need to be excluded or else dnf gets sad - see + ## https://pagure.io/releng/issue/11511 . These exclusions can +@@ -53,7 +55,8 @@ installpkg grubby + --except iwlax2xx-firmware \ + --except libertas-sd8686-firmware --except libertas-sd8787-firmware \ + --except libertas-usb8388-firmware \ +- --except libertas-usb8388-olpc-firmware ++ --except libertas-usb8388-olpc-firmware \ ++ --except qcom-firmware + installpkg b43-openfwwf + %endif + +@@ -67,6 +70,7 @@ installpkg glibc-all-langpacks + installpkg grub2-tools>=${GRUB2VER} + installpkg shim-aa64 + installpkg uboot-tools ++ installpkg qcom-firmware + %endif + %if basearch == "x86_64": + installpkg grub2-tools-efi>=${GRUB2VER} +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index bff53f5..d967fcd 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,10 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1338 +# https://bugzilla.redhat.com/show_bug.cgi?id=2231605 +# cut qcom firmwares from x86_64 installer images to save space +Patch0: 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Aug 28 2023 Adam Williamson - 39.4-2 +- Backport PR #1338 to cut qcom firmwares and save space + * Wed Aug 09 2023 Brian C. Lane 39.4-1 - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) - Revert "test_minimizer: dnf5 wants --use-host-config" (bcl@redhat.com) From c2cce0630e110c06c7b4e8b4b9890c8a61e2c8a9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 7 Sep 2023 12:18:57 -0700 Subject: [PATCH 153/203] Backport PR #1344 to pull in required filesystem packages --- ...tly-pull-in-more-filesystem-packages.patch | 38 +++++++++++++++++++ lorax.spec | 9 ++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-Explicitly-pull-in-more-filesystem-packages.patch diff --git a/0001-Explicitly-pull-in-more-filesystem-packages.patch b/0001-Explicitly-pull-in-more-filesystem-packages.patch new file mode 100644 index 0000000..bc16f7f --- /dev/null +++ b/0001-Explicitly-pull-in-more-filesystem-packages.patch @@ -0,0 +1,38 @@ +From cce0772ac2807f85b6dbe53f5af86718cc3017e3 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 7 Sep 2023 12:04:54 -0700 +Subject: [PATCH] Explicitly pull in more filesystem packages + +Turns out we've been relying on udisks2 dependencies to pull in +several filesystem tools packages that anaconda actually needs +to create and read supported filesystems. udisks2 just changed +all those dependencies to Recommends, which don't get pulled +into the installer environment. So we need lorax to specifically +list all of these. e2fsprogs was already being pulled in through +some other dep chain, but let's explicitly list it just to make +sure we don't hit the same problem in future. From a look through +the blivet code, I don't think pulling in udftools, exfatprogs +or nilfs-utils will be useful, but we can check that with +@vojtechtrefny . + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 93b76fb4..38b1d0cd 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -118,7 +118,7 @@ installpkg systemd-sysv systemd-units + installpkg rsyslog + + ## filesystem tools +-installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs ++installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs dosfstools e2fsprogs f2fs-tools + installpkg system-storage-manager + installpkg device-mapper-persistent-data + installpkg xfsdump +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index d967fcd..58bdea1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 39.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -18,6 +18,10 @@ Source0: %{name}-%{version}.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=2231605 # cut qcom firmwares from x86_64 installer images to save space Patch0: 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch +# https://github.com/weldr/lorax/pull/1344 +# pull in filesystem tools packages we previously relied on udisks2 +# to pull in +Patch1: 0001-Explicitly-pull-in-more-filesystem-packages.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -172,6 +176,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Sep 07 2023 Adam Williamson - 39.4-3 +- Backport PR #1344 to pull in required filesystem packages + * Mon Aug 28 2023 Adam Williamson - 39.4-2 - Backport PR #1338 to cut qcom firmwares and save space From d8facf9fcbdd9b92d67ad78985a2bf4ee62f9b16 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 7 Sep 2023 15:23:18 -0700 Subject: [PATCH 154/203] - Drop patches included in new upstream tar - Explicitly pull in more filesystem packages (awilliam@redhat.com) - runtime-postinstall: Turn off lvm monitoring (bcl@redhat.com) - runtime-cleanup.tmpl: fix typo 'gschadow' (chris.riches@nutanix.com) - runtime-cleanup: Change how logo pixmaps is cleaned up (bcl@redhat.com) - runtime-install: only pull in qcom-firmware on aarch64 (awilliam@redhat.com) --- .gitignore | 1 + ...tly-pull-in-more-filesystem-packages.patch | 38 --------------- ...only-pull-in-qcom-firmware-on-aarch6.patch | 47 ------------------- lorax.spec | 23 ++++----- sources | 2 +- 5 files changed, 10 insertions(+), 101 deletions(-) delete mode 100644 0001-Explicitly-pull-in-more-filesystem-packages.patch delete mode 100644 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch diff --git a/.gitignore b/.gitignore index 6052f23..7b9d25d 100644 --- a/.gitignore +++ b/.gitignore @@ -234,3 +234,4 @@ /lorax-39.2.tar.gz /lorax-39.3.tar.gz /lorax-39.4.tar.gz +/lorax-39.5.tar.gz diff --git a/0001-Explicitly-pull-in-more-filesystem-packages.patch b/0001-Explicitly-pull-in-more-filesystem-packages.patch deleted file mode 100644 index bc16f7f..0000000 --- a/0001-Explicitly-pull-in-more-filesystem-packages.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cce0772ac2807f85b6dbe53f5af86718cc3017e3 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 7 Sep 2023 12:04:54 -0700 -Subject: [PATCH] Explicitly pull in more filesystem packages - -Turns out we've been relying on udisks2 dependencies to pull in -several filesystem tools packages that anaconda actually needs -to create and read supported filesystems. udisks2 just changed -all those dependencies to Recommends, which don't get pulled -into the installer environment. So we need lorax to specifically -list all of these. e2fsprogs was already being pulled in through -some other dep chain, but let's explicitly list it just to make -sure we don't hit the same problem in future. From a look through -the blivet code, I don't think pulling in udftools, exfatprogs -or nilfs-utils will be useful, but we can check that with -@vojtechtrefny . - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 93b76fb4..38b1d0cd 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -118,7 +118,7 @@ installpkg systemd-sysv systemd-units - installpkg rsyslog - - ## filesystem tools --installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs -+installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs dosfstools e2fsprogs f2fs-tools - installpkg system-storage-manager - installpkg device-mapper-persistent-data - installpkg xfsdump --- -2.41.0 - diff --git a/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch b/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch deleted file mode 100644 index 39101c6..0000000 --- a/0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ecd5934d942b36733c9dcc44d5ba98aba2a1a526 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 11 Aug 2023 09:39:20 -0700 -Subject: [PATCH] runtime-install: only pull in qcom-firmware on aarch64 - -See https://bugzilla.redhat.com/show_bug.cgi?id=2178852 . This -should save a chunk of space on the installer images for x86_64. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 0ae8bb53..93b76fb4 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -28,6 +28,8 @@ installpkg grubby - ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 - ## bfa-firmware contains only obsolete files - see - ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202 -+ ## qcom-firmware we pull in again lower down but *only* on aarch64, it is -+ ## no use on other arches - https://bugzilla.redhat.com/show_bug.cgi?id=2178852 - ## various iwl package names were changed in linux-firmware-20230625-151 - ## so need to be excluded or else dnf gets sad - see - ## https://pagure.io/releng/issue/11511 . These exclusions can -@@ -53,7 +55,8 @@ installpkg grubby - --except iwlax2xx-firmware \ - --except libertas-sd8686-firmware --except libertas-sd8787-firmware \ - --except libertas-usb8388-firmware \ -- --except libertas-usb8388-olpc-firmware -+ --except libertas-usb8388-olpc-firmware \ -+ --except qcom-firmware - installpkg b43-openfwwf - %endif - -@@ -67,6 +70,7 @@ installpkg glibc-all-langpacks - installpkg grub2-tools>=${GRUB2VER} - installpkg shim-aa64 - installpkg uboot-tools -+ installpkg qcom-firmware - %endif - %if basearch == "x86_64": - installpkg grub2-tools-efi>=${GRUB2VER} --- -2.41.0 - diff --git a/lorax.spec b/lorax.spec index 58bdea1..67fb437 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 39.4 -Release: 3%{?dist} +Version: 39.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,14 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1338 -# https://bugzilla.redhat.com/show_bug.cgi?id=2231605 -# cut qcom firmwares from x86_64 installer images to save space -Patch0: 0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch -# https://github.com/weldr/lorax/pull/1344 -# pull in filesystem tools packages we previously relied on udisks2 -# to pull in -Patch1: 0001-Explicitly-pull-in-more-filesystem-packages.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -176,11 +168,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Sep 07 2023 Adam Williamson - 39.4-3 -- Backport PR #1344 to pull in required filesystem packages - -* Mon Aug 28 2023 Adam Williamson - 39.4-2 -- Backport PR #1338 to cut qcom firmwares and save space +* Thu Sep 07 2023 Brian C. Lane 39.5-1 +- Explicitly pull in more filesystem packages (awilliam@redhat.com) +- runtime-postinstall: Turn off lvm monitoring (bcl@redhat.com) +- runtime-cleanup.tmpl: fix typo 'gschadow' (chris.riches@nutanix.com) +- runtime-cleanup: Change how logo pixmaps is cleaned up (bcl@redhat.com) +- runtime-install: only pull in qcom-firmware on aarch64 (awilliam@redhat.com) * Wed Aug 09 2023 Brian C. Lane 39.4-1 - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) diff --git a/sources b/sources index 6b7a17a..e867396 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.4.tar.gz) = 647bedf8963dff626feef56423656da4eb4249a6a46093ee88c4acfdca0a5c895d1da0248c7bb919bd0d705f9426213bbcb878d94b4b57e218b2d427a6fa194d +SHA512 (lorax-39.5.tar.gz) = 90f18266797fa446175d2e5836126f3bd7d48f094ca0c9ee8da5cab4dbb04262a14374c5193f4b24e62731f9cd7f156c032d890ca48b30a6457c98975de9ee3b From 33a2023416abcf8cca0f2669206212504b44b6c1 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 2 Oct 2023 12:15:28 -0700 Subject: [PATCH 155/203] - Remove some unneccessary storage packages from runtime-install (vtrefny@redhat.com) - Do not install polkit-gnome for blivet-gui (vtrefny@redhat.com) - docs: Update the quickstart example command (vtrefny@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7b9d25d..cc6241f 100644 --- a/.gitignore +++ b/.gitignore @@ -235,3 +235,4 @@ /lorax-39.3.tar.gz /lorax-39.4.tar.gz /lorax-39.5.tar.gz +/lorax-40.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 67fb437..42b4304 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 39.5 +Version: 40.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Oct 02 2023 Brian C. Lane 40.0-1 +- Remove some unneccessary storage packages from runtime-install (vtrefny@redhat.com) +- Do not install polkit-gnome for blivet-gui (vtrefny@redhat.com) +- docs: Update the quickstart example command (vtrefny@redhat.com) + * Thu Sep 07 2023 Brian C. Lane 39.5-1 - Explicitly pull in more filesystem packages (awilliam@redhat.com) - runtime-postinstall: Turn off lvm monitoring (bcl@redhat.com) diff --git a/sources b/sources index e867396..27ca224 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-39.5.tar.gz) = 90f18266797fa446175d2e5836126f3bd7d48f094ca0c9ee8da5cab4dbb04262a14374c5193f4b24e62731f9cd7f156c032d890ca48b30a6457c98975de9ee3b +SHA512 (lorax-40.0.tar.gz) = 8c79702f76ccc422d3c938ac7af0471a61c2d23e4441a6f3db4f3ae5653c40aa3800442b2ced6e195396909757f82ab74880ce845b0dc8098849f1968153f24f From 4644d11f69178c00207f087c15fe9a8128849ddc Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 11 Dec 2023 08:34:40 -0800 Subject: [PATCH 156/203] - ltmpl: Filter out other arches, clean up naming (bcl@redhat.com) - test: Add pigz to test-packages (bcl@redhat.com) - dnfbase: Fix url substitution support (bcl@redhat.com) - ltmpl: Add transaction error handling (bcl@redhat.com) - test-packages: Make sure python3-libdnf5 is installed (bcl@redhat.com) - Updates for latest libdnf5 changes (bcl@redhat.com) - spec: Switch to using python3-libdnf5 (bcl@redhat.com) - Fix writing out debug info for package files and sizes (bcl@redhat.com) - libdnf5: Switch lorax to use libdnf5 (bcl@redhat.com) - Add python3-libdnf5 to the list of test packages (bcl@redhat.com) - Adjust runtime-postinstall.tmpl for systemd config files move (zbyszek@in.waw.pl) --- .gitignore | 1 + lorax.spec | 17 +++++++++++++++-- sources | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cc6241f..fc8df17 100644 --- a/.gitignore +++ b/.gitignore @@ -236,3 +236,4 @@ /lorax-39.4.tar.gz /lorax-39.5.tar.gz /lorax-40.0.tar.gz +/lorax-40.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 42b4304..dc97093 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.0 +Version: 40.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -50,7 +50,7 @@ Requires: psmisc Requires: libselinux-python3 Requires: python3-mako Requires: python3-kickstart >= 3.19 -Requires: python3-dnf >= 3.2.0 +Requires: python3-libdnf5 Requires: python3-librepo Requires: python3-pycdio @@ -168,6 +168,19 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Dec 11 2023 Brian C. Lane 40.1-1 +- ltmpl: Filter out other arches, clean up naming (bcl@redhat.com) +- test: Add pigz to test-packages (bcl@redhat.com) +- dnfbase: Fix url substitution support (bcl@redhat.com) +- ltmpl: Add transaction error handling (bcl@redhat.com) +- test-packages: Make sure python3-libdnf5 is installed (bcl@redhat.com) +- Updates for latest libdnf5 changes (bcl@redhat.com) +- spec: Switch to using python3-libdnf5 (bcl@redhat.com) +- Fix writing out debug info for package files and sizes (bcl@redhat.com) +- libdnf5: Switch lorax to use libdnf5 (bcl@redhat.com) +- Add python3-libdnf5 to the list of test packages (bcl@redhat.com) +- Adjust runtime-postinstall.tmpl for systemd config files move (zbyszek@in.waw.pl) + * Mon Oct 02 2023 Brian C. Lane 40.0-1 - Remove some unneccessary storage packages from runtime-install (vtrefny@redhat.com) - Do not install polkit-gnome for blivet-gui (vtrefny@redhat.com) diff --git a/sources b/sources index 27ca224..78f3270 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.0.tar.gz) = 8c79702f76ccc422d3c938ac7af0471a61c2d23e4441a6f3db4f3ae5653c40aa3800442b2ced6e195396909757f82ab74880ce845b0dc8098849f1968153f24f +SHA512 (lorax-40.1.tar.gz) = c96c8b8d0752e06b327283f9c2d5e9ebc7587d60a75d7533e3f96ed38742f6e3035d0cbcf3fbd226e339d32640a01d029c0b1c059b13983c383fde65d5d40baf From 000be11ded38711c23f101c7ac40eeb8e65cd40e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 12 Dec 2023 10:58:47 -0800 Subject: [PATCH 157/203] - ltmpl: Remove duplicate package objects from dnf5 results (bcl@redhat.com) - test-in-podman: Fix problem running in github actions (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fc8df17..eb8e631 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,4 @@ /lorax-39.5.tar.gz /lorax-40.0.tar.gz /lorax-40.1.tar.gz +/lorax-40.2.tar.gz diff --git a/lorax.spec b/lorax.spec index dc97093..00594fc 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.1 +Version: 40.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 12 2023 Brian C. Lane 40.2-1 +- ltmpl: Remove duplicate package objects from dnf5 results (bcl@redhat.com) +- test-in-podman: Fix problem running in github actions (bcl@redhat.com) + * Mon Dec 11 2023 Brian C. Lane 40.1-1 - ltmpl: Filter out other arches, clean up naming (bcl@redhat.com) - test: Add pigz to test-packages (bcl@redhat.com) diff --git a/sources b/sources index 78f3270..d51d7d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.1.tar.gz) = c96c8b8d0752e06b327283f9c2d5e9ebc7587d60a75d7533e3f96ed38742f6e3035d0cbcf3fbd226e339d32640a01d029c0b1c059b13983c383fde65d5d40baf +SHA512 (lorax-40.2.tar.gz) = ccb91397e44c121af39e3ca483fe12ab82c337252cccdc1fb8161c1b39b97f55d7afc4339190c98003246ce7090f579e49b0aa2c344e43b7e846328ad5bf679f From 8315b760b8fd0b056c7bd1ac7054b0dd0c2f4297 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 20 Dec 2023 07:50:55 -0800 Subject: [PATCH 158/203] - runtime-install: Work around problem with conflicting packages (bcl@redhat.com) - ltmpl: Check for errors after running the transaction (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eb8e631..a428d6a 100644 --- a/.gitignore +++ b/.gitignore @@ -238,3 +238,4 @@ /lorax-40.0.tar.gz /lorax-40.1.tar.gz /lorax-40.2.tar.gz +/lorax-40.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 00594fc..638161d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.2 +Version: 40.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Dec 20 2023 Brian C. Lane 40.3-1 +- runtime-install: Work around problem with conflicting packages (bcl@redhat.com) +- ltmpl: Check for errors after running the transaction (bcl@redhat.com) + * Tue Dec 12 2023 Brian C. Lane 40.2-1 - ltmpl: Remove duplicate package objects from dnf5 results (bcl@redhat.com) - test-in-podman: Fix problem running in github actions (bcl@redhat.com) diff --git a/sources b/sources index d51d7d4..3742bf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.2.tar.gz) = ccb91397e44c121af39e3ca483fe12ab82c337252cccdc1fb8161c1b39b97f55d7afc4339190c98003246ce7090f579e49b0aa2c344e43b7e846328ad5bf679f +SHA512 (lorax-40.3.tar.gz) = 169748add00cf2a4644abdf3b7157af3fbe30b0058c36b6746eb347737947e3e4faf93048a43e97c5f9c3243bb08144eb360214d36d3429d67da985df11993e8 From c16e84674fa13346bbb64fcb8b5e99cc5906e518 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:13:00 +0000 Subject: [PATCH 159/203] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 638161d..2f3cdf4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 40.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Dec 20 2023 Brian C. Lane 40.3-1 - runtime-install: Work around problem with conflicting packages (bcl@redhat.com) - ltmpl: Check for errors after running the transaction (bcl@redhat.com) From e7bb19d0c67a4d61c3d838e923d0c0b169bb07b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 04:44:44 +0000 Subject: [PATCH 160/203] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 2f3cdf4..7e7e8c2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -168,6 +168,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 40.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 40.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 15237f8b2f872937ea09865f6d95055cdd35eb17 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 26 Jan 2024 11:47:29 -0800 Subject: [PATCH 161/203] Backport PR #1370 to handle wget being replaced by wget2-wget --- ...install-wget2-wget-has-replaced-wget.patch | 31 +++++++++++++++++++ lorax.spec | 9 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-wget2-wget-has-replaced-wget.patch diff --git a/0001-runtime-install-wget2-wget-has-replaced-wget.patch b/0001-runtime-install-wget2-wget-has-replaced-wget.patch new file mode 100644 index 0000000..ff1bc4c --- /dev/null +++ b/0001-runtime-install-wget2-wget-has-replaced-wget.patch @@ -0,0 +1,31 @@ +From 0476a77915f678846f446f819c5fec66f2997386 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 26 Jan 2024 11:19:59 -0800 +Subject: [PATCH] runtime-install: wget2-wget has replaced wget + +wget has been retired: +https://src.fedoraproject.org/rpms/wget/c/ce69c17 +in favor of wget2-wget: +https://fedoraproject.org/wiki/Changes/Wget2asWget + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index d6029830..80213366 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -184,7 +184,7 @@ installpkg python3-pyatspi + ## extra tools not required by anaconda + installpkg nano nano-default-editor + installpkg vim-minimal strace lsof dump xz less +-installpkg wget rsync bind-utils ftp mtr vconfig ++installpkg wget2-wget rsync bind-utils ftp mtr vconfig + installpkg spice-vdagent + installpkg gdisk hexedit sg3_utils + +-- +2.43.0 + diff --git a/lorax.spec b/lorax.spec index 7e7e8c2..762c1db 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,6 +15,10 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1370 +# wget replaced by wget2-wget +Patch: 0001-runtime-install-wget2-wget-has-replaced-wget.patch + BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jan 26 2024 Adam Williamson - 40.3-4 +- Backport PR #1370 to handle wget being replaced by wget2-wget + * Thu Jan 25 2024 Fedora Release Engineering - 40.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cae9bc7940489740c7b03e52d4ec80fc721156db Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 29 Jan 2024 10:08:54 -0800 Subject: [PATCH 162/203] Backport PR #1371 to handle pcmciautils being retired --- ...ime-install-drop-retired-pcmciautils.patch | 30 +++++++++++++++++++ lorax.spec | 8 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-drop-retired-pcmciautils.patch diff --git a/0001-runtime-install-drop-retired-pcmciautils.patch b/0001-runtime-install-drop-retired-pcmciautils.patch new file mode 100644 index 0000000..451abbd --- /dev/null +++ b/0001-runtime-install-drop-retired-pcmciautils.patch @@ -0,0 +1,30 @@ +From de364416f3034d5e6382de5453facd0032a760c1 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Mon, 29 Jan 2024 09:41:43 -0800 +Subject: [PATCH] runtime-install: drop retired pcmciautils + +pcmciautils was just retired in Rawhide: +https://src.fedoraproject.org/rpms/pcmciautils/c/24639b0 + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index d6029830..904c42ba 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -141,9 +141,6 @@ installpkg nmap-ncat + installpkg pciutils usbutils ipmitool + installpkg mt-st smartmontools + installpkg hdparm +-%if basearch not in ("aarch64", "ppc64le", "s390x"): +-installpkg pcmciautils +-%endif + installpkg rdma-core + installpkg rng-tools + %if basearch in ("x86_64", "aarch64"): +-- +2.43.0 + diff --git a/lorax.spec b/lorax.spec index 762c1db..218f053 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -18,6 +18,9 @@ Source0: %{name}-%{version}.tar.gz # https://github.com/weldr/lorax/pull/1370 # wget replaced by wget2-wget Patch: 0001-runtime-install-wget2-wget-has-replaced-wget.patch +# https://github.com/weldr/lorax/pull/1371 +# pcmciautils retired +Patch: 0001-runtime-install-drop-retired-pcmciautils.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -172,6 +175,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Jan 29 2024 Adam Williamson - 40.3-5 +- Backport PR #1371 to handle pcmciautils being retired + * Fri Jan 26 2024 Adam Williamson - 40.3-4 - Backport PR #1370 to handle wget being replaced by wget2-wget From f383438923a98a39e5f8418e48f0ebc170c54894 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 1 Feb 2024 17:56:56 -0800 Subject: [PATCH 163/203] - Remove patches included in this release - Add testing of the new mkksiso --updates command to run_tests.sh - mkksiso: Add support for adding an anaconda updates.img (jkonecny@redhat.com) - runtime-install: drop kdump-anaconda-addon (awilliam@redhat.com) - ltmpl: Handle installing provides with resolve_pkg_spec (bcl@redhat.com) - s390: Escape volid before using it (bcl@redhat.com) - aarch64: Escape volid before using it (bcl@redhat.com) - runtime-install: drop retired pcmciautils (awilliam@redhat.com) - runtime-install: wget2-wget has replaced wget (awilliam@redhat.com) - runtime-cleanup: anaconda's new interface needs stdbuf (kkoukiou@redhat.com) - ltmpl: Pass packages to add_rpm_install as strings (bcl@redhat.com) --- .gitignore | 1 + ...ime-install-drop-retired-pcmciautils.patch | 30 ----------------- ...install-wget2-wget-has-replaced-wget.patch | 31 ------------------ lorax.spec | 32 +++++++------------ sources | 2 +- tests/scripts/run_tests.sh | 29 +++++++++++++++-- 6 files changed, 40 insertions(+), 85 deletions(-) delete mode 100644 0001-runtime-install-drop-retired-pcmciautils.patch delete mode 100644 0001-runtime-install-wget2-wget-has-replaced-wget.patch diff --git a/.gitignore b/.gitignore index a428d6a..37948aa 100644 --- a/.gitignore +++ b/.gitignore @@ -239,3 +239,4 @@ /lorax-40.1.tar.gz /lorax-40.2.tar.gz /lorax-40.3.tar.gz +/lorax-40.4.tar.gz diff --git a/0001-runtime-install-drop-retired-pcmciautils.patch b/0001-runtime-install-drop-retired-pcmciautils.patch deleted file mode 100644 index 451abbd..0000000 --- a/0001-runtime-install-drop-retired-pcmciautils.patch +++ /dev/null @@ -1,30 +0,0 @@ -From de364416f3034d5e6382de5453facd0032a760c1 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Mon, 29 Jan 2024 09:41:43 -0800 -Subject: [PATCH] runtime-install: drop retired pcmciautils - -pcmciautils was just retired in Rawhide: -https://src.fedoraproject.org/rpms/pcmciautils/c/24639b0 - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index d6029830..904c42ba 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -141,9 +141,6 @@ installpkg nmap-ncat - installpkg pciutils usbutils ipmitool - installpkg mt-st smartmontools - installpkg hdparm --%if basearch not in ("aarch64", "ppc64le", "s390x"): --installpkg pcmciautils --%endif - installpkg rdma-core - installpkg rng-tools - %if basearch in ("x86_64", "aarch64"): --- -2.43.0 - diff --git a/0001-runtime-install-wget2-wget-has-replaced-wget.patch b/0001-runtime-install-wget2-wget-has-replaced-wget.patch deleted file mode 100644 index ff1bc4c..0000000 --- a/0001-runtime-install-wget2-wget-has-replaced-wget.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0476a77915f678846f446f819c5fec66f2997386 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 26 Jan 2024 11:19:59 -0800 -Subject: [PATCH] runtime-install: wget2-wget has replaced wget - -wget has been retired: -https://src.fedoraproject.org/rpms/wget/c/ce69c17 -in favor of wget2-wget: -https://fedoraproject.org/wiki/Changes/Wget2asWget - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index d6029830..80213366 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -184,7 +184,7 @@ installpkg python3-pyatspi - ## extra tools not required by anaconda - installpkg nano nano-default-editor - installpkg vim-minimal strace lsof dump xz less --installpkg wget rsync bind-utils ftp mtr vconfig -+installpkg wget2-wget rsync bind-utils ftp mtr vconfig - installpkg spice-vdagent - installpkg gdisk hexedit sg3_utils - --- -2.43.0 - diff --git a/lorax.spec b/lorax.spec index 218f053..ebc3119 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 40.3 -Release: 5%{?dist} +Version: 40.4 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,13 +15,6 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1370 -# wget replaced by wget2-wget -Patch: 0001-runtime-install-wget2-wget-has-replaced-wget.patch -# https://github.com/weldr/lorax/pull/1371 -# pcmciautils retired -Patch: 0001-runtime-install-drop-retired-pcmciautils.patch - BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make @@ -175,17 +168,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Mon Jan 29 2024 Adam Williamson - 40.3-5 -- Backport PR #1371 to handle pcmciautils being retired - -* Fri Jan 26 2024 Adam Williamson - 40.3-4 -- Backport PR #1370 to handle wget being replaced by wget2-wget - -* Thu Jan 25 2024 Fedora Release Engineering - 40.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 40.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Thu Feb 01 2024 Brian C. Lane 40.4-1 +- mkksiso: Add support for adding an anaconda updates.img (jkonecny@redhat.com) +- runtime-install: drop kdump-anaconda-addon (awilliam@redhat.com) +- ltmpl: Handle installing provides with resolve_pkg_spec (bcl@redhat.com) +- s390: Escape volid before using it (bcl@redhat.com) +- aarch64: Escape volid before using it (bcl@redhat.com) +- runtime-install: drop retired pcmciautils (awilliam@redhat.com) +- runtime-install: wget2-wget has replaced wget (awilliam@redhat.com) +- runtime-cleanup: anaconda's new interface needs stdbuf (kkoukiou@redhat.com) +- ltmpl: Pass packages to add_rpm_install as strings (bcl@redhat.com) * Wed Dec 20 2023 Brian C. Lane 40.3-1 - runtime-install: Work around problem with conflicting packages (bcl@redhat.com) diff --git a/sources b/sources index 3742bf5..4c280f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.3.tar.gz) = 169748add00cf2a4644abdf3b7157af3fbe30b0058c36b6746eb347737947e3e4faf93048a43e97c5f9c3243bb08144eb360214d36d3429d67da985df11993e8 +SHA512 (lorax-40.4.tar.gz) = 65ac3451123b869d649c3b788b9ec0b2560052e553c969c5228fe42969beb8685678501ce9b7df57a6263dc0f1e90fb0a69f9e689c1ea86fd7588c19a322a6e2 diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 3559b7d..ce3c4ed 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -177,22 +177,42 @@ function test_two_kickstarts { status "Test two kickstart error" } - function test_files { [ -e "$ISODIR/services" ] || fail "Missing file from iso" } +# Test adding an updates.img file +function add_updatesimg { + running "Add updates.img" + + # nothing in the file, just test that it is there + touch /tmp/test-updates.img + mkksiso -u /tmp/test-updates.img $BOOTISO $OUTISO || exit 1 + mount $OUTISO $ISODIR || exit 1 + + test_updatesimg + + status "Add updates.img" + umount_dirs +} + +function test_updatesimg { + [ -e "$ISODIR/updates/updates.img" ] || fail "Missing file from iso" +} + # All of the changes function run_all { running "Use all the options" - mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 + touch /tmp/test-updates.img + mkksiso -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks test_serial test_volid test_files + test_updatesimg test_quiet status "Use all the options" @@ -204,13 +224,15 @@ function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - su - lorax-ted -c "mkksiso --skip-mkefiboot -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + touch /tmp/test-updates.img + su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks test_serial test_volid test_files + test_updatesimg test_quiet status "Use all the options as a user with --skip-mkefiboot" @@ -243,6 +265,7 @@ new_volid add_files remove_quiet test_two_kickstarts +add_updatesimg run_all run_as_user From 92d48103274856fa7507175a32fe02006019fc42 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 6 Feb 2024 17:39:26 -0800 Subject: [PATCH 164/203] - New lorax documentation - 40.5 (bcl@redhat.com) - maint: Switch default platform to F40 (bcl@redhat.com) - runtime-cleanup: Update to cleanup more (akira@tagoh.org) - runtime-install: Update font packages (akira@tagoh.org) --- .gitignore | 1 + lorax.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 37948aa..1239f0f 100644 --- a/.gitignore +++ b/.gitignore @@ -240,3 +240,4 @@ /lorax-40.2.tar.gz /lorax-40.3.tar.gz /lorax-40.4.tar.gz +/lorax-40.5.tar.gz diff --git a/lorax.spec b/lorax.spec index ebc3119..ccea480 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.4 +Version: 40.5 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Feb 06 2024 Brian C. Lane 40.5-1 +- New lorax documentation - 40.5 (bcl@redhat.com) +- maint: Switch default platform to F40 (bcl@redhat.com) +- runtime-cleanup: Update to cleanup more (akira@tagoh.org) +- runtime-install: Update font packages (akira@tagoh.org) + * Thu Feb 01 2024 Brian C. Lane 40.4-1 - mkksiso: Add support for adding an anaconda updates.img (jkonecny@redhat.com) - runtime-install: drop kdump-anaconda-addon (awilliam@redhat.com) diff --git a/sources b/sources index 4c280f5..d830c50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.4.tar.gz) = 65ac3451123b869d649c3b788b9ec0b2560052e553c969c5228fe42969beb8685678501ce9b7df57a6263dc0f1e90fb0a69f9e689c1ea86fd7588c19a322a6e2 +SHA512 (lorax-40.5.tar.gz) = 60c17bf48f9074b6be77424c66505de6e382d95bf6fed8dfc34847248cbf15287f240eb2dd631dded5e1b57ec71c496feca0dca86312e569c106c48219e09f3b From 8e01fdddc747ad0387b86ef0bb661a8955562a19 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 14 Feb 2024 00:05:20 -0800 Subject: [PATCH 165/203] Backport PR #1379 to fix builds when a repo uses %releasever --- ...releasever-in-the-base-object-s-vars.patch | 42 +++++++++++++++++++ lorax.spec | 9 +++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-dnf5-set-releasever-in-the-base-object-s-vars.patch diff --git a/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch b/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch new file mode 100644 index 0000000..85804d2 --- /dev/null +++ b/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch @@ -0,0 +1,42 @@ +From acee48ff0375416973f6f9978370ced2eb52c88e Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 13 Feb 2024 23:53:59 -0800 +Subject: [PATCH] dnf5: set releasever in the base object's vars + +With Fedora 40 now branched, openQA installer build tests started +failing with an error: + + RuntimeError: cannot open file: (2) - No such file or directory [/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-x86_64] + +it seems like setting releasever via set_substitutions just does +not fully work as expected, and libdnf goes looking for a file +with a literal `$releasever` in it based on the gpgkey line in +the repo file. Though it seems like the releasever substitution +must work to *some* extent because we at least manage to resolve +and download packages before the failure. + +This seems to fix it, anyhow, and is based on code from libdnf5 +itself in dnf5/main.cpp RootCommand::set_argument_parser() . + +Signed-off-by: Adam Williamson +--- + src/pylorax/dnfbase.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/pylorax/dnfbase.py b/src/pylorax/dnfbase.py +index 3987e4f7..e6a1c6d8 100644 +--- a/src/pylorax/dnfbase.py ++++ b/src/pylorax/dnfbase.py +@@ -153,6 +153,9 @@ def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, + log.info("Using %s for module_platform_id", platform_id) + conf.module_platform_id = platform_id + ++ # set releasever ++ dnfbase.get_vars().set("releasever", releasever) ++ + # Add .repo files + if repos: + reposdir = os.path.join(tempdir, "dnf.repos") +-- +2.43.0 + diff --git a/lorax.spec b/lorax.spec index ccea480..b1f8b2c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,6 +15,10 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1379 +# Fix builds when using a repo file with $releasever +Patch0: 0001-dnf5-set-releasever-in-the-base-object-s-vars.patch + BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Feb 14 2024 Adam Williamson - 40.5-2 +- Backport PR #1379 to fix builds when a repo uses %releasever + * Tue Feb 06 2024 Brian C. Lane 40.5-1 - New lorax documentation - 40.5 (bcl@redhat.com) - maint: Switch default platform to F40 (bcl@redhat.com) From 0fa02ec972b2b268fa59e9fe593f26998cf8141c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 19 Feb 2024 11:36:11 -0800 Subject: [PATCH 166/203] - Add example use of lmc in github actions. (cjshowalter@alaska.edu) - Require lorax-templates-rhel when building for ELN, CentOS Stream and RHEL (sgallagh@redhat.com) - workflows: Switch to actions/checkout@v4 (bcl@redhat.com) - dnfbase: Fix substitutions (bcl@redhat.com) --- .gitignore | 1 + ...releasever-in-the-base-object-s-vars.patch | 42 ------------------- lorax.spec | 18 ++++---- sources | 2 +- 4 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 0001-dnf5-set-releasever-in-the-base-object-s-vars.patch diff --git a/.gitignore b/.gitignore index 1239f0f..9dcd8a7 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,4 @@ /lorax-40.3.tar.gz /lorax-40.4.tar.gz /lorax-40.5.tar.gz +/lorax-40.6.tar.gz diff --git a/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch b/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch deleted file mode 100644 index 85804d2..0000000 --- a/0001-dnf5-set-releasever-in-the-base-object-s-vars.patch +++ /dev/null @@ -1,42 +0,0 @@ -From acee48ff0375416973f6f9978370ced2eb52c88e Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 13 Feb 2024 23:53:59 -0800 -Subject: [PATCH] dnf5: set releasever in the base object's vars - -With Fedora 40 now branched, openQA installer build tests started -failing with an error: - - RuntimeError: cannot open file: (2) - No such file or directory [/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-x86_64] - -it seems like setting releasever via set_substitutions just does -not fully work as expected, and libdnf goes looking for a file -with a literal `$releasever` in it based on the gpgkey line in -the repo file. Though it seems like the releasever substitution -must work to *some* extent because we at least manage to resolve -and download packages before the failure. - -This seems to fix it, anyhow, and is based on code from libdnf5 -itself in dnf5/main.cpp RootCommand::set_argument_parser() . - -Signed-off-by: Adam Williamson ---- - src/pylorax/dnfbase.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/pylorax/dnfbase.py b/src/pylorax/dnfbase.py -index 3987e4f7..e6a1c6d8 100644 ---- a/src/pylorax/dnfbase.py -+++ b/src/pylorax/dnfbase.py -@@ -153,6 +153,9 @@ def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, - log.info("Using %s for module_platform_id", platform_id) - conf.module_platform_id = platform_id - -+ # set releasever -+ dnfbase.get_vars().set("releasever", releasever) -+ - # Add .repo files - if repos: - reposdir = os.path.join(tempdir, "dnf.repos") --- -2.43.0 - diff --git a/lorax.spec b/lorax.spec index b1f8b2c..3a87f04 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 40.5 -Release: 2%{?dist} +Version: 40.6 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,16 +15,15 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1379 -# Fix builds when using a repo file with $releasever -Patch0: 0001-dnf5-set-releasever-in-the-base-object-s-vars.patch - BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros Requires: lorax-templates +%if 0%{?rhel} >= 9 +Requires: lorax-templates-rhel +%endif Requires: cpio Requires: device-mapper @@ -172,8 +171,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Wed Feb 14 2024 Adam Williamson - 40.5-2 -- Backport PR #1379 to fix builds when a repo uses %releasever +* Mon Feb 19 2024 Brian C. Lane +- Add example use of lmc in github actions. (cjshowalter@alaska.edu) +- Require lorax-templates-rhel when building for ELN, CentOS Stream and RHEL (sgallagh@redhat.com) +- workflows: Switch to actions/checkout@v4 (bcl@redhat.com) +- dnfbase: Fix substitutions (bcl@redhat.com) * Tue Feb 06 2024 Brian C. Lane 40.5-1 - New lorax documentation - 40.5 (bcl@redhat.com) diff --git a/sources b/sources index d830c50..f5a1c9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.5.tar.gz) = 60c17bf48f9074b6be77424c66505de6e382d95bf6fed8dfc34847248cbf15287f240eb2dd631dded5e1b57ec71c496feca0dca86312e569c106c48219e09f3b +SHA512 (lorax-40.6.tar.gz) = 0548576ae188aa875a7bd0d87e4dda6afe529b859ffe0d9ec380e173b1439c52c45a79b3568f23eef9a10baa13f502aba0bb269f0dcc24e268957e26f93cb577 From 33f6cab8ceab1d83752aa7c1875b023b7fbfb30f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 15 Mar 2024 12:56:31 -0700 Subject: [PATCH 167/203] - maint: Switch default platform to F41 (bcl@redhat.com) - Add prefixdevname support to the boot.iso (rvykydal@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9dcd8a7..3ec552b 100644 --- a/.gitignore +++ b/.gitignore @@ -242,3 +242,4 @@ /lorax-40.4.tar.gz /lorax-40.5.tar.gz /lorax-40.6.tar.gz +/lorax-41.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 3a87f04..0f6f888 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 40.6 +Version: 41.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -171,6 +171,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Mar 15 2024 Brian C. Lane +- maint: Switch default platform to F41 (bcl@redhat.com) +- Add prefixdevname support to the boot.iso (rvykydal@redhat.com) + * Mon Feb 19 2024 Brian C. Lane - Add example use of lmc in github actions. (cjshowalter@alaska.edu) - Require lorax-templates-rhel when building for ELN, CentOS Stream and RHEL (sgallagh@redhat.com) diff --git a/sources b/sources index f5a1c9f..c68dd36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-40.6.tar.gz) = 0548576ae188aa875a7bd0d87e4dda6afe529b859ffe0d9ec380e173b1439c52c45a79b3568f23eef9a10baa13f502aba0bb269f0dcc24e268957e26f93cb577 +SHA512 (lorax-41.0.tar.gz) = 3c8d1d5a6fe3c7f288e3010006ef401172e802da883e71b55de8358a567ceb01c69c99b52fef3eadaf82640b99dba753ad3271171ae50189f8c2dd4b563bc436 From 245c76bc3498b757c3bc8e69462393a65fed3bed Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:32:43 +0200 Subject: [PATCH 168/203] Rebuilt for Python 3.13 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 0f6f888..41c9ae6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 41.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jun 07 2024 Python Maint - 41.0-2 +- Rebuilt for Python 3.13 + * Fri Mar 15 2024 Brian C. Lane - maint: Switch default platform to F41 (bcl@redhat.com) - Add prefixdevname support to the boot.iso (rvykydal@redhat.com) From 2403d67888fa22b1170819dcbc0ef53b8aa9e40a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 13 Jun 2024 08:00:18 -0700 Subject: [PATCH 169/203] - livemedia-creator: Check for BIOS vs. UEFI qemu support (bcl@redhat.com) - livemedia-creator: Enable s390x virt support (bcl@redhat.com) - livemedia-creator: Make use of virtio devices more generic (bcl@redhat.com) - Makefile: Turn off seccomp for test-in-podman (bcl@redhat.com) - tests: Fix image_minimizer test dnf usage (bcl@redhat.com) - creator: Fix pylint error in run_creator (bcl@redhat.com) - New lorax documentation - 41.1 (bcl@redhat.com) - docs: Add sphinx-reredirects and composer-cli redirect (bcl@redhat.com) - New lorax documentation - 41.1 (bcl@redhat.com) - spec: Switch to using the source from the github tag (bcl@redhat.com) - workflows: Add missing branch names (bcl@redhat.com) - runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) - Add a simple PR template reminder (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 35 +++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 3ec552b..073de4e 100644 --- a/.gitignore +++ b/.gitignore @@ -243,3 +243,4 @@ /lorax-40.5.tar.gz /lorax-40.6.tar.gz /lorax-41.0.tar.gz +/lorax-41.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 41c9ae6..a20573e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,19 +1,18 @@ # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} +%global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.0 -Release: 2%{?dist} +Version: 41.1 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images - License: GPL-2.0-or-later -URL: https://github.com/weldr/lorax -# To generate Source0 do: -# git clone https://github.com/weldr/lorax -# git checkout -b archive-branch lorax-%%{version}-%%{release} -# tito build --tgz -Source0: %{name}-%{version}.tar.gz + +%global tag %{version} +%forgemeta +Url: %{forgeurl} +Source0: %{forgesource} BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -129,7 +128,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%autosetup -p1 -n %{name}-%{version} +%forgeautosetup %build @@ -171,8 +170,20 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Jun 07 2024 Python Maint - 41.0-2 -- Rebuilt for Python 3.13 +* Wed Jun 12 2024 Brian C. Lane 41.1-1 +- livemedia-creator: Check for BIOS vs. UEFI qemu support (bcl@redhat.com) +- livemedia-creator: Enable s390x virt support (bcl@redhat.com) +- livemedia-creator: Make use of virtio devices more generic (bcl@redhat.com) +- Makefile: Turn off seccomp for test-in-podman (bcl@redhat.com) +- tests: Fix image_minimizer test dnf usage (bcl@redhat.com) +- creator: Fix pylint error in run_creator (bcl@redhat.com) +- New lorax documentation - 41.1 (bcl@redhat.com) +- docs: Add sphinx-reredirects and composer-cli redirect (bcl@redhat.com) +- New lorax documentation - 41.1 (bcl@redhat.com) +- spec: Switch to using the source from the github tag (bcl@redhat.com) +- workflows: Add missing branch names (bcl@redhat.com) +- runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) +- Add a simple PR template reminder (bcl@redhat.com) * Fri Mar 15 2024 Brian C. Lane - maint: Switch default platform to F41 (bcl@redhat.com) diff --git a/sources b/sources index c68dd36..5cb2c92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.0.tar.gz) = 3c8d1d5a6fe3c7f288e3010006ef401172e802da883e71b55de8358a567ceb01c69c99b52fef3eadaf82640b99dba753ad3271171ae50189f8c2dd4b563bc436 +SHA512 (lorax-41.1.tar.gz) = 34f1005c028df131da459bcc392d11c809c56871a732c897098654304d067ca133791ded3ad9d6269bf0eb4c42adf5cc2ad32f0df2b15b24b3645928864af5db From d597f37b488e618b5f60dcf592615e1b511c1cc0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 15 Jul 2024 14:59:51 -0700 Subject: [PATCH 170/203] - Prepare for the sbin merge (zbyszek@in.waw.pl) - Add compression.erofs section to lorax.conf (bcl@redhat.com) - Add erofs and erofs-ext4 support to --rootfs-type (bcl@redhat.com) - Replace squashfs_only with rootfs_type (bcl@redhat.com) - imgutils: Add mkerofs function and test (bcl@redhat.com) - Implement --replace also for S390 (sebastian.stark@advantest.com) - mkksiso: option --replace to replace arbitrary text in boot config. (sebastian.stark@advantest.com) - spec: Drop forge tag lua tweak (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 13 ++++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 073de4e..668a59a 100644 --- a/.gitignore +++ b/.gitignore @@ -244,3 +244,4 @@ /lorax-40.6.tar.gz /lorax-41.0.tar.gz /lorax-41.1.tar.gz +/lorax-41.2.tar.gz diff --git a/lorax.spec b/lorax.spec index a20573e..ce4a80b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.1 +Version: 41.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -39,6 +39,7 @@ Requires: isomd5sum Requires: module-init-tools Requires: parted Requires: squashfs-tools >= 4.2 +Requires: erofs-utils Requires: util-linux Requires: xz-lzma-compat Requires: xz @@ -170,6 +171,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Jul 15 2024 Brian C. Lane 41.2-1 +- Prepare for the sbin merge (zbyszek@in.waw.pl) +- Add compression.erofs section to lorax.conf (bcl@redhat.com) +- Add erofs and erofs-ext4 support to --rootfs-type (bcl@redhat.com) +- Replace squashfs_only with rootfs_type (bcl@redhat.com) +- imgutils: Add mkerofs function and test (bcl@redhat.com) +- Implement --replace also for S390 (sebastian.stark@advantest.com) +- mkksiso: option --replace to replace arbitrary text in boot config. (sebastian.stark@advantest.com) +- spec: Drop forge tag lua tweak (bcl@redhat.com) + * Wed Jun 12 2024 Brian C. Lane 41.1-1 - livemedia-creator: Check for BIOS vs. UEFI qemu support (bcl@redhat.com) - livemedia-creator: Enable s390x virt support (bcl@redhat.com) diff --git a/sources b/sources index 5cb2c92..327199a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.1.tar.gz) = 34f1005c028df131da459bcc392d11c809c56871a732c897098654304d067ca133791ded3ad9d6269bf0eb4c42adf5cc2ad32f0df2b15b24b3645928864af5db +SHA512 (lorax-41.2.tar.gz) = 0c2a9ed94db90ccbc8ba3da018a3b8ef5e0ee5f1a57043d550e6c9f979a79b400966b27b90485eb8b32890c9e50b8d2e492590f735b0aba4c376b6bec578f6c9 From 25cf6c92e2e6aecbc4adfc7bbcb9070a3a31c7de Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 16 Jul 2024 16:38:57 -0700 Subject: [PATCH 171/203] - Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 668a59a..24477b5 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,4 @@ /lorax-41.0.tar.gz /lorax-41.1.tar.gz /lorax-41.2.tar.gz +/lorax-41.3.tar.gz diff --git a/lorax.spec b/lorax.spec index ce4a80b..2727f8c 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.2 +Version: 41.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 16 2024 Brian C. Lane 41.3-1 +- Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) + * Mon Jul 15 2024 Brian C. Lane 41.2-1 - Prepare for the sbin merge (zbyszek@in.waw.pl) - Add compression.erofs section to lorax.conf (bcl@redhat.com) diff --git a/sources b/sources index 327199a..dd876cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.2.tar.gz) = 0c2a9ed94db90ccbc8ba3da018a3b8ef5e0ee5f1a57043d550e6c9f979a79b400966b27b90485eb8b32890c9e50b8d2e492590f735b0aba4c376b6bec578f6c9 +SHA512 (lorax-41.3.tar.gz) = 35fcbde5490a52c07f2fdc05b04f7d2f7877e33012f3adf654458f5e52ac56b91345b567fd10c95d0dcea33895bc0602b7ba4db6251935f7103322e0461590ff From 6d0236960fd360698931c8e448466cc720712c61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:59:51 +0000 Subject: [PATCH 172/203] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 2727f8c..1fbe0fe 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 41.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 41.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 16 2024 Brian C. Lane 41.3-1 - Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) From 5d0cac6a9d6a34c5c91bbd7d261e2a3df39a79f8 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 9 Sep 2024 09:15:22 -0700 Subject: [PATCH 173/203] - New lorax documentation - 41.3 (bcl@redhat.com) - ltmpl: Remove * from docstring (bcl@redhat.com) - docs: Update intersphinx and add _static dir (bcl@redhat.com) - docs: Document --rootfs-type options (bcl@redhat.com) - Adjust Lorax templates for Xorg to Wayland switch (jkonecny@redhat.com) - creator: Change rootfs description to match cmdline argument (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 24477b5..3accf14 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,4 @@ /lorax-41.1.tar.gz /lorax-41.2.tar.gz /lorax-41.3.tar.gz +/lorax-42.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 1fbe0fe..da7fee4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.3 -Release: 2%{?dist} +Version: 42.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,8 +171,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 41.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild +* Mon Sep 09 2024 Brian C. Lane 42.0-1 +- New lorax documentation - 41.3 (bcl@redhat.com) +- ltmpl: Remove * from docstring (bcl@redhat.com) +- docs: Update intersphinx and add _static dir (bcl@redhat.com) +- docs: Document --rootfs-type options (bcl@redhat.com) +- Adjust Lorax templates for Xorg to Wayland switch (jkonecny@redhat.com) +- creator: Change rootfs description to match cmdline argument (bcl@redhat.com) * Tue Jul 16 2024 Brian C. Lane 41.3-1 - Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) diff --git a/sources b/sources index dd876cb..a8e9fb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.3.tar.gz) = 35fcbde5490a52c07f2fdc05b04f7d2f7877e33012f3adf654458f5e52ac56b91345b567fd10c95d0dcea33895bc0602b7ba4db6251935f7103322e0461590ff +SHA512 (lorax-42.0.tar.gz) = ffc76179b0ec92191773b60e82c4b6cc7be452d3d071dce49d6b271fc94d7573fdede33c2280b50bfe8157ddd52a7ec14323de3e9485de805a17c44438bd6ac4 From a80bdcb40d155248bcbb4cf63e276e82e075c64f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 30 Sep 2024 11:04:01 -0700 Subject: [PATCH 174/203] - templates: Drop dnf install (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3accf14..b09c9e9 100644 --- a/.gitignore +++ b/.gitignore @@ -247,3 +247,4 @@ /lorax-41.2.tar.gz /lorax-41.3.tar.gz /lorax-42.0.tar.gz +/lorax-42.1.tar.gz diff --git a/lorax.spec b/lorax.spec index da7fee4..a66d47e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.0 +Version: 42.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Sep 30 2024 Brian C. Lane 42.1-1 +- templates: Drop dnf install (bcl@redhat.com) + * Mon Sep 09 2024 Brian C. Lane 42.0-1 - New lorax documentation - 41.3 (bcl@redhat.com) - ltmpl: Remove * from docstring (bcl@redhat.com) diff --git a/sources b/sources index a8e9fb6..2706592 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.0.tar.gz) = ffc76179b0ec92191773b60e82c4b6cc7be452d3d071dce49d6b271fc94d7573fdede33c2280b50bfe8157ddd52a7ec14323de3e9485de805a17c44438bd6ac4 +SHA512 (lorax-42.1.tar.gz) = 885e0e1246af1829bcefde9a99fbdb35c2e6281344d8ab0634546473fc669d06a53863e9aebbfe0b8ee1d83c924ec0534efad82549d852981c032cf3f77bb485 From 032c0d9324ae40cdbebcef56cbc869d68037c82a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2024 11:02:21 -0700 Subject: [PATCH 175/203] tests: Update the updates.img test for changes in lorax-42.2 The updates.img is now places in the / of the iso and inst.updates is now used on the cmdline. --- tests/scripts/run_tests.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index ce3c4ed..f4849b2 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -186,8 +186,8 @@ function add_updatesimg { running "Add updates.img" # nothing in the file, just test that it is there - touch /tmp/test-updates.img - mkksiso -u /tmp/test-updates.img $BOOTISO $OUTISO || exit 1 + touch /tmp/updates.img + mkksiso -u /tmp/updates.img $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_updatesimg @@ -197,15 +197,17 @@ function add_updatesimg { } function test_updatesimg { - [ -e "$ISODIR/updates/updates.img" ] || fail "Missing file from iso" + [ -e "$ISODIR/updates.img" ] || fail "Missing updates.img file from iso" + grep "inst.updates=.*updates.img" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg inst.updates entry" + grep "inst.updates=.*updates.img" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg inst.updates entry" } # All of the changes function run_all { running "Use all the options" - touch /tmp/test-updates.img - mkksiso -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 + touch /tmp/updates.img + mkksiso -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -224,8 +226,8 @@ function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - touch /tmp/test-updates.img - su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + touch /tmp/updates.img + su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks From 4e760a153dc1fb079cc6a66b76e91dbcb2956f72 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Oct 2024 11:10:01 -0700 Subject: [PATCH 176/203] - pylint: Print astroid version (bcl@redhat.com) - Extend help for --updates and --ks parameters (jkonecny@redhat.com) - Fix --updates the updates image wasn't loaded (jkonecny@redhat.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b09c9e9..98a5b46 100644 --- a/.gitignore +++ b/.gitignore @@ -248,3 +248,4 @@ /lorax-41.3.tar.gz /lorax-42.0.tar.gz /lorax-42.1.tar.gz +/lorax-42.2.tar.gz diff --git a/lorax.spec b/lorax.spec index a66d47e..e0693ad 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.1 +Version: 42.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Oct 08 2024 Brian C. Lane 42.2-1 +- pylint: Print astroid version (bcl@redhat.com) +- Extend help for --updates and --ks parameters (jkonecny@redhat.com) +- Fix --updates the updates image wasn't loaded (jkonecny@redhat.com) + * Mon Sep 30 2024 Brian C. Lane 42.1-1 - templates: Drop dnf install (bcl@redhat.com) diff --git a/sources b/sources index 2706592..82ee5dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.1.tar.gz) = 885e0e1246af1829bcefde9a99fbdb35c2e6281344d8ab0634546473fc669d06a53863e9aebbfe0b8ee1d83c924ec0534efad82549d852981c032cf3f77bb485 +SHA512 (lorax-42.2.tar.gz) = 9691c55128fab5210caf9645aaea4bec30598389e35c9ff35727ba5d6e45bf75f9b8dd1a48cd74bdbe794dfe90b97311d4c2d330d1c0430b99e9a3975eec25ea From 627361a13afca474d45b3ef01379e306f5b05fb0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 21 Oct 2024 10:45:13 -0700 Subject: [PATCH 177/203] - Update template for anaconda webui to start as user (adamkankovsky@gmail.com) - tests: Fix mkksiso unit test (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 98a5b46..a51a455 100644 --- a/.gitignore +++ b/.gitignore @@ -249,3 +249,4 @@ /lorax-42.0.tar.gz /lorax-42.1.tar.gz /lorax-42.2.tar.gz +/lorax-42.3.tar.gz diff --git a/lorax.spec b/lorax.spec index e0693ad..64e5eab 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.2 +Version: 42.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Oct 21 2024 Brian C. Lane 42.3-1 +- Update template for anaconda webui to start as user (adamkankovsky@gmail.com) +- tests: Fix mkksiso unit test (bcl@redhat.com) + * Tue Oct 08 2024 Brian C. Lane 42.2-1 - pylint: Print astroid version (bcl@redhat.com) - Extend help for --updates and --ks parameters (jkonecny@redhat.com) diff --git a/sources b/sources index 82ee5dd..21d5534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.2.tar.gz) = 9691c55128fab5210caf9645aaea4bec30598389e35c9ff35727ba5d6e45bf75f9b8dd1a48cd74bdbe794dfe90b97311d4c2d330d1c0430b99e9a3975eec25ea +SHA512 (lorax-42.3.tar.gz) = b6d52b1a44c7896e7b0654b9a852428cf7d737a342c57b2336434511428e3fff4a7525d3684951e9d068dabf5929d80edd95f53c8eca3b04c3115a51a482ff3d From e7d54609fb951ca70e762fe9afddebc691bc75e4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 22 Nov 2024 10:58:12 -0800 Subject: [PATCH 178/203] - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) - erofs: Change the erofs compression default to zstd (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a51a455..9eb57a2 100644 --- a/.gitignore +++ b/.gitignore @@ -250,3 +250,4 @@ /lorax-42.1.tar.gz /lorax-42.2.tar.gz /lorax-42.3.tar.gz +/lorax-42.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 64e5eab..0c112f1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.3 +Version: 42.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -39,7 +39,7 @@ Requires: isomd5sum Requires: module-init-tools Requires: parted Requires: squashfs-tools >= 4.2 -Requires: erofs-utils +Requires: erofs-utils >= 1.8.2 Requires: util-linux Requires: xz-lzma-compat Requires: xz @@ -171,6 +171,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Nov 22 2024 Brian C. Lane 42.4-1 +- runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) +- erofs: Change the erofs compression default to zstd (bcl@redhat.com) + * Mon Oct 21 2024 Brian C. Lane 42.3-1 - Update template for anaconda webui to start as user (adamkankovsky@gmail.com) - tests: Fix mkksiso unit test (bcl@redhat.com) diff --git a/sources b/sources index 21d5534..a092753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.3.tar.gz) = b6d52b1a44c7896e7b0654b9a852428cf7d737a342c57b2336434511428e3fff4a7525d3684951e9d068dabf5929d80edd95f53c8eca3b04c3115a51a482ff3d +SHA512 (lorax-42.4.tar.gz) = 2222afd20298a217e1fab209b2c4b691063b24446c03b7fe0893f5672fcfb6c4020bd740a634ddff28d6d933740e4f3f2c1e469c64d69f0b8bbf716d5dfad2f4 From f3391a5c29ee01045133166508f5d76e2802459b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:00:15 +0000 Subject: [PATCH 179/203] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 0c112f1..626afa7 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 42.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 42.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 22 2024 Brian C. Lane 42.4-1 - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) - erofs: Change the erofs compression default to zstd (bcl@redhat.com) From 45d3069dba51b9188b6f20ac5957b5190f268102 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 3 Feb 2025 09:31:50 -0800 Subject: [PATCH 180/203] - Remove sbin usage (bcl@redhat.com) - mkksiso: Replace existing inst.ks on the iso (bcl@redhat.com) - Dockerfile.test: Use fedora:latest instead of rawhide (bcl@redhat.com) - mkksiso: Fix rebuilding the efiboot.img on some systems (bcl@redhat.com) - Remove leftovers from xorg drop (jkonecny@redhat.com) --- .gitignore | 1 + lorax.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9eb57a2..6c1aa35 100644 --- a/.gitignore +++ b/.gitignore @@ -251,3 +251,4 @@ /lorax-42.2.tar.gz /lorax-42.3.tar.gz /lorax-42.4.tar.gz +/lorax-42.5.tar.gz diff --git a/lorax.spec b/lorax.spec index 626afa7..8c25456 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.4 -Release: 2%{?dist} +Version: 42.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -145,9 +145,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %doc docs/*ks %{python3_sitelib}/pylorax %{python3_sitelib}/*.egg-info -%{_sbindir}/lorax -%{_sbindir}/mkefiboot -%{_sbindir}/livemedia-creator +%{_bindir}/lorax +%{_bindir}/mkefiboot +%{_bindir}/livemedia-creator %{_bindir}/mkksiso %{_bindir}/image-minimizer %dir %{_sysconfdir}/lorax @@ -171,8 +171,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Jan 17 2025 Fedora Release Engineering - 42.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +* Mon Feb 03 2025 Brian C. Lane 42.5-1 +- Remove sbin usage (bcl@redhat.com) +- mkksiso: Replace existing inst.ks on the iso (bcl@redhat.com) +- Dockerfile.test: Use fedora:latest instead of rawhide (bcl@redhat.com) +- mkksiso: Fix rebuilding the efiboot.img on some systems (bcl@redhat.com) +- Remove leftovers from xorg drop (jkonecny@redhat.com) * Fri Nov 22 2024 Brian C. Lane 42.4-1 - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) diff --git a/sources b/sources index a092753..4cb3a3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.4.tar.gz) = 2222afd20298a217e1fab209b2c4b691063b24446c03b7fe0893f5672fcfb6c4020bd740a634ddff28d6d933740e4f3f2c1e469c64d69f0b8bbf716d5dfad2f4 +SHA512 (lorax-42.5.tar.gz) = 377b2e2d1dfa119db668b4ba199ea2d342e44005d84a4235cff2268c309e767e7e4f52f832f07d05caa4bb99e6a03e71c5281e496a5480a7a8aa7077355e6a68 From 1987c526abff074dc8cf74f8b9ec7898fdd2955c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 6 Mar 2025 08:57:50 -0800 Subject: [PATCH 181/203] - maint: Switch default platform to F43 (bcl@redhat.com) - runtime-cleanup: Leave stat binary (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6c1aa35..7820e05 100644 --- a/.gitignore +++ b/.gitignore @@ -252,3 +252,4 @@ /lorax-42.3.tar.gz /lorax-42.4.tar.gz /lorax-42.5.tar.gz +/lorax-43.0.tar.gz diff --git a/lorax.spec b/lorax.spec index 8c25456..7da823e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 42.5 +Version: 43.0 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Mar 06 2025 Brian C. Lane 43.0-1 +- maint: Switch default platform to F43 (bcl@redhat.com) +- runtime-cleanup: Leave stat binary (bcl@redhat.com) + * Mon Feb 03 2025 Brian C. Lane 42.5-1 - Remove sbin usage (bcl@redhat.com) - mkksiso: Replace existing inst.ks on the iso (bcl@redhat.com) diff --git a/sources b/sources index 4cb3a3c..0d04b13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-42.5.tar.gz) = 377b2e2d1dfa119db668b4ba199ea2d342e44005d84a4235cff2268c309e767e7e4f52f832f07d05caa4bb99e6a03e71c5281e496a5480a7a8aa7077355e6a68 +SHA512 (lorax-43.0.tar.gz) = 40b37da59c9373d112a3b5530e1779ea92380073edc2ac2102d1483051fe27b7f1dcef4b295df5e1bba3f6af8d1c400da534af5267775378d485d7c21d01a6a9 From d4f1babc54f061dd49c6179e3a156b77cf44c708 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 10 Mar 2025 16:02:39 -0700 Subject: [PATCH 182/203] - runtime-postinstall: Remove systemd-gpt-auto-generator (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7820e05..63cc842 100644 --- a/.gitignore +++ b/.gitignore @@ -253,3 +253,4 @@ /lorax-42.4.tar.gz /lorax-42.5.tar.gz /lorax-43.0.tar.gz +/lorax-43.1.tar.gz diff --git a/lorax.spec b/lorax.spec index 7da823e..bc09e6d 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.0 +Version: 43.1 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -171,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Mar 10 2025 Brian C. Lane 43.1-1 +- runtime-postinstall: Remove systemd-gpt-auto-generator (bcl@redhat.com) + * Thu Mar 06 2025 Brian C. Lane 43.0-1 - maint: Switch default platform to F43 (bcl@redhat.com) - runtime-cleanup: Leave stat binary (bcl@redhat.com) diff --git a/sources b/sources index 0d04b13..f0b4840 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.0.tar.gz) = 40b37da59c9373d112a3b5530e1779ea92380073edc2ac2102d1483051fe27b7f1dcef4b295df5e1bba3f6af8d1c400da534af5267775378d485d7c21d01a6a9 +SHA512 (lorax-43.1.tar.gz) = 378479ad50bdf0277d67dd3390424c48d26518b1918281b423b2d3d1f7d96d9ce0e382234ffbbd79eefe49a9d6775c2b0dbadde44b2971b6410b18e7639ee353 From 3107d46135bce3c1d68aa7a72ea0e7fd3d0f1b0f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 25 Mar 2025 12:51:57 -0700 Subject: [PATCH 183/203] - spec: update lorax-lmc-virt dependencies (yselkowi@redhat.com) - livemedia-creator: Set 0755 permission on / cpio overlay (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 24 ++++++++++++++++++++---- sources | 2 +- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 63cc842..e00b859 100644 --- a/.gitignore +++ b/.gitignore @@ -254,3 +254,4 @@ /lorax-42.5.tar.gz /lorax-43.0.tar.gz /lorax-43.1.tar.gz +/lorax-43.2.tar.gz diff --git a/lorax.spec b/lorax.spec index bc09e6d..e2651e4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.1 +Version: 43.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -92,19 +92,29 @@ Requires: lorax = %{version}-%{release} %description docs Includes the full html documentation for lorax, livemedia-creator, and the pylorax library. +%if ! (0%{?rhel} >= 10 && "%{_arch}" == "ppc64le") %package lmc-virt Summary: livemedia-creator libvirt dependencies Requires: lorax = %{version}-%{release} +%if 0%{?rhel} +# RHEL doesn't have qemu, just qemu-kvm +Requires: qemu-kvm +%else Requires: qemu +Recommends: qemu-kvm +%endif -# Fedora edk2 builds currently only support these arches -%ifarch x86_64 aarch64 +# edk2 builds currently only support these arches +%ifarch x86_64 Requires: edk2-ovmf %endif -Recommends: qemu-kvm +%ifarch aarch64 +Requires: edk2-aarch64 +%endif %description lmc-virt Additional dependencies required by livemedia-creator when using it with qemu. +%endif %package lmc-novirt Summary: livemedia-creator no-virt dependencies @@ -162,7 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %files docs %doc docs/html/* +%if ! (0%{?rhel} >= 10 && "%{_arch}" == "ppc64le") %files lmc-virt +%endif %files lmc-novirt @@ -171,6 +183,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Mar 25 2025 Brian C. Lane 43.2-1 +- spec: update lorax-lmc-virt dependencies (yselkowi@redhat.com) +- livemedia-creator: Set 0755 permission on / cpio overlay (bcl@redhat.com) + * Mon Mar 10 2025 Brian C. Lane 43.1-1 - runtime-postinstall: Remove systemd-gpt-auto-generator (bcl@redhat.com) diff --git a/sources b/sources index f0b4840..35e1065 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.1.tar.gz) = 378479ad50bdf0277d67dd3390424c48d26518b1918281b423b2d3d1f7d96d9ce0e382234ffbbd79eefe49a9d6775c2b0dbadde44b2971b6410b18e7639ee353 +SHA512 (lorax-43.2.tar.gz) = 609430555fcb6421e37b00d42d09ee20bdee1711b7d9189580cd2fb3771f2a5a81ff42498e8c5a1af2a6747fb2d637a82124241fecb82ecd56e0d5a6bbcf67ad From 0615da549b6935f9248df7d6e5ed6c7ecfd4d25a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 31 Mar 2025 14:15:07 -0700 Subject: [PATCH 184/203] - config_files: Drop efi suffix from linuxefi and initrdefi in grub2-efi.cfg (bcl@redhat.com) - runtime-install: only install amd-ucode-firmware on x86_64 (awilliam@redhat.com) - runtime-install: exclude crust-firmware (awilliam@redhat.com) - runtime-cleanup: drop more video and audio firmwares (awilliam@redhat.com) - runtime-install: drop exceptions related to F38-era fw renames (awilliam@redhat.com) - runtime-postinstall: allow pipewire to run as root (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e00b859..22a7d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,4 @@ /lorax-43.0.tar.gz /lorax-43.1.tar.gz /lorax-43.2.tar.gz +/lorax-43.3.tar.gz diff --git a/lorax.spec b/lorax.spec index e2651e4..8a66c99 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.2 +Version: 43.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Mar 31 2025 Brian C. Lane 43.3-1 +- config_files: Drop efi suffix from linuxefi and initrdefi in grub2-efi.cfg (bcl@redhat.com) +- runtime-install: only install amd-ucode-firmware on x86_64 (awilliam@redhat.com) +- runtime-install: exclude crust-firmware (awilliam@redhat.com) +- runtime-cleanup: drop more video and audio firmwares (awilliam@redhat.com) +- runtime-install: drop exceptions related to F38-era fw renames (awilliam@redhat.com) +- runtime-postinstall: allow pipewire to run as root (awilliam@redhat.com) + * Tue Mar 25 2025 Brian C. Lane 43.2-1 - spec: update lorax-lmc-virt dependencies (yselkowi@redhat.com) - livemedia-creator: Set 0755 permission on / cpio overlay (bcl@redhat.com) diff --git a/sources b/sources index 35e1065..4007b55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.2.tar.gz) = 609430555fcb6421e37b00d42d09ee20bdee1711b7d9189580cd2fb3771f2a5a81ff42498e8c5a1af2a6747fb2d637a82124241fecb82ecd56e0d5a6bbcf67ad +SHA512 (lorax-43.3.tar.gz) = f39e7285336256cb645db0fd7b52846195900971fd41ae89482541f34d34d148d68783e33e4845f2182af5f45e13534bf6a08b7c8d368ce51e7d6a9fa2bcd18b From 0a66eb9692c3f3e36b43a07e190f471125b0efd4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 6 May 2025 09:23:36 -0700 Subject: [PATCH 185/203] - runtime-postinstall: Remove root password (bcl@redhat.com) Resolves: rhbz#2364082 - tests: Update magic module usage (bcl@redhat.com) - utils: Remove old filediff.py script (bcl@redhat.com) - dnfbase: Use load_repos instead of update_and_load_enabled_repos (bcl@redhat.com) Fixes #1464 --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 22a7d2c..080609d 100644 --- a/.gitignore +++ b/.gitignore @@ -256,3 +256,4 @@ /lorax-43.1.tar.gz /lorax-43.2.tar.gz /lorax-43.3.tar.gz +/lorax-43.4.tar.gz diff --git a/lorax.spec b/lorax.spec index 8a66c99..13d6d8f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.3 +Version: 43.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue May 06 2025 Brian C. Lane 43.4-1 +- runtime-postinstall: Remove root password (bcl@redhat.com) + Resolves: rhbz#2364082 +- tests: Update magic module usage (bcl@redhat.com) +- utils: Remove old filediff.py script (bcl@redhat.com) +- dnfbase: Use load_repos instead of update_and_load_enabled_repos (bcl@redhat.com) + Fixes #1464 + * Mon Mar 31 2025 Brian C. Lane 43.3-1 - config_files: Drop efi suffix from linuxefi and initrdefi in grub2-efi.cfg (bcl@redhat.com) - runtime-install: only install amd-ucode-firmware on x86_64 (awilliam@redhat.com) diff --git a/sources b/sources index 4007b55..9bd24ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.3.tar.gz) = f39e7285336256cb645db0fd7b52846195900971fd41ae89482541f34d34d148d68783e33e4845f2182af5f45e13534bf6a08b7c8d368ce51e7d6a9fa2bcd18b +SHA512 (lorax-43.4.tar.gz) = 6d6a7781c5ad0a43da825dc6791634861c64cc36401ade6d4743452b5c15703833e141f3fc8ba3046187b81e49d9a86cc103f17c5a54e05efaf8d72b70440b34 From c6d1e103bb0c4b2e2f21da15fb1ebb18e43abf32 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:57:37 +0200 Subject: [PATCH 186/203] Rebuilt for Python 3.14 --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 13d6d8f..f3e78b6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Jun 02 2025 Python Maint - 43.4-2 +- Rebuilt for Python 3.14 + * Tue May 06 2025 Brian C. Lane 43.4-1 - runtime-postinstall: Remove root password (bcl@redhat.com) Resolves: rhbz#2364082 From 1180a83399c3798058e4e56a7b66bce7b206b241 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 16 Jun 2025 11:39:48 -0700 Subject: [PATCH 187/203] - templates.d: Remove libdir variable from templates (bcl@redhat.com) - runtime-cleanup: Move rpm database cleanup to the end (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 080609d..0fba9db 100644 --- a/.gitignore +++ b/.gitignore @@ -257,3 +257,4 @@ /lorax-43.2.tar.gz /lorax-43.3.tar.gz /lorax-43.4.tar.gz +/lorax-43.5.tar.gz diff --git a/lorax.spec b/lorax.spec index f3e78b6..84520e1 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.4 -Release: 2%{?dist} +Version: 43.5 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,8 +183,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Mon Jun 02 2025 Python Maint - 43.4-2 -- Rebuilt for Python 3.14 +* Mon Jun 16 2025 Brian C. Lane 43.5-1 +- templates.d: Remove libdir variable from templates (bcl@redhat.com) +- runtime-cleanup: Move rpm database cleanup to the end (bcl@redhat.com) * Tue May 06 2025 Brian C. Lane 43.4-1 - runtime-postinstall: Remove root password (bcl@redhat.com) diff --git a/sources b/sources index 9bd24ca..98c427f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.4.tar.gz) = 6d6a7781c5ad0a43da825dc6791634861c64cc36401ade6d4743452b5c15703833e141f3fc8ba3046187b81e49d9a86cc103f17c5a54e05efaf8d72b70440b34 +SHA512 (lorax-43.5.tar.gz) = 9a39a198c47bc9091e2ce68f280e863bbfcf3f28ebe439c348f8aed5dd02b0f03a4eb72bd9da406d14b32304ffdc53fec7d4c0ed014d648ca7ed3f3dfa182485 From 413e22a967f509223a8be75a7770498c48e628f2 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 9 Jul 2025 11:24:27 -0700 Subject: [PATCH 188/203] - config_files: Do not remove `chcon` in runtime cleanup (ppolawsk@redhat.com) - use /mnt/sysroot PATH in profile (butirsky@gmail.com) - fix chroot path in .bash_history (butirsky@gmail.com) --- .gitignore | 1 + lorax.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0fba9db..f66c01e 100644 --- a/.gitignore +++ b/.gitignore @@ -258,3 +258,4 @@ /lorax-43.3.tar.gz /lorax-43.4.tar.gz /lorax-43.5.tar.gz +/lorax-43.6.tar.gz diff --git a/lorax.spec b/lorax.spec index 84520e1..fb7c3d5 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.5 +Version: 43.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Jul 02 2025 Brian C. Lane 43.6-1 +- config_files: Do not remove `chcon` in runtime cleanup (ppolawsk@redhat.com) +- use /mnt/sysroot PATH in profile (butirsky@gmail.com) +- fix chroot path in .bash_history (butirsky@gmail.com) + * Mon Jun 16 2025 Brian C. Lane 43.5-1 - templates.d: Remove libdir variable from templates (bcl@redhat.com) - runtime-cleanup: Move rpm database cleanup to the end (bcl@redhat.com) diff --git a/sources b/sources index 98c427f..647477a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.5.tar.gz) = 9a39a198c47bc9091e2ce68f280e863bbfcf3f28ebe439c348f8aed5dd02b0f03a4eb72bd9da406d14b32304ffdc53fec7d4c0ed014d648ca7ed3f3dfa182485 +SHA512 (lorax-43.6.tar.gz) = 22ba9712831ee91ed0601b2c71cd76145b9be2ac531c02383672759e243fd77b9ccf4b75df989f71614f53a2605450f850083b2d4fefc8bb04666a01f895ba2e From 3bc541029b5937110a3717f4b1a5500c7ebf292e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 11 Jul 2025 09:26:11 -0700 Subject: [PATCH 189/203] - runtime-cleanup: don't strip avahi-libs (awilliam@redhat.com) - treebuilder: use fedora-eln-logos for ELN (yselkowi@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f66c01e..a9b1094 100644 --- a/.gitignore +++ b/.gitignore @@ -259,3 +259,4 @@ /lorax-43.4.tar.gz /lorax-43.5.tar.gz /lorax-43.6.tar.gz +/lorax-43.7.tar.gz diff --git a/lorax.spec b/lorax.spec index fb7c3d5..ebaa796 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.6 +Version: 43.7 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -183,6 +183,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jul 11 2025 Brian C. Lane 43.7-1 +- runtime-cleanup: don't strip avahi-libs (awilliam@redhat.com) +- treebuilder: use fedora-eln-logos for ELN (yselkowi@redhat.com) + * Wed Jul 02 2025 Brian C. Lane 43.6-1 - config_files: Do not remove `chcon` in runtime cleanup (ppolawsk@redhat.com) - use /mnt/sysroot PATH in profile (butirsky@gmail.com) diff --git a/sources b/sources index 647477a..4ae5fda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.6.tar.gz) = 22ba9712831ee91ed0601b2c71cd76145b9be2ac531c02383672759e243fd77b9ccf4b75df989f71614f53a2605450f850083b2d4fefc8bb04666a01f895ba2e +SHA512 (lorax-43.7.tar.gz) = 957e759ff518b9c7c977170ef1cbec91b63b42e160989a1bf6ebad999d6da52d7caf0744bcbb648ec5b1e10189da48916cf1b68db058566b5a4708cd2b58a3bd From e8f98cb9be4d21ae2e89e5efd2239bac1c741d5f Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 15 Jul 2025 14:08:47 -0700 Subject: [PATCH 190/203] - pylilnt: Drop old rules and ignore .tito (bcl@redhat.com) - tito: Add support for tagging the version in pyproject.toml (bcl@redhat.com) - lorax.spec: Update for pyproject.toml use (bcl@redhat.com) - pyproject: Add cmdline scripts (bcl@redhat.com) - bin: symlink to scripts from src/bin (bcl@redhat.com) - Move cmdline scripts under pylorax.cmdline (bcl@redhat.com) - pylorax: Move cmdline into a pylorax.cmdline module (bcl@redhat.com) - pyproject: Add a pyproject.toml config file (bcl@redhat.com) - Makefile: Stop running setup.py directly (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 17 +++++++++++++++-- sources | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a9b1094..edc5ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -260,3 +260,4 @@ /lorax-43.5.tar.gz /lorax-43.6.tar.gz /lorax-43.7.tar.gz +/lorax-43.8.tar.gz diff --git a/lorax.spec b/lorax.spec index ebaa796..fe5dd6b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.7 +Version: 43.8 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,7 +14,9 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} +BuildRequires: python3-build BuildRequires: python3-devel +BuildRequires: python3-pip BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros @@ -154,7 +156,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %doc docs/lorax.rst docs/livemedia-creator.rst docs/product-images.rst %doc docs/*ks %{python3_sitelib}/pylorax -%{python3_sitelib}/*.egg-info +%{python3_sitelib}/pylorax-%{version}.dist-info %{_bindir}/lorax %{_bindir}/mkefiboot %{_bindir}/livemedia-creator @@ -183,6 +185,17 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 15 2025 Brian C. Lane 43.8-1 +- pylilnt: Drop old rules and ignore .tito (bcl@redhat.com) +- tito: Add support for tagging the version in pyproject.toml (bcl@redhat.com) +- lorax.spec: Update for pyproject.toml use (bcl@redhat.com) +- pyproject: Add cmdline scripts (bcl@redhat.com) +- bin: symlink to scripts from src/bin (bcl@redhat.com) +- Move cmdline scripts under pylorax.cmdline (bcl@redhat.com) +- pylorax: Move cmdline into a pylorax.cmdline module (bcl@redhat.com) +- pyproject: Add a pyproject.toml config file (bcl@redhat.com) +- Makefile: Stop running setup.py directly (bcl@redhat.com) + * Fri Jul 11 2025 Brian C. Lane 43.7-1 - runtime-cleanup: don't strip avahi-libs (awilliam@redhat.com) - treebuilder: use fedora-eln-logos for ELN (yselkowi@redhat.com) diff --git a/sources b/sources index 4ae5fda..e5d24e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.7.tar.gz) = 957e759ff518b9c7c977170ef1cbec91b63b42e160989a1bf6ebad999d6da52d7caf0744bcbb648ec5b1e10189da48916cf1b68db058566b5a4708cd2b58a3bd +SHA512 (lorax-43.8.tar.gz) = 05697aacd70396dc236a029597fcec14039df05aa3b59fca7a424baded0b78362d526d640be794db93995a73d09853e19824ca4abbaae7571ecf17b7f736a968 From bb10ea5e9221ce3dbff1a7a9640f62a7817e0b0e Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 22 Jul 2025 16:06:06 -0700 Subject: [PATCH 191/203] - Makefile: Separate install and all targets (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index edc5ff5..c52c621 100644 --- a/.gitignore +++ b/.gitignore @@ -261,3 +261,4 @@ /lorax-43.6.tar.gz /lorax-43.7.tar.gz /lorax-43.8.tar.gz +/lorax-43.9.tar.gz diff --git a/lorax.spec b/lorax.spec index fe5dd6b..9144c95 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.8 +Version: 43.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,7 +14,6 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} -BuildRequires: python3-build BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -185,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 22 2025 Brian C. Lane 43.9-1 +- Makefile: Separate install and all targets (bcl@redhat.com) + * Tue Jul 15 2025 Brian C. Lane 43.8-1 - pylilnt: Drop old rules and ignore .tito (bcl@redhat.com) - tito: Add support for tagging the version in pyproject.toml (bcl@redhat.com) diff --git a/sources b/sources index e5d24e3..fb4ffaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.8.tar.gz) = 05697aacd70396dc236a029597fcec14039df05aa3b59fca7a424baded0b78362d526d640be794db93995a73d09853e19824ca4abbaae7571ecf17b7f736a968 +SHA512 (lorax-43.9.tar.gz) = 7f375722fa0c292a4057914d2ca28a18ff8a8a5bfab5596b1c598076d99e8748f6f543c493026678554aa73c2a9a66f8f413296fa60abcf6bb9970d6aa95373b From 90b2a4f327e4c8f5eb9b8956aa8f3e044c7e1c9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:51:55 +0000 Subject: [PATCH 192/203] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 9144c95..3cbdf5b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 43.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 22 2025 Brian C. Lane 43.9-1 - Makefile: Separate install and all targets (bcl@redhat.com) From e29e59a3c039349f911f4d320a7c6ac111737ed7 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 14 Aug 2025 11:39:21 -0700 Subject: [PATCH 193/203] - executils: Remove binary_output flag (bcl@redhat.com) - logging: Set encoding=UTF-8 on FileHandler (bcl@redhat.com) - executils: Set encoding to UTF-8 for _run_program (bcl@redhat.com) - tests: Add template runcmd unicode test (bcl@redhat.com) - tests: Add some unicode to the executils tests (bcl@redhat.com) - templates: Remove explicit installation of anaconda-widgets (k.koukiou@gmail.com) --- .gitignore | 1 + lorax.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c52c621..82cac26 100644 --- a/.gitignore +++ b/.gitignore @@ -262,3 +262,4 @@ /lorax-43.7.tar.gz /lorax-43.8.tar.gz /lorax-43.9.tar.gz +/lorax-43.10.tar.gz diff --git a/lorax.spec b/lorax.spec index 3cbdf5b..4b36d62 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.9 -Release: 2%{?dist} +Version: 43.10 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,8 +184,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 43.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Thu Aug 14 2025 Brian C. Lane 43.10-1 +- executils: Remove binary_output flag (bcl@redhat.com) +- logging: Set encoding=UTF-8 on FileHandler (bcl@redhat.com) +- executils: Set encoding to UTF-8 for _run_program (bcl@redhat.com) +- tests: Add template runcmd unicode test (bcl@redhat.com) +- tests: Add some unicode to the executils tests (bcl@redhat.com) +- templates: Remove explicit installation of anaconda-widgets (k.koukiou@gmail.com) * Tue Jul 22 2025 Brian C. Lane 43.9-1 - Makefile: Separate install and all targets (bcl@redhat.com) diff --git a/sources b/sources index fb4ffaf..6581651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.9.tar.gz) = 7f375722fa0c292a4057914d2ca28a18ff8a8a5bfab5596b1c598076d99e8748f6f543c493026678554aa73c2a9a66f8f413296fa60abcf6bb9970d6aa95373b +SHA512 (lorax-43.10.tar.gz) = ed8fe9f3e71f358fbaf0d0761838a82e44944e1823e515bffcb78f88e77b0ce457fb1df723af8848ddaabdccc32ef74383cb2b4f9dd9f2b5d0edef685bea27c5 From a39c12a88509736e8acf469c0d10295062cdd8c1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:58:31 +0200 Subject: [PATCH 194/203] Rebuilt for Python 3.14.0rc2 bytecode --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 4b36d62..86c313f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Aug 15 2025 Python Maint - 43.10-2 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Aug 14 2025 Brian C. Lane 43.10-1 - executils: Remove binary_output flag (bcl@redhat.com) - logging: Set encoding=UTF-8 on FileHandler (bcl@redhat.com) From f3396b8406e321da470aafaf1090f9ac79d58be1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 09:28:50 -0700 Subject: [PATCH 195/203] Backport PR #1489 to drop install of shim-ia32 --- ...lls-of-shim-ia32-it-no-longer-exists.patch | 57 +++++++++++++++++++ lorax.spec | 11 +++- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch diff --git a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch new file mode 100644 index 0000000..f22b97c --- /dev/null +++ b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch @@ -0,0 +1,57 @@ +From 7064605df52709b1dec3c10b7c90a53ebe305990 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 26 Aug 2025 08:59:13 -0700 +Subject: [PATCH] Drop all installs of shim-ia32 (it no longer exists) + +There is no shim-ia32 in shim-15.8-4, which was recently tagged +for f44. This is because it was built after +https://github.com/rhboot/efi-rpm-macros/commit/5c7fcc9 , so it +appears to be an intentional change - @pjones may confirm. + +Signed-off-by: Adam Williamson +--- + docs/fedora-livemedia.ks | 1 - + share/templates.d/99-generic/live/live-install.tmpl | 2 +- + share/templates.d/99-generic/runtime-install.tmpl | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks +index 9b779cb4..5ea41079 100644 +--- a/docs/fedora-livemedia.ks ++++ b/docs/fedora-livemedia.ks +@@ -89,7 +89,6 @@ case $ARCH in + echo "%packages" >> $PKGS + echo "@^workstation-product-environment" >> $PKGS + echo "shim" >> $PKGS +- echo "shim-ia32" >> $PKGS + echo "grub2" >> $PKGS + echo "grub2-efi" >> $PKGS + echo "grub2-efi-ia32" >> $PKGS +diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl +index ef514ee8..61dc5653 100644 +--- a/share/templates.d/99-generic/live/live-install.tmpl ++++ b/share/templates.d/99-generic/live/live-install.tmpl +@@ -10,7 +10,7 @@ + installpkg grub2-tools-efi + installpkg efibootmgr + installpkg shim-x64 grub2-efi-x64-cdboot +- installpkg shim-ia32 grub2-efi-ia32-cdboot ++ installpkg grub2-efi-ia32-cdboot + installpkg biosdevname + installpkg grub2-tools grub2-tools-minimal grub2-tools-extra + installpkg grub2-pc-modules +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index af06d912..94bcfe4e 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -70,7 +70,6 @@ installpkg glibc-all-langpacks + installpkg efibootmgr + installpkg shim-x64 + installpkg grub2-efi-x64-cdboot>=${GRUB2VER} +- installpkg shim-ia32 + installpkg grub2-efi-ia32-cdboot>=${GRUB2VER} + installpkg biosdevname + installpkg grub2-tools>=${GRUB2VER} grub2-tools-minimal>=${GRUB2VER} +-- +2.49.0 + diff --git a/lorax.spec b/lorax.spec index 86c313f..d4efd75 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,10 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} +# https://github.com/weldr/lorax/pull/1489 +# Drop install of shim-ia32 as it no longer exists +Patch: 0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -140,7 +144,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%forgeautosetup +%forgeautosetup -p1 %build @@ -184,6 +188,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Aug 26 2025 Adam Williamson - 43.10-3 +- Backport PR #1489 to drop install of shim-ia32 + * Fri Aug 15 2025 Python Maint - 43.10-2 - Rebuilt for Python 3.14.0rc2 bytecode From 80c6536434ad7afeefd2db31f191145670c10147 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 11:24:16 -0700 Subject: [PATCH 196/203] Update PR #1489 patch to a better-working version --- ...lls-of-shim-ia32-it-no-longer-exists.patch | 21 +++++++++++++++++-- lorax.spec | 5 ++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch index f22b97c..429892d 100644 --- a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch +++ b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch @@ -1,4 +1,4 @@ -From 7064605df52709b1dec3c10b7c90a53ebe305990 Mon Sep 17 00:00:00 2001 +From 189fc200859e3fb7e19b8deb1ffb2dd70356f073 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 08:59:13 -0700 Subject: [PATCH] Drop all installs of shim-ia32 (it no longer exists) @@ -11,9 +11,10 @@ appears to be an intentional change - @pjones may confirm. Signed-off-by: Adam Williamson --- docs/fedora-livemedia.ks | 1 - + share/templates.d/99-generic/efi.tmpl | 3 +++ share/templates.d/99-generic/live/live-install.tmpl | 2 +- share/templates.d/99-generic/runtime-install.tmpl | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks index 9b779cb4..5ea41079 100644 @@ -27,6 +28,22 @@ index 9b779cb4..5ea41079 100644 echo "grub2" >> $PKGS echo "grub2-efi" >> $PKGS echo "grub2-efi-ia32" >> $PKGS +diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl +index d50c5750..dea00943 100644 +--- a/share/templates.d/99-generic/efi.tmpl ++++ b/share/templates.d/99-generic/efi.tmpl +@@ -13,8 +13,11 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ + install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi + %endif + %if efiarch32: ++## shim-ia32 is gone in F44+, other ia32 bits remain for now ++%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): + install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI + install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ ++%endif + install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi + %endif + install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl index ef514ee8..61dc5653 100644 --- a/share/templates.d/99-generic/live/live-install.tmpl diff --git a/lorax.spec b/lorax.spec index d4efd75..378268a 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -188,6 +188,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Aug 26 2025 Adam Williamson - 43.10-4 +- Update PR #1489 patch to a better-working version + * Tue Aug 26 2025 Adam Williamson - 43.10-3 - Backport PR #1489 to drop install of shim-ia32 From a86cd0ba5f6f851e39271827f5dd343ba422af05 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 16:58:06 -0700 Subject: [PATCH 197/203] Update PR #1489 patch again (fix lmc lives) --- ...lls-of-shim-ia32-it-no-longer-exists.patch | 21 +++++++++++++++++-- lorax.spec | 5 ++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch index 429892d..5e5f9fc 100644 --- a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch +++ b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch @@ -1,4 +1,4 @@ -From 189fc200859e3fb7e19b8deb1ffb2dd70356f073 Mon Sep 17 00:00:00 2001 +From d44e5fcf28777ac123c98fc5851c4eb94f1b00a3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Aug 2025 08:59:13 -0700 Subject: [PATCH] Drop all installs of shim-ia32 (it no longer exists) @@ -12,9 +12,10 @@ Signed-off-by: Adam Williamson --- docs/fedora-livemedia.ks | 1 - share/templates.d/99-generic/efi.tmpl | 3 +++ + share/templates.d/99-generic/live/efi.tmpl | 3 +++ share/templates.d/99-generic/live/live-install.tmpl | 2 +- share/templates.d/99-generic/runtime-install.tmpl | 1 - - 4 files changed, 4 insertions(+), 3 deletions(-) + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks index 9b779cb4..5ea41079 100644 @@ -37,6 +38,22 @@ index d50c5750..dea00943 100644 %endif %if efiarch32: +## shim-ia32 is gone in F44+, other ia32 bits remain for now ++%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): + install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI + install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ ++%endif + install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi + %endif + install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ +diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl +index f1fd1b51..f847ed9f 100644 +--- a/share/templates.d/99-generic/live/efi.tmpl ++++ b/share/templates.d/99-generic/live/efi.tmpl +@@ -13,8 +13,11 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ + install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi + %endif + %if efiarch32: ++## shim-ia32 is gone in F44+, other ia32 bits remain for now +%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ diff --git a/lorax.spec b/lorax.spec index 378268a..4956459 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 43.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -188,6 +188,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Aug 26 2025 Adam Williamson - 43.10-5 +- Update PR #1489 patch again (fix lmc lives) + * Tue Aug 26 2025 Adam Williamson - 43.10-4 - Update PR #1489 patch to a better-working version From 182bf6f637a1f6bd9906ea56eff4c8301f38b710 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 8 Sep 2025 10:58:59 -0700 Subject: [PATCH 198/203] - maint: Switch default platform to F44 (bcl@redhat.com) - Drop all installs of shim-ia32 (it no longer exists) (awilliam@redhat.com) - templates: Support product version to contain blank character in templates.d/99-generic (songmingliang@uniontech.com) --- .gitignore | 1 + ...lls-of-shim-ia32-it-no-longer-exists.patch | 91 ------------------- lorax.spec | 26 ++---- sources | 2 +- 4 files changed, 10 insertions(+), 110 deletions(-) delete mode 100644 0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch diff --git a/.gitignore b/.gitignore index 82cac26..2d7a36c 100644 --- a/.gitignore +++ b/.gitignore @@ -263,3 +263,4 @@ /lorax-43.8.tar.gz /lorax-43.9.tar.gz /lorax-43.10.tar.gz +/lorax-44.0.tar.gz diff --git a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch b/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch deleted file mode 100644 index 5e5f9fc..0000000 --- a/0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch +++ /dev/null @@ -1,91 +0,0 @@ -From d44e5fcf28777ac123c98fc5851c4eb94f1b00a3 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 26 Aug 2025 08:59:13 -0700 -Subject: [PATCH] Drop all installs of shim-ia32 (it no longer exists) - -There is no shim-ia32 in shim-15.8-4, which was recently tagged -for f44. This is because it was built after -https://github.com/rhboot/efi-rpm-macros/commit/5c7fcc9 , so it -appears to be an intentional change - @pjones may confirm. - -Signed-off-by: Adam Williamson ---- - docs/fedora-livemedia.ks | 1 - - share/templates.d/99-generic/efi.tmpl | 3 +++ - share/templates.d/99-generic/live/efi.tmpl | 3 +++ - share/templates.d/99-generic/live/live-install.tmpl | 2 +- - share/templates.d/99-generic/runtime-install.tmpl | 1 - - 5 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks -index 9b779cb4..5ea41079 100644 ---- a/docs/fedora-livemedia.ks -+++ b/docs/fedora-livemedia.ks -@@ -89,7 +89,6 @@ case $ARCH in - echo "%packages" >> $PKGS - echo "@^workstation-product-environment" >> $PKGS - echo "shim" >> $PKGS -- echo "shim-ia32" >> $PKGS - echo "grub2" >> $PKGS - echo "grub2-efi" >> $PKGS - echo "grub2-efi-ia32" >> $PKGS -diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl -index d50c5750..dea00943 100644 ---- a/share/templates.d/99-generic/efi.tmpl -+++ b/share/templates.d/99-generic/efi.tmpl -@@ -13,8 +13,11 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ - install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi - %endif - %if efiarch32: -+## shim-ia32 is gone in F44+, other ia32 bits remain for now -+%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): - install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI - install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ -+%endif - install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi - %endif - install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ -diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl -index f1fd1b51..f847ed9f 100644 ---- a/share/templates.d/99-generic/live/efi.tmpl -+++ b/share/templates.d/99-generic/live/efi.tmpl -@@ -13,8 +13,11 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ - install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi - %endif - %if efiarch32: -+## shim-ia32 is gone in F44+, other ia32 bits remain for now -+%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"): - install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI - install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ -+%endif - install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi - %endif - install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ -diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl -index ef514ee8..61dc5653 100644 ---- a/share/templates.d/99-generic/live/live-install.tmpl -+++ b/share/templates.d/99-generic/live/live-install.tmpl -@@ -10,7 +10,7 @@ - installpkg grub2-tools-efi - installpkg efibootmgr - installpkg shim-x64 grub2-efi-x64-cdboot -- installpkg shim-ia32 grub2-efi-ia32-cdboot -+ installpkg grub2-efi-ia32-cdboot - installpkg biosdevname - installpkg grub2-tools grub2-tools-minimal grub2-tools-extra - installpkg grub2-pc-modules -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index af06d912..94bcfe4e 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -70,7 +70,6 @@ installpkg glibc-all-langpacks - installpkg efibootmgr - installpkg shim-x64 - installpkg grub2-efi-x64-cdboot>=${GRUB2VER} -- installpkg shim-ia32 - installpkg grub2-efi-ia32-cdboot>=${GRUB2VER} - installpkg biosdevname - installpkg grub2-tools>=${GRUB2VER} grub2-tools-minimal>=${GRUB2VER} --- -2.49.0 - diff --git a/lorax.spec b/lorax.spec index 4956459..204d310 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 43.10 -Release: 5%{?dist} +Version: 44.0 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,10 +14,6 @@ License: GPL-2.0-or-later Url: %{forgeurl} Source0: %{forgesource} -# https://github.com/weldr/lorax/pull/1489 -# Drop install of shim-ia32 as it no longer exists -Patch: 0001-Drop-all-installs-of-shim-ia32-it-no-longer-exists.patch - BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -144,7 +140,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%forgeautosetup -p1 +%forgeautosetup %build @@ -188,17 +184,11 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Tue Aug 26 2025 Adam Williamson - 43.10-5 -- Update PR #1489 patch again (fix lmc lives) - -* Tue Aug 26 2025 Adam Williamson - 43.10-4 -- Update PR #1489 patch to a better-working version - -* Tue Aug 26 2025 Adam Williamson - 43.10-3 -- Backport PR #1489 to drop install of shim-ia32 - -* Fri Aug 15 2025 Python Maint - 43.10-2 -- Rebuilt for Python 3.14.0rc2 bytecode +* Mon Sep 08 2025 Brian C. Lane 44.0-1 +- maint: Switch default platform to F44 (bcl@redhat.com) +- Drop all installs of shim-ia32 (it no longer exists) (awilliam@redhat.com) +- templates: Support product version to contain blank character in + templates.d/99-generic (songmingliang@uniontech.com) * Thu Aug 14 2025 Brian C. Lane 43.10-1 - executils: Remove binary_output flag (bcl@redhat.com) diff --git a/sources b/sources index 6581651..981565c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-43.10.tar.gz) = ed8fe9f3e71f358fbaf0d0761838a82e44944e1823e515bffcb78f88e77b0ce457fb1df723af8848ddaabdccc32ef74383cb2b4f9dd9f2b5d0edef685bea27c5 +SHA512 (lorax-44.0.tar.gz) = 3ee05ea7128ec751449578ecd21a1cf4486a57370ef775912f0a83120b0c96d63a3e303d68237c1e68623fbc3af0e730fdac5ba354469ccb0036b6edb4b52e27 From 4c389ef5bc67477e3bc5cccbff1720729079a417 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:29:12 +0200 Subject: [PATCH 199/203] Rebuilt for Python 3.14.0rc3 bytecode --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 204d310..abaa566 100644 --- a/lorax.spec +++ b/lorax.spec @@ -5,7 +5,7 @@ Name: lorax Version: 44.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Sep 19 2025 Python Maint - 44.0-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Mon Sep 08 2025 Brian C. Lane 44.0-1 - maint: Switch default platform to F44 (bcl@redhat.com) - Drop all installs of shim-ia32 (it no longer exists) (awilliam@redhat.com) From c16c80094da73de51fea9ec05b93068e3729bbbc Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 24 Sep 2025 11:12:06 -0700 Subject: [PATCH 200/203] - runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) - executils: decoding after deserialization (oleg.sviridov@red-soft.ru) - mkksiso: make ISO reproducible with SOURCE_DATE_EPOCH (e.champetier@ateme.com) --- .gitignore | 1 + lorax.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2d7a36c..5498092 100644 --- a/.gitignore +++ b/.gitignore @@ -264,3 +264,4 @@ /lorax-43.9.tar.gz /lorax-43.10.tar.gz /lorax-44.0.tar.gz +/lorax-44.1.tar.gz diff --git a/lorax.spec b/lorax.spec index abaa566..ce57043 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,8 +4,8 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.0 -Release: 2%{?dist} +Version: 44.1 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,8 +184,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Fri Sep 19 2025 Python Maint - 44.0-2 -- Rebuilt for Python 3.14.0rc3 bytecode +* Wed Sep 24 2025 Brian C. Lane 44.1-1 +- runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) +- executils: decoding after deserialization (oleg.sviridov@red-soft.ru) +- mkksiso: make ISO reproducible with SOURCE_DATE_EPOCH (e.champetier@ateme.com) * Mon Sep 08 2025 Brian C. Lane 44.0-1 - maint: Switch default platform to F44 (bcl@redhat.com) diff --git a/sources b/sources index 981565c..ed94313 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.0.tar.gz) = 3ee05ea7128ec751449578ecd21a1cf4486a57370ef775912f0a83120b0c96d63a3e303d68237c1e68623fbc3af0e730fdac5ba354469ccb0036b6edb4b52e27 +SHA512 (lorax-44.1.tar.gz) = 049605af8d8ef18dd7e976b72d536deb3165bf7b3fa0abe73cbfae242cf2f8346ed25f33704d1216ee5ff7df695070bd79baf86cc7765add5366e869df398017 From c9a8107ab8c9f1e096853dd3ab7f7ef8b763a9f0 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 9 Oct 2025 14:26:18 -0700 Subject: [PATCH 201/203] - Add mac80211_hwsim for wifi testing to installer image (rvykydal@redhat.com) - runtime-install: drop tigervnc (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5498092..c62ec26 100644 --- a/.gitignore +++ b/.gitignore @@ -265,3 +265,4 @@ /lorax-43.10.tar.gz /lorax-44.0.tar.gz /lorax-44.1.tar.gz +/lorax-44.2.tar.gz diff --git a/lorax.spec b/lorax.spec index ce57043..3e77c9e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.1 +Version: 44.2 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Oct 09 2025 Brian C. Lane 44.2-1 +- Add mac80211_hwsim for wifi testing to installer image (rvykydal@redhat.com) +- runtime-install: drop tigervnc (awilliam@redhat.com) + * Wed Sep 24 2025 Brian C. Lane 44.1-1 - runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) - executils: decoding after deserialization (oleg.sviridov@red-soft.ru) diff --git a/sources b/sources index ed94313..b439063 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.1.tar.gz) = 049605af8d8ef18dd7e976b72d536deb3165bf7b3fa0abe73cbfae242cf2f8346ed25f33704d1216ee5ff7df695070bd79baf86cc7765add5366e869df398017 +SHA512 (lorax-44.2.tar.gz) = ce15f772529601cfc261092ab271c1fa4b0eb2f2836edaef8661758cfb4cb63226ca615a31739bc5845b594e74eac8a39e1af2504a908ef83bef02196b5e866b From 8a68c3e72f2fe6e9ed5d5ff592a2996f5b3099c7 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 15 Oct 2025 09:50:47 -0700 Subject: [PATCH 202/203] - Do not remove SELinux from the runtime (ppolawsk@redhat.com) --- .gitignore | 1 + lorax.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c62ec26..d472f9e 100644 --- a/.gitignore +++ b/.gitignore @@ -266,3 +266,4 @@ /lorax-44.0.tar.gz /lorax-44.1.tar.gz /lorax-44.2.tar.gz +/lorax-44.3.tar.gz diff --git a/lorax.spec b/lorax.spec index 3e77c9e..b364671 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.2 +Version: 44.3 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -184,6 +184,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Oct 15 2025 Brian C. Lane 44.3-1 +- Do not remove SELinux from the runtime (ppolawsk@redhat.com) + * Thu Oct 09 2025 Brian C. Lane 44.2-1 - Add mac80211_hwsim for wifi testing to installer image (rvykydal@redhat.com) - runtime-install: drop tigervnc (awilliam@redhat.com) diff --git a/sources b/sources index b439063..ff805d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.2.tar.gz) = ce15f772529601cfc261092ab271c1fa4b0eb2f2836edaef8661758cfb4cb63226ca615a31739bc5845b594e74eac8a39e1af2504a908ef83bef02196b5e866b +SHA512 (lorax-44.3.tar.gz) = 1d68e10c911bb4d34048a6d7e110a4b17a7f2d009091901fc6efd397a41af2b8f2050ec143190c75371e8e7a6c1a8be7aa407f4ae6641fe7f36a9841bb1069aa From 6866a83666b76c23339d7d3bd9a8ecc4069d588b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 1 Dec 2025 13:28:31 -0800 Subject: [PATCH 203/203] - Exclude build on the i686 architecture (berrange@redhat.com) - runtime-cleanup: mesa no longer includes gallium-pipe drivers (yselkowi@redhat.com) --- .gitignore | 1 + lorax.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d472f9e..4ca59af 100644 --- a/.gitignore +++ b/.gitignore @@ -267,3 +267,4 @@ /lorax-44.1.tar.gz /lorax-44.2.tar.gz /lorax-44.3.tar.gz +/lorax-44.4.tar.gz diff --git a/lorax.spec b/lorax.spec index b364671..5e3eaa4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,11 +4,14 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.3 +Version: 44.4 Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later +# qemu is no longer available on 32-bit +ExcludeArch: %{ix86} + %global tag %{version} %forgemeta Url: %{forgeurl} @@ -184,6 +187,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Dec 01 2025 Brian C. Lane 44.4-1 +- Exclude build on the i686 architecture (berrange@redhat.com) +- runtime-cleanup: mesa no longer includes gallium-pipe drivers (yselkowi@redhat.com) + +* Wed Nov 26 2025 Daniel P. Berrangé - 44.3-2 +- Add ExcludeArch for i686 to remove qemu dependency + * Wed Oct 15 2025 Brian C. Lane 44.3-1 - Do not remove SELinux from the runtime (ppolawsk@redhat.com) diff --git a/sources b/sources index ff805d7..0b5f402 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.3.tar.gz) = 1d68e10c911bb4d34048a6d7e110a4b17a7f2d009091901fc6efd397a41af2b8f2050ec143190c75371e8e7a6c1a8be7aa407f4ae6641fe7f36a9841bb1069aa +SHA512 (lorax-44.4.tar.gz) = e2be9a13a0aec657bfe9a32dbd51e9024dfcb89471dbc57b8206dccdcd71cf5561fb25f97a7fdaca2b0279a2966b142ddf4e4544577ac2b47171f19648742577