28 upstream release
New upstream release with fixes for the oci stage and official support for the Fedora 35 runner. Resolves: rhbz#1939763
This commit is contained in:
parent
2a74b3dc26
commit
aedc9b8f2c
1
.gitignore
vendored
1
.gitignore
vendored
@ -25,3 +25,4 @@
|
||||
/osbuild-25.tar.gz
|
||||
/osbuild-26.tar.gz
|
||||
/osbuild-27.tar.gz
|
||||
/osbuild-28.tar.gz
|
||||
|
@ -1,23 +0,0 @@
|
||||
From 337e0f05ea55f7b2ee107fbc1e989d82d1815193 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Kellner <christian@kellner.me>
|
||||
Date: Wed, 17 Mar 2021 11:03:22 +0100
|
||||
Subject: [PATCH] runners: add Fedora 35 runner
|
||||
|
||||
New `org.osbuild.fedora35` which is re-using the f30 runner.
|
||||
Needed since Fedora 35 branched in early February.
|
||||
---
|
||||
runners/org.osbuild.fedora35 | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
create mode 120000 runners/org.osbuild.fedora35
|
||||
|
||||
diff --git a/runners/org.osbuild.fedora35 b/runners/org.osbuild.fedora35
|
||||
new file mode 120000
|
||||
index 0000000..d46777b
|
||||
--- /dev/null
|
||||
+++ b/runners/org.osbuild.fedora35
|
||||
@@ -0,0 +1 @@
|
||||
+org.osbuild.fedora30
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.29.2
|
||||
|
11
osbuild.spec
11
osbuild.spec
@ -1,7 +1,7 @@
|
||||
%global forgeurl https://github.com/osbuild/osbuild
|
||||
%global selinuxtype targeted
|
||||
|
||||
Version: 27
|
||||
Version: 28
|
||||
|
||||
%forgemeta
|
||||
|
||||
@ -9,14 +9,12 @@ Version: 27
|
||||
%global pkgdir %{_prefix}/lib/%{pypi_name}
|
||||
|
||||
Name: %{pypi_name}
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
License: ASL 2.0
|
||||
|
||||
URL: %{forgeurl}
|
||||
|
||||
Source0: %{forgesource}
|
||||
# Fedora 35 runner, upstream commit 337e0f0
|
||||
Patch0: Fedora-35-runner.patch
|
||||
BuildArch: noarch
|
||||
Summary: A build system for OS images
|
||||
|
||||
@ -94,7 +92,6 @@ containers it uses to build OS artifacts.
|
||||
|
||||
%prep
|
||||
%forgesetup
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
@ -190,6 +187,10 @@ fi
|
||||
%selinux_relabel_post -s %{selinuxtype}
|
||||
|
||||
%changelog
|
||||
* Thu Apr 8 2021 Christian Kellner <ckellner@redhat.com> - 28-1
|
||||
- Upstream release 28
|
||||
- Drop Fedora 35 runner patch incldued in release 28.
|
||||
|
||||
* Wed Mar 17 2021 Christian Kellner <ckellner@redhat.com> - 27-2
|
||||
- Include Fedora 35 runner (upstream commit 337e0f0)
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (osbuild-27.tar.gz) = 43995f0747a62cce7ba87ab8d589ceba96f7c2048bf68c14388c97cf2bc0a39211a7e377fe821000bc94ac8f74a15217acd914bc3adea5f46a4b682c6d7d0039
|
||||
SHA512 (osbuild-28.tar.gz) = 855b6db566f9c0011e76d143f83183ae09a00e338ada241fc27f9412b20f37ff36692ec30b28dc9542eb457ea2a4fbd0e351821270b5d79a870f697a686e0d88
|
||||
|
Loading…
Reference in New Issue
Block a user