From 8cd5c83bc814db1e4c5e7a823f334e095188e39f Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Tue, 3 Dec 2019 10:41:38 +0100 Subject: [PATCH] New release 1.0 --- .gitignore | 1 + ...lace-.-with-_-in-automatic-uname-pat.patch | 16 ++++++++++ ...move-duplicate-host-profile-argument.patch | 32 +++++++++++++++++++ ...-Remove-dangling-symlinks-in-entries.patch | 22 +++++++++++++ ...table-permission-from-etc-default-bo.patch | 22 +++++++++++++ 0005-man-Fix-line-starting-with.patch | 18 +++++++++++ boom-boot.spec | 26 +++++++++++---- sources | 2 +- 8 files changed, 132 insertions(+), 7 deletions(-) create mode 100644 0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch create mode 100644 0002-boom.command-remove-duplicate-host-profile-argument.patch create mode 100644 0003-examples-Remove-dangling-symlinks-in-entries.patch create mode 100644 0004-etc-Remove-executable-permission-from-etc-default-bo.patch create mode 100644 0005-man-Fix-line-starting-with.patch diff --git a/.gitignore b/.gitignore index 449e126..32d12ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /boom-0.9.tar.gz /boom-6ff3e08.tar.gz +/boom-1.0.tar.gz diff --git a/0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch b/0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch new file mode 100644 index 0000000..3464d2b --- /dev/null +++ b/0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch @@ -0,0 +1,16 @@ + 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 + + diff --git a/0002-boom.command-remove-duplicate-host-profile-argument.patch b/0002-boom.command-remove-duplicate-host-profile-argument.patch new file mode 100644 index 0000000..cc72d5c --- /dev/null +++ b/0002-boom.command-remove-duplicate-host-profile-argument.patch @@ -0,0 +1,32 @@ + 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, diff --git a/0003-examples-Remove-dangling-symlinks-in-entries.patch b/0003-examples-Remove-dangling-symlinks-in-entries.patch new file mode 100644 index 0000000..26d0bb9 --- /dev/null +++ b/0003-examples-Remove-dangling-symlinks-in-entries.patch @@ -0,0 +1,22 @@ + .../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 diff --git a/0004-etc-Remove-executable-permission-from-etc-default-bo.patch b/0004-etc-Remove-executable-permission-from-etc-default-bo.patch new file mode 100644 index 0000000..d454da1 --- /dev/null +++ b/0004-etc-Remove-executable-permission-from-etc-default-bo.patch @@ -0,0 +1,22 @@ + etc/default/boom | 0 + tests/bootloader_configs/boom_off/etc/default/boom | 0 + tests/bootloader_configs/boom_on/etc/default/boom | 0 + tests/bootloader_configs/no_grub_d/etc/default/boom | 0 + 4 files changed, 0 insertions(+), 0 deletions(-) + mode change 100755 => 100644 etc/default/boom + mode change 100755 => 100644 tests/bootloader_configs/boom_off/etc/default/boom + mode change 100755 => 100644 tests/bootloader_configs/boom_on/etc/default/boom + mode change 100755 => 100644 tests/bootloader_configs/no_grub_d/etc/default/boom + +diff --git a/etc/default/boom b/etc/default/boom +old mode 100755 +new mode 100644 +diff --git a/tests/bootloader_configs/boom_off/etc/default/boom b/tests/bootloader_configs/boom_off/etc/default/boom +old mode 100755 +new mode 100644 +diff --git a/tests/bootloader_configs/boom_on/etc/default/boom b/tests/bootloader_configs/boom_on/etc/default/boom +old mode 100755 +new mode 100644 +diff --git a/tests/bootloader_configs/no_grub_d/etc/default/boom b/tests/bootloader_configs/no_grub_d/etc/default/boom +old mode 100755 +new mode 100644 diff --git a/0005-man-Fix-line-starting-with.patch b/0005-man-Fix-line-starting-with.patch new file mode 100644 index 0000000..606d3f7 --- /dev/null +++ b/0005-man-Fix-line-starting-with.patch @@ -0,0 +1,18 @@ + man/man8/boom.8 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/man/man8/boom.8 b/man/man8/boom.8 +index 28bad24..cfc736a 100644 +--- a/man/man8/boom.8 ++++ b/man/man8/boom.8 +@@ -1114,8 +1114,8 @@ describing the properties of the configured host profiles. + + 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 +-'\fBboom host list -o help\fP'. If the list of fields begins with the +-'\fB+\fP' character the specified fields are appended to the default ++\&'\fBboom host list -o help\fP'. If the list of fields begins with the ++\&'\fB+\fP' character the specified fields are appended to the default + field list. Otherwise the given list of fields replaces the default set + of report fields. + diff --git a/boom-boot.spec b/boom-boot.spec index 327db64..0879501 100644 --- a/boom-boot.spec +++ b/boom-boot.spec @@ -1,17 +1,23 @@ %global summary A set of libraries and tools for managing boot loader entries %global sphinx_docs 1 -%global commit 6ff3e0869b9818f4cc477e5771bc9e72352e7737 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: boom-boot Version: 1.0 +<<<<<<< HEAD Release: 0.5.20190329git%{shortcommit}%{?dist} +======= +Release: 1%{?dist} +>>>>>>> New release 1.0 Summary: %{summary} License: GPLv2 -URL: https://github.com/bmr-cymru/boom -Source0: https://github.com/bmr-cymru/boom/archive/%{commit}/boom-%{shortcommit}.tar.gz +URL: https://github.com/snapshotmanager/boom +Source0: https://github.com/snapshotmanager/boom/archive/%{version}/boom-%{version}.tar.gz +Patch0: 0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch +Patch1: 0002-boom.command-remove-duplicate-host-profile-argument.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 @@ -27,7 +33,7 @@ Requires: %{name}-conf = %{version}-%{release} %package -n python3-boom Summary: %{summary} %{?python_provide:%python_provide python3-boom} -Requires: python3 +Requires: %{__python3} Recommends: (lvm2 or brtfs-progs) Recommends: %{name}-conf = %{version}-%{release} @@ -84,6 +90,11 @@ This package provides integration scripts for grub2 bootloader. %prep %setup -q -n boom-%{commit} # NOTE: Do not use backup extension - MANIFEST.in is picking them +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build %if 0%{?sphinx_docs} @@ -154,6 +165,9 @@ rm doc/conf.py %changelog +* Tue Dec 03 2019 Marian Csontos 1.0-1 +- Update to new upstream release 1.0. + * Thu Oct 03 2019 Miro Hrončok - 1.0-0.5.20190329git6ff3e08 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 100349e..96510c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (boom-6ff3e08.tar.gz) = 1500028ad0896240f0d17a605201d16e20b7829eae7d35aa68a862ebdf10ec75ed61f558903ee9b5b060bfc8ba741d225d1c3ae9667a5bc1829f7fca470bfcd7 +SHA512 (boom-1.0.tar.gz) = bdc6d2617e23c54554435c454e350a84570583776aaf3e26fe9cea8d85c9e572f24a7f17ec7bc5553bd30a37eec482a7dc9985f5faf1e249c3755ba9cdc77493