From c5b3c131c47969e7679bf1ed87bea4bdd93277e4 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 3 Nov 2020 05:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201103053007626775 - https://github.com/weldr/lorax/commit/cd77f6d4d5647f3518948946ab9869fcc49d57e2 --- ...f6d4d5647f3518948946ab9869fcc49d57e2.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 cd77f6d4d5647f3518948946ab9869fcc49d57e2.patch diff --git a/cd77f6d4d5647f3518948946ab9869fcc49d57e2.patch b/cd77f6d4d5647f3518948946ab9869fcc49d57e2.patch new file mode 100644 index 0000000..c238215 --- /dev/null +++ b/cd77f6d4d5647f3518948946ab9869fcc49d57e2.patch @@ -0,0 +1,61 @@ +diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py +index 8700ff525..9060c1308 100644 +--- a/src/pylorax/__init__.py ++++ b/src/pylorax/__init__.py +@@ -61,7 +61,7 @@ + DRACUT_DEFAULT = ["--xz", "--install", "/.buildstamp", "--no-early-microcode", "--add", "fips"] + + # Used for DNF conf.module_platform_id +-DEFAULT_PLATFORM_ID = "platform:f32" ++DEFAULT_PLATFORM_ID = "platform:f34" + + class ArchData(DataHolder): + lib64_arches = ("x86_64", "ppc64le", "s390x", "ia64", "aarch64") +diff --git a/src/pylorax/cmdline.py b/src/pylorax/cmdline.py +index 59e851d3d..50dab7439 100644 +--- a/src/pylorax/cmdline.py ++++ b/src/pylorax/cmdline.py +@@ -306,7 +306,7 @@ def lmc_parser(dracut_default=""): + + parser.add_argument("--project", default="Linux", + help="substituted for @PROJECT@ in bootloader config files") +- parser.add_argument("--releasever", default="32", ++ parser.add_argument("--releasever", default="34", + help="substituted for @VERSION@ in bootloader config files") + parser.add_argument("--volid", default=None, help="volume id") + parser.add_argument("--squashfs-only", action="store_true", default=False, +diff --git a/src/pylorax/creator.py b/src/pylorax/creator.py +index 559912ed4..9ed3d4b5f 100644 +--- a/src/pylorax/creator.py ++++ b/src/pylorax/creator.py +@@ -149,7 +149,7 @@ def dracut_args(opts): + + def make_appliance(disk_img, name, template, outfile, networks=None, ram=1024, + vcpus=1, arch=None, title="Linux", project="Linux", +- releasever="32"): ++ releasever="34"): + """ + Generate an appliance description file + +@@ -163,7 +163,7 @@ def make_appliance(disk_img, name, template, outfile, networks=None, ram=1024, + :param str arch: CPU architecture. Default is 'x86_64' + :param str title: Title, passed to template. Default is 'Linux' + :param str project: Project, passed to template. Default is 'Linux' +- :param str releasever: Release version, passed to template. Default is 32 ++ :param str releasever: Release version, passed to template. Default is 34 + """ + if not (disk_img and template and outfile): + return None +diff --git a/src/pylorax/dnfbase.py b/src/pylorax/dnfbase.py +index c4d514f1a..de9c956a2 100644 +--- a/src/pylorax/dnfbase.py ++++ b/src/pylorax/dnfbase.py +@@ -25,7 +25,7 @@ + + def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None, + enablerepos=None, disablerepos=None, +- tempdir="/var/tmp", proxy=None, releasever="32", ++ tempdir="/var/tmp", proxy=None, releasever="34", + cachedir=None, logdir=None, sslverify=True, dnfplugins=None): + """ Create a dnf Base object and setup the repositories and installroot + -- Gitee From 630cf01c8e0c2bf38d710be7d174c8eadd0ec4b2 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 3 Nov 2020 05:30:11 +0800 Subject: [PATCH 2/2] [patch tracking] 20201103053007626775 - update spec file --- lorax.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lorax.spec b/lorax.spec index 3ed4224..2b206f6 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ Name: lorax Version: 33.6 -Release: 2 +Release: 3 Summary: A set of tools used to create bootable images License: GPLv2+ URL: https://github.com/weldr/lorax @@ -20,6 +20,7 @@ Patch9007: eliminate-difference.patch Patch9008: lorax-enable-GUI-installation.patch Patch9009: lorax-enable-anaconda-KdumpSpoke.patch Patch9010: lorax-delete-udisk2-iscsi.patch +Patch9011: cd77f6d4d5647f3518948946ab9869fcc49d57e2.patch BuildRequires: python3-devel python3-sphinx_rtd_theme python3-magic @@ -203,6 +204,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog +* 20201103053007626775 patch-tracking 33.6-3 +- append patch file of upstream repository from to + * Feb Oct 13 2020 yuboyun - 33.6-2 - add yaml file @@ -304,4 +308,3 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin ignore the dir that without kernel version add text mode in aarch64 installation - -- Gitee