diff --git a/.boom-boot.metadata b/.boom-boot.metadata index 685ac49..3c39db8 100644 --- a/.boom-boot.metadata +++ b/.boom-boot.metadata @@ -1 +1 @@ -2234a16cde5e1634b25834a9891061c01bec1f48 SOURCES/boom-1.0.tar.gz +67070610fcc9a8ee2c4fcdb165947b1d30599342 SOURCES/boom-1.2.tar.gz diff --git a/.gitignore b/.gitignore index 9333446..40c357f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/boom-1.0.tar.gz +SOURCES/boom-1.2.tar.gz diff --git a/SOURCES/0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch b/SOURCES/0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch deleted file mode 100644 index 3464d2b..0000000 --- a/SOURCES/0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch +++ /dev/null @@ -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 - - diff --git a/SOURCES/0001-etc-Remove-executable-permission-from-etc-default-bo.patch b/SOURCES/0001-etc-Remove-executable-permission-from-etc-default-bo.patch new file mode 100644 index 0000000..d454da1 --- /dev/null +++ b/SOURCES/0001-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/SOURCES/0002-boom.command-remove-duplicate-host-profile-argument.patch b/SOURCES/0002-boom.command-remove-duplicate-host-profile-argument.patch deleted file mode 100644 index cc72d5c..0000000 --- a/SOURCES/0002-boom.command-remove-duplicate-host-profile-argument.patch +++ /dev/null @@ -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, diff --git a/SOURCES/0002-man-Fix-line-starting-with.patch b/SOURCES/0002-man-Fix-line-starting-with.patch new file mode 100644 index 0000000..f747576 --- /dev/null +++ b/SOURCES/0002-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 7b862e7..9eee048 100644 +--- a/man/man8/boom.8 ++++ b/man/man8/boom.8 +@@ -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 + 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/SOURCES/0003-examples-Remove-dangling-symlinks-in-entries.patch b/SOURCES/0003-examples-Remove-dangling-symlinks-in-entries.patch deleted file mode 100644 index 26d0bb9..0000000 --- a/SOURCES/0003-examples-Remove-dangling-symlinks-in-entries.patch +++ /dev/null @@ -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 diff --git a/SOURCES/0004-etc-Remove-executable-permission-from-etc-default-bo.patch b/SOURCES/0004-etc-Remove-executable-permission-from-etc-default-bo.patch deleted file mode 100644 index d454da1..0000000 --- a/SOURCES/0004-etc-Remove-executable-permission-from-etc-default-bo.patch +++ /dev/null @@ -1,22 +0,0 @@ - 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/SOURCES/0005-man-Fix-line-starting-with.patch b/SOURCES/0005-man-Fix-line-starting-with.patch deleted file mode 100644 index 606d3f7..0000000 --- a/SOURCES/0005-man-Fix-line-starting-with.patch +++ /dev/null @@ -1,18 +0,0 @@ - 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/SPECS/boom-boot.spec b/SPECS/boom-boot.spec index 9b45070..6d5a4cc 100644 --- a/SPECS/boom-boot.spec +++ b/SPECS/boom-boot.spec @@ -2,7 +2,7 @@ %global sphinx_docs 1 Name: boom-boot -Version: 1.0 +Version: 1.2 Release: 1%{?dist} Summary: %{summary} @@ -10,11 +10,8 @@ License: GPLv2 URL: https://github.com/snapshotmanager/boom Source0: https://github.com/snapshotmanager/boom/archive/%{version}/boom-%{version}.tar.gz Patch0: Disable-GRUB2-plugin-on-RHEL-8.patch -Patch1: 0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch -Patch2: 0002-boom.command-remove-duplicate-host-profile-argument.patch -Patch3: 0003-examples-Remove-dangling-symlinks-in-entries.patch -Patch4: 0004-etc-Remove-executable-permission-from-etc-default-bo.patch -Patch5: 0005-man-Fix-line-starting-with.patch +Patch1: 0001-etc-Remove-executable-permission-from-etc-default-bo.patch +Patch2: 0002-man-Fix-line-starting-with.patch BuildArch: noarch @@ -93,9 +90,6 @@ This package provides integration scripts for grub2 bootloader. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %if 0%{?sphinx_docs} @@ -121,6 +115,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/hosts 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 mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man8 @@ -156,6 +151,7 @@ rm doc/conf.py %config(noreplace) /boot/boom/boom.conf %dir /boot/boom/profiles %dir /boot/boom/hosts +%dir /boot/boom/cache %dir /boot/loader/entries %files grub2 @@ -166,6 +162,17 @@ rm doc/conf.py %changelog +* Sun Jun 07 2020 Marian Csontos 1.2-1 +- Update to bug fix release 1.2. + +* Tue May 26 2020 Marian Csontos 1.1-2 +- Fix unicode entries handling. +- Add tracebacks when --debug is used. + +* Thu May 14 2020 Marian Csontos 1.1-1 +- Update to new upstream release 1.1. +- Add caching of kernel and init ramdisk images. + * Fri Nov 29 2019 Marian Csontos 1.0-1 - Update to new upstream release 1.0.