Update boom-boot to release 1.1
This commit is contained in:
parent
c4730a7688
commit
2d014b2879
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
/boom-0.9.tar.gz
|
/boom-0.9.tar.gz
|
||||||
/boom-6ff3e08.tar.gz
|
/boom-6ff3e08.tar.gz
|
||||||
/boom-1.0.tar.gz
|
/boom-1.0.tar.gz
|
||||||
|
/boom-1.1.tar.gz
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
boom/command.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/boom/command.py b/boom/command.py
|
|
||||||
index a113c21..487b9bd 100644
|
|
||||||
--- a/boom/command.py
|
|
||||||
+++ b/boom/command.py
|
|
||||||
@@ -908,7 +908,7 @@ def _uname_heuristic(name, version_id):
|
|
||||||
}
|
|
||||||
|
|
||||||
if name in _name_to_uname:
|
|
||||||
- return "%s%s" % (_name_to_uname[name], version_id)
|
|
||||||
+ return "%s%s" % (_name_to_uname[name], version_id.replace(".", "_"))
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
|||||||
boom/_boom.py | 2 +-
|
|
||||||
boom/command.py | 4 +---
|
|
||||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/boom/_boom.py b/boom/_boom.py
|
|
||||||
index 4a84b78..d8fff54 100644
|
|
||||||
--- a/boom/_boom.py
|
|
||||||
+++ b/boom/_boom.py
|
|
||||||
@@ -629,7 +629,7 @@ class Selection(object):
|
|
||||||
os_version_id=args.os_version_id,
|
|
||||||
os_options=args.os_options,
|
|
||||||
os_uname_pattern=args.uname_pattern,
|
|
||||||
- host_id=args.host_profile)
|
|
||||||
+ host_id=args.host_id)
|
|
||||||
|
|
||||||
_log_debug("Initialised %s from arguments" % repr(s))
|
|
||||||
return s
|
|
||||||
diff --git a/boom/command.py b/boom/command.py
|
|
||||||
index 487b9bd..5a50f98 100644
|
|
||||||
--- a/boom/command.py
|
|
||||||
+++ b/boom/command.py
|
|
||||||
@@ -2787,9 +2787,7 @@ def main(args):
|
|
||||||
help="Take os-release values from the running host",
|
|
||||||
action="store_true")
|
|
||||||
parser.add_argument("-P", "--host-profile", metavar="PROFILE", type=str,
|
|
||||||
- help="A boom host profile identifier")
|
|
||||||
- parser.add_argument("--host-id", metavar="HOSTID", type=str,
|
|
||||||
- help="A host profile identifier")
|
|
||||||
+ help="A boom host profile identifier", dest="host_id")
|
|
||||||
parser.add_argument("--host-name", metavar="HOSTNAME", type=str,
|
|
||||||
help="The host name associated with a host profile")
|
|
||||||
parser.add_argument("-i", "--initrd", metavar="IMG", type=str,
|
|
@ -2,10 +2,10 @@
|
|||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/man/man8/boom.8 b/man/man8/boom.8
|
diff --git a/man/man8/boom.8 b/man/man8/boom.8
|
||||||
index 28bad24..cfc736a 100644
|
index 7b862e7..9eee048 100644
|
||||||
--- a/man/man8/boom.8
|
--- a/man/man8/boom.8
|
||||||
+++ b/man/man8/boom.8
|
+++ b/man/man8/boom.8
|
||||||
@@ -1114,8 +1114,8 @@ describing the properties of the configured host profiles.
|
@@ -1168,8 +1168,8 @@ describing the properties of the configured host profiles.
|
||||||
|
|
||||||
The list of fields to display is given with \fB--options\fP as a comma
|
The list of fields to display is given with \fB--options\fP as a comma
|
||||||
separated list of field names. To obtain a list of available fields run
|
separated list of field names. To obtain a list of available fields run
|
@ -1,22 +0,0 @@
|
|||||||
.../entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf | 1 -
|
|
||||||
.../entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf | 1 -
|
|
||||||
2 files changed, 2 deletions(-)
|
|
||||||
delete mode 120000 examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
|
|
||||||
delete mode 120000 examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
|
|
||||||
|
|
||||||
diff --git a/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf b/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
|
|
||||||
deleted file mode 120000
|
|
||||||
index 70b5b3f..0000000
|
|
||||||
--- a/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1 +0,0 @@
|
|
||||||
-../../tests/loader/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
|
|
||||||
\ No newline at end of file
|
|
||||||
diff --git a/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf b/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
|
|
||||||
deleted file mode 120000
|
|
||||||
index 4a62f7d..0000000
|
|
||||||
--- a/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1 +0,0 @@
|
|
||||||
-../../tests/loader/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
|
|
||||||
\ No newline at end of file
|
|
@ -2,18 +2,15 @@
|
|||||||
%global sphinx_docs 1
|
%global sphinx_docs 1
|
||||||
|
|
||||||
Name: boom-boot
|
Name: boom-boot
|
||||||
Version: 1.0
|
Version: 1.1
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: %{summary}
|
Summary: %{summary}
|
||||||
|
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://github.com/snapshotmanager/boom
|
URL: https://github.com/snapshotmanager/boom
|
||||||
Source0: https://github.com/snapshotmanager/boom/archive/%{version}/boom-%{version}.tar.gz
|
Source0: https://github.com/snapshotmanager/boom/archive/%{version}/boom-%{version}.tar.gz
|
||||||
Patch0: 0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch
|
Patch1: 0001-etc-Remove-executable-permission-from-etc-default-bo.patch
|
||||||
Patch1: 0002-boom.command-remove-duplicate-host-profile-argument.patch
|
Patch2: 0002-man-Fix-line-starting-with.patch
|
||||||
Patch2: 0003-examples-Remove-dangling-symlinks-in-entries.patch
|
|
||||||
Patch3: 0004-etc-Remove-executable-permission-from-etc-default-bo.patch
|
|
||||||
Patch4: 0005-man-Fix-line-starting-with.patch
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -86,11 +83,8 @@ This package provides integration scripts for grub2 bootloader.
|
|||||||
%prep
|
%prep
|
||||||
%setup -n boom-%{version}
|
%setup -n boom-%{version}
|
||||||
# NOTE: Do not use backup extension - MANIFEST.in is picking them
|
# NOTE: Do not use backup extension - MANIFEST.in is picking them
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
%patch4 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?sphinx_docs}
|
%if 0%{?sphinx_docs}
|
||||||
@ -116,6 +110,7 @@ install -m 644 etc/default/boom ${RPM_BUILD_ROOT}/etc/default
|
|||||||
install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/profiles
|
install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/profiles
|
||||||
install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/hosts
|
install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/hosts
|
||||||
install -d -m 700 ${RPM_BUILD_ROOT}/boot/loader/entries
|
install -d -m 700 ${RPM_BUILD_ROOT}/boot/loader/entries
|
||||||
|
install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/cache
|
||||||
install -m 644 examples/boom.conf ${RPM_BUILD_ROOT}/boot/boom
|
install -m 644 examples/boom.conf ${RPM_BUILD_ROOT}/boot/boom
|
||||||
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man8
|
mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man8
|
||||||
@ -151,6 +146,7 @@ rm doc/conf.py
|
|||||||
%config(noreplace) /boot/boom/boom.conf
|
%config(noreplace) /boot/boom/boom.conf
|
||||||
%dir /boot/boom/profiles
|
%dir /boot/boom/profiles
|
||||||
%dir /boot/boom/hosts
|
%dir /boot/boom/hosts
|
||||||
|
%dir /boot/boom/cache
|
||||||
%dir /boot/loader/entries
|
%dir /boot/loader/entries
|
||||||
|
|
||||||
%files grub2
|
%files grub2
|
||||||
@ -161,6 +157,10 @@ rm doc/conf.py
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 14 2020 Marian Csontos <mcsontos@redhat.com> 1.1-1
|
||||||
|
- Update to new upstream release 1.1.
|
||||||
|
- Add caching of kernel and init ramdisk images.
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (boom-1.0.tar.gz) = bdc6d2617e23c54554435c454e350a84570583776aaf3e26fe9cea8d85c9e572f24a7f17ec7bc5553bd30a37eec482a7dc9985f5faf1e249c3755ba9cdc77493
|
SHA512 (boom-1.1.tar.gz) = fdd8894f59be4732bdb2c4471ff13f74c6e635a16587a54b2df718f4ef7e64d9df6618f599d1e5ac9b072883780c7c988ec670d2ae603340ef626005e8a6e1da
|
||||||
|
Loading…
Reference in New Issue
Block a user