New upstream release 4.1.15
This commit is contained in:
Lubomír Sedlář
parent
609a02d1f1
commit
8307bc6d5f
@ -1,44 +0,0 @@
|
||||
From 01607602c699a79c322627a69669c5bc3874abfe Mon Sep 17 00:00:00 2001
|
||||
From: Ralph Bean <rbean@redhat.com>
|
||||
Date: Wed, 12 Apr 2017 14:31:40 -0400
|
||||
Subject: [PATCH] Expand compatible arches when gathering from modules.
|
||||
|
||||
Fixes #596.
|
||||
|
||||
Signed-off-by: Ralph Bean <rbean@redhat.com>
|
||||
---
|
||||
pungi/phases/gather/sources/source_module.py | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/pungi/phases/gather/sources/source_module.py b/pungi/phases/gather/sources/source_module.py
|
||||
index dd7eaff..93c7169 100644
|
||||
--- a/pungi/phases/gather/sources/source_module.py
|
||||
+++ b/pungi/phases/gather/sources/source_module.py
|
||||
@@ -19,7 +19,7 @@ Get a package list based on modulemd metadata loaded in pkgset phase.
|
||||
"""
|
||||
|
||||
|
||||
-from pungi.wrappers.comps import CompsWrapper
|
||||
+import pungi.arch
|
||||
import pungi.phases.gather.source
|
||||
import kobo.rpmlib
|
||||
|
||||
@@ -31,9 +31,13 @@ class GatherSourceModule(pungi.phases.gather.source.GatherSourceBase):
|
||||
groups = set()
|
||||
packages = set()
|
||||
|
||||
+ compatible_arches = pungi.arch.get_compatible_arches(arch)
|
||||
+
|
||||
if variant is not None and variant.modules:
|
||||
- rpms = variant.pkgset.rpms_by_arch[arch] + \
|
||||
- variant.pkgset.rpms_by_arch["noarch"]
|
||||
+ rpms = sum([
|
||||
+ variant.pkgset.rpms_by_arch.get(a, [])
|
||||
+ for a in compatible_arches
|
||||
+ ], [])
|
||||
for rpm_obj in rpms:
|
||||
for mmd in variant.mmds:
|
||||
srpm = kobo.rpmlib.parse_nvr(rpm_obj.sourcerpm)["name"]
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
From 621f1e224737bae86d449503fb0aec7abac9d197 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Kaluza <jkaluza@redhat.com>
|
||||
Date: Tue, 11 Apr 2017 14:46:38 +0200
|
||||
Subject: [PATCH] Fix createrepo issue for modular compose when multiple
|
||||
threads tried to use the same tmp directory.
|
||||
|
||||
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
|
||||
---
|
||||
pungi/phases/createrepo.py | 23 +++++++++++------------
|
||||
1 file changed, 11 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/pungi/phases/createrepo.py b/pungi/phases/createrepo.py
|
||||
index 6468229..74087eb 100644
|
||||
--- a/pungi/phases/createrepo.py
|
||||
+++ b/pungi/phases/createrepo.py
|
||||
@@ -30,7 +30,7 @@ from kobo.shortcuts import run, relative_path
|
||||
from ..wrappers.scm import get_dir_from_scm
|
||||
from ..wrappers.createrepo import CreaterepoWrapper
|
||||
from .base import PhaseBase
|
||||
-from ..util import find_old_compose
|
||||
+from ..util import find_old_compose, temp_dir
|
||||
|
||||
import productmd.rpms
|
||||
|
||||
@@ -187,17 +187,16 @@ def create_variant_repo(compose, arch, variant, pkg_type):
|
||||
modules = {"modules": []}
|
||||
for mmd in variant.mmds:
|
||||
modules["modules"].append(yaml.safe_load(mmd.dumps()))
|
||||
- tmp_dir = compose.mkdtemp(prefix="pungi_")
|
||||
- modules_path = os.path.join(tmp_dir, "modules.yaml")
|
||||
- with open(modules_path, "w") as outfile:
|
||||
- outfile.write(yaml.safe_dump(modules))
|
||||
- cmd = repo.get_modifyrepo_cmd(os.path.join(repo_dir, "repodata"),
|
||||
- modules_path, mdtype="modules",
|
||||
- compress_type="gz")
|
||||
- log_file = compose.paths.log.log_file(
|
||||
- arch, "modifyrepo-modules-%s" % variant)
|
||||
- run(cmd, logfile=log_file, show_cmd=True)
|
||||
- shutil.rmtree(tmp_dir)
|
||||
+ with temp_dir() as tmp_dir:
|
||||
+ modules_path = os.path.join(tmp_dir, "modules.yaml")
|
||||
+ with open(modules_path, "w") as outfile:
|
||||
+ outfile.write(yaml.safe_dump(modules))
|
||||
+ cmd = repo.get_modifyrepo_cmd(os.path.join(repo_dir, "repodata"),
|
||||
+ modules_path, mdtype="modules",
|
||||
+ compress_type="gz")
|
||||
+ log_file = compose.paths.log.log_file(
|
||||
+ arch, "modifyrepo-modules-%s" % variant)
|
||||
+ run(cmd, logfile=log_file, show_cmd=True)
|
||||
|
||||
compose.log_info("[DONE ] %s" % msg)
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
62
pungi.spec
62
pungi.spec
@ -1,14 +1,12 @@
|
||||
Name: pungi
|
||||
Version: 4.1.14
|
||||
Release: 3%{?dist}
|
||||
Version: 4.1.15
|
||||
Release: 1%{?dist}
|
||||
Summary: Distribution compose tool
|
||||
|
||||
Group: Development/Tools
|
||||
License: GPLv2
|
||||
URL: https://pagure.io/pungi
|
||||
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
|
||||
Patch0: 0001-Fix-createrepo-issue-for-modular-compose-when-multip.patch
|
||||
Patch1: 0001-Expand-compatible-arches-when-gathering-from-modules.patch
|
||||
|
||||
BuildRequires: python-nose, python-mock
|
||||
BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3
|
||||
@ -20,6 +18,7 @@ BuildRequires: python-jsonschema
|
||||
BuildRequires: python-enum34
|
||||
BuildRequires: python2-dnf
|
||||
BuildRequires: python2-multilib
|
||||
BuildRequires: python2-libcomps
|
||||
|
||||
#deps for doc building
|
||||
BuildRequires: python-sphinx, texlive-latex-bin-bin, texlive-collection-fontsrecommended
|
||||
@ -58,6 +57,7 @@ Requires: libguestfs-tools-c
|
||||
Requires: python-enum34
|
||||
Requires: python2-dnf
|
||||
Requires: python2-multilib
|
||||
Requires: python2-libcomps
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -76,8 +76,6 @@ notification to Fedora Message Bus.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%{__python} setup.py build
|
||||
@ -122,6 +120,58 @@ cd tests && ./test_compose.sh
|
||||
%{_bindir}/%{name}-compare-depsolving
|
||||
|
||||
%changelog
|
||||
* Fri May 05 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.15-1
|
||||
- pkgset: Remove use of undefined variable (lsedlar)
|
||||
- Store RPM artifacts in resulting repository in modulemd metadata. (jkaluza)
|
||||
- variants: Remove redundant check (lsedlar)
|
||||
- compose: Stop duplicating variant types (lsedlar)
|
||||
- gather: Remove handling of impossible state (lsedlar)
|
||||
- gather: Clean up code (lsedlar)
|
||||
- gather: Add tests for gather phase (lsedlar)
|
||||
- scm-wrapper: Remove unused arguments (lsedlar)
|
||||
- tests: Avoid creating unused temporary files (lsedlar)
|
||||
- tests: Clean up persistent temporary data (lsedlar)
|
||||
- docs: Add a logo on the About page (lsedlar)
|
||||
- docs: Document origin of the name (lsedlar)
|
||||
- gather-dnf: Log exact Requires pulling a package in (lsedlar)
|
||||
- gather: Print specific Requires which pulls a package in (lsedlar)
|
||||
- gather: Process dependencies sorted (lsedlar)
|
||||
- koji-wrapper: Run koji runroot with fresh credentials cache (lsedlar)
|
||||
- util: Move get_buildroot_rpms to koji wrapper (lsedlar)
|
||||
- osbs: Make git_branch required option (lsedlar)
|
||||
- docs: Update createrepo_checksum allowed values (lsedlar)
|
||||
- extra-files: Allow configuring used checksums (lsedlar)
|
||||
- doc: Document options for media checksums (lsedlar)
|
||||
- config: Add sha512 as valid createrepo checksum (lsedlar)
|
||||
- util: Report better error on resolving non-existing branch (lsedlar)
|
||||
- util: Show choices for volid if all are too long (lsedlar)
|
||||
- checks: Fix anyOf validator yield ValidationError on ConfigOptionWarning
|
||||
(qwan)
|
||||
- comps-wrapper: Reduce duplication in code (lsedlar)
|
||||
- comps-wrapper: Port to libcomps (lsedlar)
|
||||
- comps-wrapper: Sort langpacks by name (lsedlar)
|
||||
- comps-wrapper: Minor code cleanup (lsedlar)
|
||||
- comps-wrapper: Add tests (lsedlar)
|
||||
- comps-wrapper: Fix uservisible not being modifiable (lsedlar)
|
||||
- comps-wrapper: Return IDs instead of yum.comps.Group (lsedlar)
|
||||
- comps-wrapper: Remove unused code (lsedlar)
|
||||
- Be explicit about generating release for images (lsedlar)
|
||||
- docs: Add examples for generated versions (lsedlar)
|
||||
- ostree: Autogenerate a version (lsedlar)
|
||||
- Expand compatible arches when gathering from modules. (rbean)
|
||||
- gather: Clean up method deps (lsedlar)
|
||||
- gather: Report error if there is no input (lsedlar)
|
||||
- init: Warn when variants mentions non-existing comps group (lsedlar)
|
||||
- Fix createrepo issue for modular compose when multiple threads tried to use
|
||||
the same tmp directory. (jkaluza)
|
||||
- unified-iso: Use different type for debuginfo iso (lsedlar)
|
||||
- unified-iso: Handle missing paths in metadata (lsedlar)
|
||||
- unify repo and repo_from options (qwan)
|
||||
- Fix some PEP8 errors in util.py (qwan)
|
||||
- move translate_path from paths.py to util.py (qwan)
|
||||
- checks.py: support 'append' option (qwan)
|
||||
- checks.py: show warning message for alias option (qwan)
|
||||
|
||||
* Thu Apr 13 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.14-3
|
||||
- Expand compatible arches when gathering from modules
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (pungi-4.1.14.tar.bz2) = f6f0c412c318e8fb65caaadaed592a5f4be309f3833c2649583878a722e46b5e3a92362dde205302b93ee5fd06ef6ef265fedc50c5cdbd434d311095490b315d
|
||||
SHA512 (pungi-4.1.15.tar.bz2) = 7748f7c0f111dbafeaa58299740c6fcac0ad981b7052ab321c9e281e3a53df1aace561b2072d482883b37c59f9726db49a3419a340abaffb0f3859bfd3dbe1c7
|
||||
|
||||
Loading…
Reference in New Issue
Block a user