From 7c9cc3eb5dd55ccac2a83730952df01fadf421a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 31 Oct 2018 12:37:27 +0100 Subject: [PATCH] New upstream release 4.1.30 --- 0001-Save-memory-less-agressively.patch | 33 ------------------------- pungi.spec | 20 ++++++++++++--- sources | 2 +- 3 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 0001-Save-memory-less-agressively.patch diff --git a/0001-Save-memory-less-agressively.patch b/0001-Save-memory-less-agressively.patch deleted file mode 100644 index 68a36b84..00000000 --- a/0001-Save-memory-less-agressively.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 844f2005a0d9e0848a03a328d5a0770c9072e1a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= -Date: Mon, 15 Oct 2018 15:34:35 +0200 -Subject: [PATCH] Save memory less agressively -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We can't drop the whole package set once the first solver iteration -finishes, because it runs for each arch separately and we need the data -for each of them. We can however delete the arch specific portion. - -Signed-off-by: Lubomír Sedlář ---- - pungi/phases/gather/methods/method_deps.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pungi/phases/gather/methods/method_deps.py b/pungi/phases/gather/methods/method_deps.py -index 3c7b54fb..083992ef 100644 ---- a/pungi/phases/gather/methods/method_deps.py -+++ b/pungi/phases/gather/methods/method_deps.py -@@ -146,7 +146,7 @@ def write_pungi_config(compose, arch, variant, packages, groups, filter_packages - '{0.name}-{1}:{0.version}-{0.release}'.format(rpm_obj, rpm_obj.epoch or 0)) - - # Drop the packageset to hopefully save some memory -- variant.pkgset = None -+ variant.pkgset.rpms_by_arch[arch] = None - - pungi_wrapper.write_kickstart( - ks_path=pungi_cfg, repos=repos, groups=groups, packages=packages_str, --- -2.17.2 - diff --git a/pungi.spec b/pungi.spec index 3cbb12da..107d1b70 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,6 +1,6 @@ Name: pungi -Version: 4.1.29 -Release: 3%{?dist} +Version: 4.1.30 +Release: 1%{?dist} Summary: Distribution compose tool Group: Development/Tools @@ -10,7 +10,6 @@ Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: 0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch Patch1: 0002-Revert-Other-repo-for-OstreeInstaller.patch Patch2: 0003-Revert-Ostree-can-use-pkgset-repos.patch -Patch3: 0001-Save-memory-less-agressively.patch BuildRequires: python3-nose BuildRequires: python3-mock @@ -196,6 +195,21 @@ nosetests-3 --exe %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Wed Oct 31 2018 Lubomír Sedlář - 4.1.30-1 +- gather: Expand wildcards in Pungi (lsedlar) +- repoclosure: Extract logs from hybrid solver (lsedlar) +- gather: Track multilib that doesn't exist (lsedlar) +- Get the NSVC from Koji module CG build metadata (jkaluza) +- extra_iso: Include media.repo and .discinfo (lsedlar) +- hybrid: Don't add debuginfo as langpacks (lsedlar) +- fus: Write solvables to file (lsedlar) +- hybrid: Honor filter_packages (lsedlar) +- Include all test fixtures in source tarball (lsedlar) +- extra-iso: Use correct efiboot.img file (lsedlar) +- extra-iso: Fix treeinfo (lsedlar) +- createiso: Move code for tweaking treeinfo into a function (lsedlar) +- extra-iso: Generate jigdo by default (lsedlar) + * Mon Oct 15 2018 Lubomír Sedlář - 4.1.29-3 - Save memory less agressively diff --git a/sources b/sources index aa482c38..b7959533 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pungi-4.1.29.tar.bz2) = 4e59e81b70501bd6a5eca477d28afac94acc50962af3d4327ec186eca901e7c29de418d9c704c06a26f942c8464efa9b58e5fc8853536ba558f77a3d8abe9049 +SHA512 (pungi-4.1.30.tar.bz2) = 9beee3fb047e241fc6a85ba9e646cf0adee9803d729a59d757a89edd1ede8ee22ad9de2dd60fe9a883ba4b7ffcb1200b2dd752e4b65857bebfbdf0f0dd8b49b4