Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/osbuild.git#d38dd0c342fa33afb308acf06037d9488c4dbb85
This commit is contained in:
parent
3628920fcf
commit
e8f9198d70
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,3 +24,4 @@
|
|||||||
/osbuild-24.tar.gz
|
/osbuild-24.tar.gz
|
||||||
/osbuild-25.tar.gz
|
/osbuild-25.tar.gz
|
||||||
/osbuild-26.tar.gz
|
/osbuild-26.tar.gz
|
||||||
|
/osbuild-27.tar.gz
|
||||||
|
23
Fedora-35-runner.patch
Normal file
23
Fedora-35-runner.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
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
|
||||||
|
|
15
osbuild.spec
15
osbuild.spec
@ -1,7 +1,7 @@
|
|||||||
%global forgeurl https://github.com/osbuild/osbuild
|
%global forgeurl https://github.com/osbuild/osbuild
|
||||||
%global selinuxtype targeted
|
%global selinuxtype targeted
|
||||||
|
|
||||||
Version: 26
|
Version: 27
|
||||||
|
|
||||||
%forgemeta
|
%forgemeta
|
||||||
|
|
||||||
@ -9,12 +9,14 @@ Version: 26
|
|||||||
%global pkgdir %{_prefix}/lib/%{pypi_name}
|
%global pkgdir %{_prefix}/lib/%{pypi_name}
|
||||||
|
|
||||||
Name: %{pypi_name}
|
Name: %{pypi_name}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
|
|
||||||
URL: %{forgeurl}
|
URL: %{forgeurl}
|
||||||
|
|
||||||
Source0: %{forgesource}
|
Source0: %{forgesource}
|
||||||
|
# Fedora 35 runner, upstream commit 337e0f0
|
||||||
|
Patch0: Fedora-35-runner.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Summary: A build system for OS images
|
Summary: A build system for OS images
|
||||||
|
|
||||||
@ -92,6 +94,7 @@ containers it uses to build OS artifacts.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%forgesetup
|
%forgesetup
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%py3_build
|
||||||
@ -187,6 +190,14 @@ fi
|
|||||||
%selinux_relabel_post -s %{selinuxtype}
|
%selinux_relabel_post -s %{selinuxtype}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 17 2021 Christian Kellner <ckellner@redhat.com> - 27-2
|
||||||
|
- Include Fedora 35 runner (upstream commit 337e0f0)
|
||||||
|
|
||||||
|
* Tue Mar 16 2021 Christian Kellner <ckellner@redhat.com> - 27-1
|
||||||
|
- Upstream release 27
|
||||||
|
- Various bug fixes related to the new container and installer
|
||||||
|
stages introdcued in version 25 and 26.
|
||||||
|
|
||||||
* Sat Feb 20 2021 Christian Kellner <ckellner@redhat.com> - 26-1
|
* Sat Feb 20 2021 Christian Kellner <ckellner@redhat.com> - 26-1
|
||||||
- Upstream release 26
|
- Upstream release 26
|
||||||
- Support for building boot isos
|
- Support for building boot isos
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (osbuild-26.tar.gz) = 62071768805e8369601ee1cd9bb11379d6dd99dd67eb8dad8f3bf8ddada2a2a8db5d4cff93602562ba059122112e7dbf8105f1ed9dfd0981b3c04aa1b6d924e5
|
SHA512 (osbuild-27.tar.gz) = 43995f0747a62cce7ba87ab8d589ceba96f7c2048bf68c14388c97cf2bc0a39211a7e377fe821000bc94ac8f74a15217acd914bc3adea5f46a4b682c6d7d0039
|
||||||
|
@ -16,4 +16,4 @@
|
|||||||
run: osbuild --help
|
run: osbuild --help
|
||||||
- image:
|
- image:
|
||||||
dir: .
|
dir: .
|
||||||
run: osbuild source/samples/base-qcow2.json
|
run: osbuild source/test/data/manifests/fedora-boot.json --output-directory=/var/tmp/osbuild
|
||||||
|
Loading…
Reference in New Issue
Block a user