forked from pool/mkosi
- update to version 4
* no changelog available * removed 109.patch, merged upstream OBS-URL: https://build.opensuse.org/package/show/Virtualization/mkosi?expand=0&rev=3
This commit is contained in:
Sebastian Wagner
committed by
Git OBS Bridge
Git OBS Bridge
parent
645d2c0920
commit
c524532867
47
109.patch
47
109.patch
@@ -1,47 +0,0 @@
|
||||
From 74995435564a36e81e7a79b51013f94405786e52 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Wagner <sebix@sebix.at>
|
||||
Date: Thu, 29 Jun 2017 18:45:07 +0200
|
||||
Subject: [PATCH 1/2] Fix opensuse repo URL
|
||||
|
||||
It does not work with HTTP, zypper gives an error
|
||||
---
|
||||
mkosi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mkosi b/mkosi
|
||||
index aa812e0..ad281da 100755
|
||||
--- a/mkosi
|
||||
+++ b/mkosi
|
||||
@@ -2287,7 +2287,7 @@ def load_args():
|
||||
if platform.machine() == "aarch64":
|
||||
args.mirror = "http://mirror.archlinuxarm.org"
|
||||
elif args.distribution == Distribution.opensuse:
|
||||
- args.mirror = "https://download.opensuse.org"
|
||||
+ args.mirror = "http://download.opensuse.org"
|
||||
|
||||
if args.bootable:
|
||||
if args.distribution == Distribution.ubuntu:
|
||||
|
||||
From 1510f7eea8847c904900138831e63c89ea5da7b2 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Wagner <sebix@sebix.at>
|
||||
Date: Sun, 2 Jul 2017 16:01:32 +0200
|
||||
Subject: [PATCH 2/2] Fix opensuse pattern installation
|
||||
|
||||
It's not a pattern, it's a package and the name is different
|
||||
---
|
||||
mkosi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mkosi b/mkosi
|
||||
index ad281da..d3fa0c0 100755
|
||||
--- a/mkosi
|
||||
+++ b/mkosi
|
||||
@@ -1028,7 +1028,7 @@ def install_opensuse(args, workspace, run_build_script):
|
||||
#
|
||||
# Install the "minimal" package set.
|
||||
#
|
||||
- subprocess.run(cmdline + ["-t", "pattern", "minimal_base"], check=True)
|
||||
+ subprocess.run(cmdline + ["patterns-base-minimal_base"], check=True)
|
||||
|
||||
#
|
||||
# Now install the additional packages if necessary.
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3bb606f16a26e08ce071e673cb935e62cecb3559db6b41c620f240666d7c5734
|
||||
size 36054
|
||||
3
mkosi-4.tar.gz
Normal file
3
mkosi-4.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:855666aa7a16fcc41b0a2e5f12dc1916d19e03c9d174332ef0fd53cb137da8f2
|
||||
size 44664
|
||||
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 12 19:22:30 UTC 2018 - sebix+novell.com@sebix.at
|
||||
|
||||
- update to version 4
|
||||
* no changelog available
|
||||
* removed 109.patch, merged upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 29 16:20:46 UTC 2017 - sebix+novell.com@sebix.at
|
||||
|
||||
|
||||
20
mkosi.spec
20
mkosi.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package mkosi
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -17,16 +17,15 @@
|
||||
|
||||
|
||||
Name: mkosi
|
||||
Version: 3
|
||||
Version: 4
|
||||
Release: 0
|
||||
Summary: Build Legacy-Free OS Images
|
||||
License: LGPL-2.1
|
||||
License: LGPL-2.1+
|
||||
Group: System/Management
|
||||
Url: https://github.com/systemd/mkosi
|
||||
Source: https://github.com/systemd/mkosi/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
#PATCH-FIX-UPSTREAM 109.patch boo#1049997 sebix+novell.com@sebix.at -- fixes opensuse specific calls
|
||||
Patch0: https://github.com/systemd/mkosi/pull/109.patch
|
||||
BuildRequires: python3 >= 3.5
|
||||
BuildRequires: python3-setuptools
|
||||
Requires: python3 >= 3.5
|
||||
Requires: squashfs
|
||||
Recommends: btrfs-progs
|
||||
@@ -40,7 +39,7 @@ Recommends: xz
|
||||
Recommends: debootstrap >= 1.0.83
|
||||
Recommends: dnf
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: x86_64
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
A fancy wrapper around dnf --installroot, debootstrap, pacstrap and zypper that
|
||||
@@ -53,25 +52,26 @@ supported (not plain MBR/BIOS).
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
# not required
|
||||
python3 setup.py build
|
||||
|
||||
%install
|
||||
install -Dpt %{buildroot}%{_bindir}/ mkosi
|
||||
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
||||
|
||||
%check
|
||||
%{buildroot}%{_bindir}/mkosi -h
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
%doc README.md
|
||||
%if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320
|
||||
%license LICENSE
|
||||
%else
|
||||
%doc LICENSE
|
||||
%endif
|
||||
%{_bindir}/%{name}
|
||||
%doc mkosi.default
|
||||
%{python3_sitelib}/
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user