ngompa pushed to rpms/kiwi (epel9). "Update to 9.24.50 (RH#2137048)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:01:20 UTC
From 5202f74c2ae29d60529c905f64bbfc86a44c8ad9 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Nov 29 2022 15:59:57 +0000
Subject: Update to 9.24.50 (RH#2137048)
---
diff --git a/.gitignore b/.gitignore
index a55c9c2..58399b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
/kiwi-9.24.43.tar.gz
/kiwi-9.24.44.tar.gz
/kiwi-9.24.48.tar.gz
+/kiwi-9.24.50.tar.gz
diff --git a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch b/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
deleted file mode 100644
index 1c1fe56..0000000
--- a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 1f547d6bb994d7d0cbed857b1b8d9b4ec79081be Mon Sep 17 00:00:00 2001
-From: Igor Raits <igor.raits(a)gmail.com>
-Date: Wed, 12 Oct 2022 20:31:54 +0200
-Subject: [PATCH] Stop copying /dev files statically into the OCI container
-
-In containers (nspawn) where part of the /dev filesystem is bind-mounted
-from outside system, kiwi fails to do the rsync (in creation of the
-nodes).
-
-There is no reason to actually copy whole tree inside so let's just
-not do it (as it does not seem to be needed at all).
----
- kiwi/container/setup/base.py | 23 -----------------------
- kiwi/container/setup/oci.py | 1 -
- test/unit/container/setup/base_test.py | 20 --------------------
- test/unit/container/setup/oci_test.py | 2 --
- 4 files changed, 46 deletions(-)
-
-diff --git a/kiwi/container/setup/base.py b/kiwi/container/setup/base.py
-index d2fc56aa66..5a462889d0 100644
---- a/kiwi/container/setup/base.py
-+++ b/kiwi/container/setup/base.py
-@@ -20,7 +20,6 @@
-
- # project
- from kiwi.command import Command
--from kiwi.utils.sync import DataSync
-
- from kiwi.exceptions import (
- KiwiContainerSetupError
-@@ -145,28 +144,6 @@ def setup_root_console(self):
- }
- )
-
-- def setup_static_device_nodes(self):
-- """
-- Container device node setup
--
-- Without subsystems like udev running in a container it is
-- required to provide a set of device nodes to let the
-- system in the container function correctly. This is
-- done by syncing the host system nodes to the container.
-- That this will also create device nodes which are not
-- necessarily present in the container later is a know
-- limitation of this method and considered harmless
-- """
-- try:
-- data = DataSync('/dev/', self.root_dir + '/dev/')
-- data.sync_data(
-- options=['-a', '-x', '--devices', '--specials']
-- )
-- except Exception as e:
-- raise KiwiContainerSetupError(
-- 'Failed to create static container nodes %s' % format(e)
-- )
--
- def get_container_name(self):
- """
- Container name
-diff --git a/kiwi/container/setup/oci.py b/kiwi/container/setup/oci.py
-index 915b56c794..cbc284550e 100644
---- a/kiwi/container/setup/oci.py
-+++ b/kiwi/container/setup/oci.py
-@@ -50,7 +50,6 @@ def setup(self):
-
- self.deactivate_bootloader_setup()
- self.deactivate_root_filesystem_check()
-- self.setup_static_device_nodes()
- self.setup_root_console()
-
- for service in services_to_deactivate:
-diff --git a/test/unit/container/setup/base_test.py b/test/unit/container/setup/base_test.py
-index b77fa93cd4..d1741c9dbb 100644
---- a/test/unit/container/setup/base_test.py
-+++ b/test/unit/container/setup/base_test.py
-@@ -2,7 +2,6 @@
- patch, call, mock_open
- )
- from pytest import raises
--import mock
-
- from kiwi.container.setup.base import ContainerSetupBase
-
-@@ -102,22 +101,3 @@ def test_setup_root_console(self, mock_exists):
- assert m_open.return_value.write.call_args_list == [
- call('\nconsole\n')
- ]
--
-- @patch('kiwi.container.setup.base.Command.run')
-- @patch('kiwi.container.setup.base.DataSync')
-- def test_setup_static_device_nodes(self, mock_DataSync, mock_command):
-- data = mock.Mock()
-- mock_DataSync.return_value = data
-- self.container.setup_static_device_nodes()
-- mock_DataSync.assert_called_once_with(
-- '/dev/', 'root_dir/dev/'
-- )
-- data.sync_data.assert_called_once_with(
-- options=['-a', '-x', '--devices', '--specials']
-- )
--
-- @patch('kiwi.container.setup.base.Command.run')
-- def test_setup_static_device_nodes_failed(self, mock_command):
-- mock_command.side_effect = Exception
-- with raises(KiwiContainerSetupError):
-- self.container.setup_static_device_nodes()
-diff --git a/test/unit/container/setup/oci_test.py b/test/unit/container/setup/oci_test.py
-index f5ef5022d5..59a1496a29 100644
---- a/test/unit/container/setup/oci_test.py
-+++ b/test/unit/container/setup/oci_test.py
-@@ -16,7 +16,6 @@ def setup(self, mock_exists):
-
- self.container.deactivate_bootloader_setup = mock.Mock()
- self.container.deactivate_root_filesystem_check = mock.Mock()
-- self.container.setup_static_device_nodes = mock.Mock()
- self.container.setup_root_console = mock.Mock()
- self.container.deactivate_systemd_service = mock.Mock()
-
-@@ -28,7 +27,6 @@ def test_setup(self):
- self.container.setup()
- self.container.deactivate_bootloader_setup.assert_called_once_with()
- self.container.deactivate_root_filesystem_check.assert_called_once_with()
-- self.container.setup_static_device_nodes.assert_called_once_with()
- assert self.container.deactivate_systemd_service.call_args_list == [
- call('device-mapper.service'),
- call('kbd.service'),
diff --git a/kiwi.spec b/kiwi.spec
index f2903f3..7c945ad 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,17 +11,14 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
Name: kiwi
-Version: 9.24.48
-Release: 2%{?dist}
+Version: 9.24.50
+Release: 1%{?dist}
URL: http://osinside.github.io/kiwi/
Summary: Flexible operating system image builder
License: GPLv3+
# We must use the version uploaded to pypi, as it contains all the required files.
Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{versio...
-# Backports from upstream
-Patch1002: https://github.com/OSInside/kiwi/pull/2195.patch#/0001-Stop-copying-dev-f...
-
# Fedora-specific patches
## Use buildah instead of umoci by default for OCI image builds
## TODO: Consider getting umoci into Fedora?
@@ -541,6 +538,10 @@ done
# Empty metapackage
%changelog
+* Tue Nov 29 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 9.24.50-1
+- Update to 9.24.50 (RH#2137048)
+- Drop patch included in this release
+
* Sat Oct 22 2022 Igor Raits <igor(a)gooddata.com> - 9.24.48-2
- Backport patch for being able to build OCI containers in Mock (nspawn)
diff --git a/sources b/sources
index ba5ac69..0c45b4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.24.48.tar.gz) = a50975dcace7acb3b32565e75e4c6e9fc06ff9c29e7d17f042904d81a23ae468bbe66b56ba01334f8cff0fd19f7cb77a9803df26e1d6b36b0e11f24e7b0dfb43
+SHA512 (kiwi-9.24.50.tar.gz) = 88596d983c1fd594df2d81b0fa8756c68a63ba9acddc7502b472521155c356e3edb1395ada85a6eaaeff4ba384b0ab96774410c267a1ed7fd52a7695c0905a2a
https://src.fedoraproject.org/rpms/kiwi/c/5202f74c2ae29d60529c905f64bbfc8...
1Â year, 5Â months
ngompa pushed to rpms/kiwi (f35). "Update to 9.24.50 (RH#2137048)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:01:03 UTC
From 5202f74c2ae29d60529c905f64bbfc86a44c8ad9 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Nov 29 2022 15:59:57 +0000
Subject: Update to 9.24.50 (RH#2137048)
---
diff --git a/.gitignore b/.gitignore
index a55c9c2..58399b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
/kiwi-9.24.43.tar.gz
/kiwi-9.24.44.tar.gz
/kiwi-9.24.48.tar.gz
+/kiwi-9.24.50.tar.gz
diff --git a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch b/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
deleted file mode 100644
index 1c1fe56..0000000
--- a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 1f547d6bb994d7d0cbed857b1b8d9b4ec79081be Mon Sep 17 00:00:00 2001
-From: Igor Raits <igor.raits(a)gmail.com>
-Date: Wed, 12 Oct 2022 20:31:54 +0200
-Subject: [PATCH] Stop copying /dev files statically into the OCI container
-
-In containers (nspawn) where part of the /dev filesystem is bind-mounted
-from outside system, kiwi fails to do the rsync (in creation of the
-nodes).
-
-There is no reason to actually copy whole tree inside so let's just
-not do it (as it does not seem to be needed at all).
----
- kiwi/container/setup/base.py | 23 -----------------------
- kiwi/container/setup/oci.py | 1 -
- test/unit/container/setup/base_test.py | 20 --------------------
- test/unit/container/setup/oci_test.py | 2 --
- 4 files changed, 46 deletions(-)
-
-diff --git a/kiwi/container/setup/base.py b/kiwi/container/setup/base.py
-index d2fc56aa66..5a462889d0 100644
---- a/kiwi/container/setup/base.py
-+++ b/kiwi/container/setup/base.py
-@@ -20,7 +20,6 @@
-
- # project
- from kiwi.command import Command
--from kiwi.utils.sync import DataSync
-
- from kiwi.exceptions import (
- KiwiContainerSetupError
-@@ -145,28 +144,6 @@ def setup_root_console(self):
- }
- )
-
-- def setup_static_device_nodes(self):
-- """
-- Container device node setup
--
-- Without subsystems like udev running in a container it is
-- required to provide a set of device nodes to let the
-- system in the container function correctly. This is
-- done by syncing the host system nodes to the container.
-- That this will also create device nodes which are not
-- necessarily present in the container later is a know
-- limitation of this method and considered harmless
-- """
-- try:
-- data = DataSync('/dev/', self.root_dir + '/dev/')
-- data.sync_data(
-- options=['-a', '-x', '--devices', '--specials']
-- )
-- except Exception as e:
-- raise KiwiContainerSetupError(
-- 'Failed to create static container nodes %s' % format(e)
-- )
--
- def get_container_name(self):
- """
- Container name
-diff --git a/kiwi/container/setup/oci.py b/kiwi/container/setup/oci.py
-index 915b56c794..cbc284550e 100644
---- a/kiwi/container/setup/oci.py
-+++ b/kiwi/container/setup/oci.py
-@@ -50,7 +50,6 @@ def setup(self):
-
- self.deactivate_bootloader_setup()
- self.deactivate_root_filesystem_check()
-- self.setup_static_device_nodes()
- self.setup_root_console()
-
- for service in services_to_deactivate:
-diff --git a/test/unit/container/setup/base_test.py b/test/unit/container/setup/base_test.py
-index b77fa93cd4..d1741c9dbb 100644
---- a/test/unit/container/setup/base_test.py
-+++ b/test/unit/container/setup/base_test.py
-@@ -2,7 +2,6 @@
- patch, call, mock_open
- )
- from pytest import raises
--import mock
-
- from kiwi.container.setup.base import ContainerSetupBase
-
-@@ -102,22 +101,3 @@ def test_setup_root_console(self, mock_exists):
- assert m_open.return_value.write.call_args_list == [
- call('\nconsole\n')
- ]
--
-- @patch('kiwi.container.setup.base.Command.run')
-- @patch('kiwi.container.setup.base.DataSync')
-- def test_setup_static_device_nodes(self, mock_DataSync, mock_command):
-- data = mock.Mock()
-- mock_DataSync.return_value = data
-- self.container.setup_static_device_nodes()
-- mock_DataSync.assert_called_once_with(
-- '/dev/', 'root_dir/dev/'
-- )
-- data.sync_data.assert_called_once_with(
-- options=['-a', '-x', '--devices', '--specials']
-- )
--
-- @patch('kiwi.container.setup.base.Command.run')
-- def test_setup_static_device_nodes_failed(self, mock_command):
-- mock_command.side_effect = Exception
-- with raises(KiwiContainerSetupError):
-- self.container.setup_static_device_nodes()
-diff --git a/test/unit/container/setup/oci_test.py b/test/unit/container/setup/oci_test.py
-index f5ef5022d5..59a1496a29 100644
---- a/test/unit/container/setup/oci_test.py
-+++ b/test/unit/container/setup/oci_test.py
-@@ -16,7 +16,6 @@ def setup(self, mock_exists):
-
- self.container.deactivate_bootloader_setup = mock.Mock()
- self.container.deactivate_root_filesystem_check = mock.Mock()
-- self.container.setup_static_device_nodes = mock.Mock()
- self.container.setup_root_console = mock.Mock()
- self.container.deactivate_systemd_service = mock.Mock()
-
-@@ -28,7 +27,6 @@ def test_setup(self):
- self.container.setup()
- self.container.deactivate_bootloader_setup.assert_called_once_with()
- self.container.deactivate_root_filesystem_check.assert_called_once_with()
-- self.container.setup_static_device_nodes.assert_called_once_with()
- assert self.container.deactivate_systemd_service.call_args_list == [
- call('device-mapper.service'),
- call('kbd.service'),
diff --git a/kiwi.spec b/kiwi.spec
index f2903f3..7c945ad 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,17 +11,14 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
Name: kiwi
-Version: 9.24.48
-Release: 2%{?dist}
+Version: 9.24.50
+Release: 1%{?dist}
URL: http://osinside.github.io/kiwi/
Summary: Flexible operating system image builder
License: GPLv3+
# We must use the version uploaded to pypi, as it contains all the required files.
Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{versio...
-# Backports from upstream
-Patch1002: https://github.com/OSInside/kiwi/pull/2195.patch#/0001-Stop-copying-dev-f...
-
# Fedora-specific patches
## Use buildah instead of umoci by default for OCI image builds
## TODO: Consider getting umoci into Fedora?
@@ -541,6 +538,10 @@ done
# Empty metapackage
%changelog
+* Tue Nov 29 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 9.24.50-1
+- Update to 9.24.50 (RH#2137048)
+- Drop patch included in this release
+
* Sat Oct 22 2022 Igor Raits <igor(a)gooddata.com> - 9.24.48-2
- Backport patch for being able to build OCI containers in Mock (nspawn)
diff --git a/sources b/sources
index ba5ac69..0c45b4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.24.48.tar.gz) = a50975dcace7acb3b32565e75e4c6e9fc06ff9c29e7d17f042904d81a23ae468bbe66b56ba01334f8cff0fd19f7cb77a9803df26e1d6b36b0e11f24e7b0dfb43
+SHA512 (kiwi-9.24.50.tar.gz) = 88596d983c1fd594df2d81b0fa8756c68a63ba9acddc7502b472521155c356e3edb1395ada85a6eaaeff4ba384b0ab96774410c267a1ed7fd52a7695c0905a2a
https://src.fedoraproject.org/rpms/kiwi/c/5202f74c2ae29d60529c905f64bbfc8...
1Â year, 5Â months
ngompa pushed to rpms/kiwi (f36). "Update to 9.24.50 (RH#2137048)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:00:45 UTC
From 5202f74c2ae29d60529c905f64bbfc86a44c8ad9 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Nov 29 2022 15:59:57 +0000
Subject: Update to 9.24.50 (RH#2137048)
---
diff --git a/.gitignore b/.gitignore
index a55c9c2..58399b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
/kiwi-9.24.43.tar.gz
/kiwi-9.24.44.tar.gz
/kiwi-9.24.48.tar.gz
+/kiwi-9.24.50.tar.gz
diff --git a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch b/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
deleted file mode 100644
index 1c1fe56..0000000
--- a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 1f547d6bb994d7d0cbed857b1b8d9b4ec79081be Mon Sep 17 00:00:00 2001
-From: Igor Raits <igor.raits(a)gmail.com>
-Date: Wed, 12 Oct 2022 20:31:54 +0200
-Subject: [PATCH] Stop copying /dev files statically into the OCI container
-
-In containers (nspawn) where part of the /dev filesystem is bind-mounted
-from outside system, kiwi fails to do the rsync (in creation of the
-nodes).
-
-There is no reason to actually copy whole tree inside so let's just
-not do it (as it does not seem to be needed at all).
----
- kiwi/container/setup/base.py | 23 -----------------------
- kiwi/container/setup/oci.py | 1 -
- test/unit/container/setup/base_test.py | 20 --------------------
- test/unit/container/setup/oci_test.py | 2 --
- 4 files changed, 46 deletions(-)
-
-diff --git a/kiwi/container/setup/base.py b/kiwi/container/setup/base.py
-index d2fc56aa66..5a462889d0 100644
---- a/kiwi/container/setup/base.py
-+++ b/kiwi/container/setup/base.py
-@@ -20,7 +20,6 @@
-
- # project
- from kiwi.command import Command
--from kiwi.utils.sync import DataSync
-
- from kiwi.exceptions import (
- KiwiContainerSetupError
-@@ -145,28 +144,6 @@ def setup_root_console(self):
- }
- )
-
-- def setup_static_device_nodes(self):
-- """
-- Container device node setup
--
-- Without subsystems like udev running in a container it is
-- required to provide a set of device nodes to let the
-- system in the container function correctly. This is
-- done by syncing the host system nodes to the container.
-- That this will also create device nodes which are not
-- necessarily present in the container later is a know
-- limitation of this method and considered harmless
-- """
-- try:
-- data = DataSync('/dev/', self.root_dir + '/dev/')
-- data.sync_data(
-- options=['-a', '-x', '--devices', '--specials']
-- )
-- except Exception as e:
-- raise KiwiContainerSetupError(
-- 'Failed to create static container nodes %s' % format(e)
-- )
--
- def get_container_name(self):
- """
- Container name
-diff --git a/kiwi/container/setup/oci.py b/kiwi/container/setup/oci.py
-index 915b56c794..cbc284550e 100644
---- a/kiwi/container/setup/oci.py
-+++ b/kiwi/container/setup/oci.py
-@@ -50,7 +50,6 @@ def setup(self):
-
- self.deactivate_bootloader_setup()
- self.deactivate_root_filesystem_check()
-- self.setup_static_device_nodes()
- self.setup_root_console()
-
- for service in services_to_deactivate:
-diff --git a/test/unit/container/setup/base_test.py b/test/unit/container/setup/base_test.py
-index b77fa93cd4..d1741c9dbb 100644
---- a/test/unit/container/setup/base_test.py
-+++ b/test/unit/container/setup/base_test.py
-@@ -2,7 +2,6 @@
- patch, call, mock_open
- )
- from pytest import raises
--import mock
-
- from kiwi.container.setup.base import ContainerSetupBase
-
-@@ -102,22 +101,3 @@ def test_setup_root_console(self, mock_exists):
- assert m_open.return_value.write.call_args_list == [
- call('\nconsole\n')
- ]
--
-- @patch('kiwi.container.setup.base.Command.run')
-- @patch('kiwi.container.setup.base.DataSync')
-- def test_setup_static_device_nodes(self, mock_DataSync, mock_command):
-- data = mock.Mock()
-- mock_DataSync.return_value = data
-- self.container.setup_static_device_nodes()
-- mock_DataSync.assert_called_once_with(
-- '/dev/', 'root_dir/dev/'
-- )
-- data.sync_data.assert_called_once_with(
-- options=['-a', '-x', '--devices', '--specials']
-- )
--
-- @patch('kiwi.container.setup.base.Command.run')
-- def test_setup_static_device_nodes_failed(self, mock_command):
-- mock_command.side_effect = Exception
-- with raises(KiwiContainerSetupError):
-- self.container.setup_static_device_nodes()
-diff --git a/test/unit/container/setup/oci_test.py b/test/unit/container/setup/oci_test.py
-index f5ef5022d5..59a1496a29 100644
---- a/test/unit/container/setup/oci_test.py
-+++ b/test/unit/container/setup/oci_test.py
-@@ -16,7 +16,6 @@ def setup(self, mock_exists):
-
- self.container.deactivate_bootloader_setup = mock.Mock()
- self.container.deactivate_root_filesystem_check = mock.Mock()
-- self.container.setup_static_device_nodes = mock.Mock()
- self.container.setup_root_console = mock.Mock()
- self.container.deactivate_systemd_service = mock.Mock()
-
-@@ -28,7 +27,6 @@ def test_setup(self):
- self.container.setup()
- self.container.deactivate_bootloader_setup.assert_called_once_with()
- self.container.deactivate_root_filesystem_check.assert_called_once_with()
-- self.container.setup_static_device_nodes.assert_called_once_with()
- assert self.container.deactivate_systemd_service.call_args_list == [
- call('device-mapper.service'),
- call('kbd.service'),
diff --git a/kiwi.spec b/kiwi.spec
index f2903f3..7c945ad 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,17 +11,14 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
Name: kiwi
-Version: 9.24.48
-Release: 2%{?dist}
+Version: 9.24.50
+Release: 1%{?dist}
URL: http://osinside.github.io/kiwi/
Summary: Flexible operating system image builder
License: GPLv3+
# We must use the version uploaded to pypi, as it contains all the required files.
Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{versio...
-# Backports from upstream
-Patch1002: https://github.com/OSInside/kiwi/pull/2195.patch#/0001-Stop-copying-dev-f...
-
# Fedora-specific patches
## Use buildah instead of umoci by default for OCI image builds
## TODO: Consider getting umoci into Fedora?
@@ -541,6 +538,10 @@ done
# Empty metapackage
%changelog
+* Tue Nov 29 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 9.24.50-1
+- Update to 9.24.50 (RH#2137048)
+- Drop patch included in this release
+
* Sat Oct 22 2022 Igor Raits <igor(a)gooddata.com> - 9.24.48-2
- Backport patch for being able to build OCI containers in Mock (nspawn)
diff --git a/sources b/sources
index ba5ac69..0c45b4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.24.48.tar.gz) = a50975dcace7acb3b32565e75e4c6e9fc06ff9c29e7d17f042904d81a23ae468bbe66b56ba01334f8cff0fd19f7cb77a9803df26e1d6b36b0e11f24e7b0dfb43
+SHA512 (kiwi-9.24.50.tar.gz) = 88596d983c1fd594df2d81b0fa8756c68a63ba9acddc7502b472521155c356e3edb1395ada85a6eaaeff4ba384b0ab96774410c267a1ed7fd52a7695c0905a2a
https://src.fedoraproject.org/rpms/kiwi/c/5202f74c2ae29d60529c905f64bbfc8...
1Â year, 5Â months
ngompa pushed to rpms/kiwi (f37). "Update to 9.24.50 (RH#2137048)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:00:31 UTC
From 5202f74c2ae29d60529c905f64bbfc86a44c8ad9 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Nov 29 2022 15:59:57 +0000
Subject: Update to 9.24.50 (RH#2137048)
---
diff --git a/.gitignore b/.gitignore
index a55c9c2..58399b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
/kiwi-9.24.43.tar.gz
/kiwi-9.24.44.tar.gz
/kiwi-9.24.48.tar.gz
+/kiwi-9.24.50.tar.gz
diff --git a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch b/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
deleted file mode 100644
index 1c1fe56..0000000
--- a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 1f547d6bb994d7d0cbed857b1b8d9b4ec79081be Mon Sep 17 00:00:00 2001
-From: Igor Raits <igor.raits(a)gmail.com>
-Date: Wed, 12 Oct 2022 20:31:54 +0200
-Subject: [PATCH] Stop copying /dev files statically into the OCI container
-
-In containers (nspawn) where part of the /dev filesystem is bind-mounted
-from outside system, kiwi fails to do the rsync (in creation of the
-nodes).
-
-There is no reason to actually copy whole tree inside so let's just
-not do it (as it does not seem to be needed at all).
----
- kiwi/container/setup/base.py | 23 -----------------------
- kiwi/container/setup/oci.py | 1 -
- test/unit/container/setup/base_test.py | 20 --------------------
- test/unit/container/setup/oci_test.py | 2 --
- 4 files changed, 46 deletions(-)
-
-diff --git a/kiwi/container/setup/base.py b/kiwi/container/setup/base.py
-index d2fc56aa66..5a462889d0 100644
---- a/kiwi/container/setup/base.py
-+++ b/kiwi/container/setup/base.py
-@@ -20,7 +20,6 @@
-
- # project
- from kiwi.command import Command
--from kiwi.utils.sync import DataSync
-
- from kiwi.exceptions import (
- KiwiContainerSetupError
-@@ -145,28 +144,6 @@ def setup_root_console(self):
- }
- )
-
-- def setup_static_device_nodes(self):
-- """
-- Container device node setup
--
-- Without subsystems like udev running in a container it is
-- required to provide a set of device nodes to let the
-- system in the container function correctly. This is
-- done by syncing the host system nodes to the container.
-- That this will also create device nodes which are not
-- necessarily present in the container later is a know
-- limitation of this method and considered harmless
-- """
-- try:
-- data = DataSync('/dev/', self.root_dir + '/dev/')
-- data.sync_data(
-- options=['-a', '-x', '--devices', '--specials']
-- )
-- except Exception as e:
-- raise KiwiContainerSetupError(
-- 'Failed to create static container nodes %s' % format(e)
-- )
--
- def get_container_name(self):
- """
- Container name
-diff --git a/kiwi/container/setup/oci.py b/kiwi/container/setup/oci.py
-index 915b56c794..cbc284550e 100644
---- a/kiwi/container/setup/oci.py
-+++ b/kiwi/container/setup/oci.py
-@@ -50,7 +50,6 @@ def setup(self):
-
- self.deactivate_bootloader_setup()
- self.deactivate_root_filesystem_check()
-- self.setup_static_device_nodes()
- self.setup_root_console()
-
- for service in services_to_deactivate:
-diff --git a/test/unit/container/setup/base_test.py b/test/unit/container/setup/base_test.py
-index b77fa93cd4..d1741c9dbb 100644
---- a/test/unit/container/setup/base_test.py
-+++ b/test/unit/container/setup/base_test.py
-@@ -2,7 +2,6 @@
- patch, call, mock_open
- )
- from pytest import raises
--import mock
-
- from kiwi.container.setup.base import ContainerSetupBase
-
-@@ -102,22 +101,3 @@ def test_setup_root_console(self, mock_exists):
- assert m_open.return_value.write.call_args_list == [
- call('\nconsole\n')
- ]
--
-- @patch('kiwi.container.setup.base.Command.run')
-- @patch('kiwi.container.setup.base.DataSync')
-- def test_setup_static_device_nodes(self, mock_DataSync, mock_command):
-- data = mock.Mock()
-- mock_DataSync.return_value = data
-- self.container.setup_static_device_nodes()
-- mock_DataSync.assert_called_once_with(
-- '/dev/', 'root_dir/dev/'
-- )
-- data.sync_data.assert_called_once_with(
-- options=['-a', '-x', '--devices', '--specials']
-- )
--
-- @patch('kiwi.container.setup.base.Command.run')
-- def test_setup_static_device_nodes_failed(self, mock_command):
-- mock_command.side_effect = Exception
-- with raises(KiwiContainerSetupError):
-- self.container.setup_static_device_nodes()
-diff --git a/test/unit/container/setup/oci_test.py b/test/unit/container/setup/oci_test.py
-index f5ef5022d5..59a1496a29 100644
---- a/test/unit/container/setup/oci_test.py
-+++ b/test/unit/container/setup/oci_test.py
-@@ -16,7 +16,6 @@ def setup(self, mock_exists):
-
- self.container.deactivate_bootloader_setup = mock.Mock()
- self.container.deactivate_root_filesystem_check = mock.Mock()
-- self.container.setup_static_device_nodes = mock.Mock()
- self.container.setup_root_console = mock.Mock()
- self.container.deactivate_systemd_service = mock.Mock()
-
-@@ -28,7 +27,6 @@ def test_setup(self):
- self.container.setup()
- self.container.deactivate_bootloader_setup.assert_called_once_with()
- self.container.deactivate_root_filesystem_check.assert_called_once_with()
-- self.container.setup_static_device_nodes.assert_called_once_with()
- assert self.container.deactivate_systemd_service.call_args_list == [
- call('device-mapper.service'),
- call('kbd.service'),
diff --git a/kiwi.spec b/kiwi.spec
index f2903f3..7c945ad 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,17 +11,14 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
Name: kiwi
-Version: 9.24.48
-Release: 2%{?dist}
+Version: 9.24.50
+Release: 1%{?dist}
URL: http://osinside.github.io/kiwi/
Summary: Flexible operating system image builder
License: GPLv3+
# We must use the version uploaded to pypi, as it contains all the required files.
Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{versio...
-# Backports from upstream
-Patch1002: https://github.com/OSInside/kiwi/pull/2195.patch#/0001-Stop-copying-dev-f...
-
# Fedora-specific patches
## Use buildah instead of umoci by default for OCI image builds
## TODO: Consider getting umoci into Fedora?
@@ -541,6 +538,10 @@ done
# Empty metapackage
%changelog
+* Tue Nov 29 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 9.24.50-1
+- Update to 9.24.50 (RH#2137048)
+- Drop patch included in this release
+
* Sat Oct 22 2022 Igor Raits <igor(a)gooddata.com> - 9.24.48-2
- Backport patch for being able to build OCI containers in Mock (nspawn)
diff --git a/sources b/sources
index ba5ac69..0c45b4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.24.48.tar.gz) = a50975dcace7acb3b32565e75e4c6e9fc06ff9c29e7d17f042904d81a23ae468bbe66b56ba01334f8cff0fd19f7cb77a9803df26e1d6b36b0e11f24e7b0dfb43
+SHA512 (kiwi-9.24.50.tar.gz) = 88596d983c1fd594df2d81b0fa8756c68a63ba9acddc7502b472521155c356e3edb1395ada85a6eaaeff4ba384b0ab96774410c267a1ed7fd52a7695c0905a2a
https://src.fedoraproject.org/rpms/kiwi/c/5202f74c2ae29d60529c905f64bbfc8...
1Â year, 5Â months
ngompa pushed to rpms/kiwi (rawhide). "Update to 9.24.50 (RH#2137048)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:00:08 UTC
From 5202f74c2ae29d60529c905f64bbfc86a44c8ad9 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Nov 29 2022 15:59:57 +0000
Subject: Update to 9.24.50 (RH#2137048)
---
diff --git a/.gitignore b/.gitignore
index a55c9c2..58399b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
/kiwi-9.24.43.tar.gz
/kiwi-9.24.44.tar.gz
/kiwi-9.24.48.tar.gz
+/kiwi-9.24.50.tar.gz
diff --git a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch b/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
deleted file mode 100644
index 1c1fe56..0000000
--- a/0001-Stop-copying-dev-files-statically-into-the-OCI-conta.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 1f547d6bb994d7d0cbed857b1b8d9b4ec79081be Mon Sep 17 00:00:00 2001
-From: Igor Raits <igor.raits(a)gmail.com>
-Date: Wed, 12 Oct 2022 20:31:54 +0200
-Subject: [PATCH] Stop copying /dev files statically into the OCI container
-
-In containers (nspawn) where part of the /dev filesystem is bind-mounted
-from outside system, kiwi fails to do the rsync (in creation of the
-nodes).
-
-There is no reason to actually copy whole tree inside so let's just
-not do it (as it does not seem to be needed at all).
----
- kiwi/container/setup/base.py | 23 -----------------------
- kiwi/container/setup/oci.py | 1 -
- test/unit/container/setup/base_test.py | 20 --------------------
- test/unit/container/setup/oci_test.py | 2 --
- 4 files changed, 46 deletions(-)
-
-diff --git a/kiwi/container/setup/base.py b/kiwi/container/setup/base.py
-index d2fc56aa66..5a462889d0 100644
---- a/kiwi/container/setup/base.py
-+++ b/kiwi/container/setup/base.py
-@@ -20,7 +20,6 @@
-
- # project
- from kiwi.command import Command
--from kiwi.utils.sync import DataSync
-
- from kiwi.exceptions import (
- KiwiContainerSetupError
-@@ -145,28 +144,6 @@ def setup_root_console(self):
- }
- )
-
-- def setup_static_device_nodes(self):
-- """
-- Container device node setup
--
-- Without subsystems like udev running in a container it is
-- required to provide a set of device nodes to let the
-- system in the container function correctly. This is
-- done by syncing the host system nodes to the container.
-- That this will also create device nodes which are not
-- necessarily present in the container later is a know
-- limitation of this method and considered harmless
-- """
-- try:
-- data = DataSync('/dev/', self.root_dir + '/dev/')
-- data.sync_data(
-- options=['-a', '-x', '--devices', '--specials']
-- )
-- except Exception as e:
-- raise KiwiContainerSetupError(
-- 'Failed to create static container nodes %s' % format(e)
-- )
--
- def get_container_name(self):
- """
- Container name
-diff --git a/kiwi/container/setup/oci.py b/kiwi/container/setup/oci.py
-index 915b56c794..cbc284550e 100644
---- a/kiwi/container/setup/oci.py
-+++ b/kiwi/container/setup/oci.py
-@@ -50,7 +50,6 @@ def setup(self):
-
- self.deactivate_bootloader_setup()
- self.deactivate_root_filesystem_check()
-- self.setup_static_device_nodes()
- self.setup_root_console()
-
- for service in services_to_deactivate:
-diff --git a/test/unit/container/setup/base_test.py b/test/unit/container/setup/base_test.py
-index b77fa93cd4..d1741c9dbb 100644
---- a/test/unit/container/setup/base_test.py
-+++ b/test/unit/container/setup/base_test.py
-@@ -2,7 +2,6 @@
- patch, call, mock_open
- )
- from pytest import raises
--import mock
-
- from kiwi.container.setup.base import ContainerSetupBase
-
-@@ -102,22 +101,3 @@ def test_setup_root_console(self, mock_exists):
- assert m_open.return_value.write.call_args_list == [
- call('\nconsole\n')
- ]
--
-- @patch('kiwi.container.setup.base.Command.run')
-- @patch('kiwi.container.setup.base.DataSync')
-- def test_setup_static_device_nodes(self, mock_DataSync, mock_command):
-- data = mock.Mock()
-- mock_DataSync.return_value = data
-- self.container.setup_static_device_nodes()
-- mock_DataSync.assert_called_once_with(
-- '/dev/', 'root_dir/dev/'
-- )
-- data.sync_data.assert_called_once_with(
-- options=['-a', '-x', '--devices', '--specials']
-- )
--
-- @patch('kiwi.container.setup.base.Command.run')
-- def test_setup_static_device_nodes_failed(self, mock_command):
-- mock_command.side_effect = Exception
-- with raises(KiwiContainerSetupError):
-- self.container.setup_static_device_nodes()
-diff --git a/test/unit/container/setup/oci_test.py b/test/unit/container/setup/oci_test.py
-index f5ef5022d5..59a1496a29 100644
---- a/test/unit/container/setup/oci_test.py
-+++ b/test/unit/container/setup/oci_test.py
-@@ -16,7 +16,6 @@ def setup(self, mock_exists):
-
- self.container.deactivate_bootloader_setup = mock.Mock()
- self.container.deactivate_root_filesystem_check = mock.Mock()
-- self.container.setup_static_device_nodes = mock.Mock()
- self.container.setup_root_console = mock.Mock()
- self.container.deactivate_systemd_service = mock.Mock()
-
-@@ -28,7 +27,6 @@ def test_setup(self):
- self.container.setup()
- self.container.deactivate_bootloader_setup.assert_called_once_with()
- self.container.deactivate_root_filesystem_check.assert_called_once_with()
-- self.container.setup_static_device_nodes.assert_called_once_with()
- assert self.container.deactivate_systemd_service.call_args_list == [
- call('device-mapper.service'),
- call('kbd.service'),
diff --git a/kiwi.spec b/kiwi.spec
index f2903f3..7c945ad 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,17 +11,14 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
Name: kiwi
-Version: 9.24.48
-Release: 2%{?dist}
+Version: 9.24.50
+Release: 1%{?dist}
URL: http://osinside.github.io/kiwi/
Summary: Flexible operating system image builder
License: GPLv3+
# We must use the version uploaded to pypi, as it contains all the required files.
Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{versio...
-# Backports from upstream
-Patch1002: https://github.com/OSInside/kiwi/pull/2195.patch#/0001-Stop-copying-dev-f...
-
# Fedora-specific patches
## Use buildah instead of umoci by default for OCI image builds
## TODO: Consider getting umoci into Fedora?
@@ -541,6 +538,10 @@ done
# Empty metapackage
%changelog
+* Tue Nov 29 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 9.24.50-1
+- Update to 9.24.50 (RH#2137048)
+- Drop patch included in this release
+
* Sat Oct 22 2022 Igor Raits <igor(a)gooddata.com> - 9.24.48-2
- Backport patch for being able to build OCI containers in Mock (nspawn)
diff --git a/sources b/sources
index ba5ac69..0c45b4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.24.48.tar.gz) = a50975dcace7acb3b32565e75e4c6e9fc06ff9c29e7d17f042904d81a23ae468bbe66b56ba01334f8cff0fd19f7cb77a9803df26e1d6b36b0e11f24e7b0dfb43
+SHA512 (kiwi-9.24.50.tar.gz) = 88596d983c1fd594df2d81b0fa8756c68a63ba9acddc7502b472521155c356e3edb1395ada85a6eaaeff4ba384b0ab96774410c267a1ed7fd52a7695c0905a2a
https://src.fedoraproject.org/rpms/kiwi/c/5202f74c2ae29d60529c905f64bbfc8...
1Â year, 5Â months
corsepiu pushed to rpms/perl-Module-Versions-Report (rawhide).
"Modernize spec. (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 15:58:53 UTC
From 73c80a8dd426161984dac1efd82b82d8e6792f57 Mon Sep 17 00:00:00 2001
From: Ralf Corsépius <corsepiu(a)fedoraproject.org>
Date: Nov 29 2022 15:58:31 +0000
Subject: Modernize spec.
Convert license to SPDX.
---
diff --git a/perl-Module-Versions-Report.spec b/perl-Module-Versions-Report.spec
index f5a8b50..be921a2 100644
--- a/perl-Module-Versions-Report.spec
+++ b/perl-Module-Versions-Report.spec
@@ -1,16 +1,18 @@
Name: perl-Module-Versions-Report
Version: 1.06
-Release: 41%{?dist}
+Release: 42%{?dist}
Summary: Report versions of all modules in memory
-License: GPL+ or Artistic
+License: GPL-1.0-or-later OR Artistic-1.0-Perl
URL: https://metacpan.org/release/Module-Versions-Report
Source0: https://cpan.metacpan.org/authors/id/J/JE/JESSE/Module-Versions-Report-%{...
BuildArch: noarch
BuildRequires: coreutils
BuildRequires: findutils
-BuildRequires: make
+BuildRequires: %{__make}
+BuildRequires: %{__perl}
+
BuildRequires: perl-interpreter
BuildRequires: perl-generators
BuildRequires: perl(:VERSION) >= 5.4
@@ -43,18 +45,17 @@ detailing the all modules in memory, and noting the version of each
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
-make %{?_smp_mflags}
+%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
%install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
+%{make_install}
%{_fixperms} $RPM_BUILD_ROOT/*
%check
-make test
+%{__make} test
%files
@@ -64,6 +65,10 @@ make test
%changelog
+* Tue Nov 29 2022 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.06-42
+- Modernize spec.
+- Convert license to SPDX.
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.06-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
https://src.fedoraproject.org/rpms/perl-Module-Versions-Report/c/73c80a8d...
1Â year, 5Â months
pbrobinson pushed to rpms/greenboot (rawhide). "drop old patch"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 15:51:59 UTC
From 5d5d32108fe40347b3685aff69294c9bcb77b61a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson(a)gmail.com>
Date: Nov 29 2022 15:51:50 +0000
Subject: drop old patch
---
diff --git a/0001-greenboot-grub2-set-counter.service-ensure-boot-is-m.patch b/0001-greenboot-grub2-set-counter.service-ensure-boot-is-m.patch
deleted file mode 100644
index 1084099..0000000
--- a/0001-greenboot-grub2-set-counter.service-ensure-boot-is-m.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 402c6b86eae2fce8c76afd744b7560a0f78e183e Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam(a)redhat.com>
-Date: Thu, 22 Sep 2022 14:00:41 -0700
-Subject: [PATCH] greenboot-grub2-set-counter.service: ensure /boot is mounted
-
-See https://bugzilla.redhat.com/show_bug.cgi?id=2121944 . As it
-stands, this service can actually race with the mounting of
-/boot, and fail if it starts before /boot is mounted. Adding
-this ensures that doesn't happen.
-
-Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
----
- usr/lib/systemd/system/greenboot-grub2-set-counter.service | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usr/lib/systemd/system/greenboot-grub2-set-counter.service b/usr/lib/systemd/system/greenboot-grub2-set-counter.service
-index 5b758c7..72837dc 100644
---- a/usr/lib/systemd/system/greenboot-grub2-set-counter.service
-+++ b/usr/lib/systemd/system/greenboot-grub2-set-counter.service
-@@ -12,6 +12,7 @@ Description=Set grub2 boot counter in preparation of upgrade
- DefaultDependencies=no
- Before=ostree-finalize-staged.service
- Conflicts=greenboot-grub2-set-success.service
-+RequiresMountsFor=/boot
-
- [Service]
- Type=oneshot
---
-2.37.3
-
https://src.fedoraproject.org/rpms/greenboot/c/5d5d32108fe40347b3685aff69...
1Â year, 5Â months
pagure pushed to rpms/greenboot (f37). "[packit] 0.15.3 upstream
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 15:49:38 UTC
From cc9e72d573486be9e6f589818c49766e8ed597c7 Mon Sep 17 00:00:00 2001
From: Packit <hello(a)packit.dev>
Date: Nov 29 2022 14:42:26 +0000
Subject: [packit] 0.15.3 upstream release
Upstream tag: v0.15.3
Upstream commit: 650ce772
Signed-off-by: Packit <hello(a)packit.dev>
---
diff --git a/.packit.yaml b/.packit.yaml
index 0a9cfb3..66e856d 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -1,19 +1,36 @@
+upstream_project_url: https://github.com/fedora-iot/greenboot
+
specfile_path: greenboot.spec
-synced_files:
+files_to_sync:
- greenboot.spec
- .packit.yaml
upstream_package_name: greenboot
upstream_tag_template: v{version}
downstream_package_name: greenboot
+
jobs:
+
- job: sync_from_downstream
trigger: commit
+
- job: propose_downstream
trigger: release
- metadata:
- dist-git-branch: fedora-all
+ dist_git_branches:
+ - fedora-all
+
- job: tests
trigger: pull_request
- metadata:
- targets:
- - fedora-all
+ targets:
+ - fedora-all
+
+ - job: koji_build
+ trigger: commit
+ dist_git_branches:
+ - fedora-development
+ - fedora-37
+
+ - job: bodhi_update
+ trigger: commit
+ dist_git_branches:
+ # rawhide updates are created automatically
+ - fedora-37
diff --git a/README.packit b/README.packit
index 1be30c8..bdc4243 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
-The file was generated using packit 0.41.0.
+The file was generated using packit 0.63.2.dev8+g33fd64a.
diff --git a/greenboot.spec b/greenboot.spec
index 99ab90d..8403330 100644
--- a/greenboot.spec
+++ b/greenboot.spec
@@ -1,8 +1,8 @@
%global debug_package %{nil}
Name: greenboot
-Version: 0.15.2
-Release: 2%{?dist}
+Version: 0.15.3
+Release: 1%{?dist}
Summary: Generic Health Check Framework for systemd
License: LGPLv2+
@@ -11,11 +11,7 @@ License: LGPLv2+
%global repo_tag v%{version}
URL: https://github.com/%{repo_owner}/%{repo_name}
-Source0: https://github.com/%{repo_owner}/%{repo_name}/archive/%{repo_tag}.tar.g#/...
-# https://github.com/fedora-iot/greenboot/pull/84
-# https://bugzilla.redhat.com/show_bug.cgi?id=2121944
-# Ensure /boot is mounted before greenboot-grub2-set-counter.service runs
-Patch0: 0001-greenboot-grub2-set-counter.service-ensure-boot-is-m.patch
+Source0: https://github.com/%{repo_owner}/%{repo_name}/archive/%{repo_tag}.tar.gz
ExcludeArch: s390x
BuildRequires: systemd-rpm-macros
@@ -54,7 +50,7 @@ Obsoletes: greenboot-update-platforms-check <= 0.12.0
%{summary}.
%prep
-%autosetup -p1
+%setup -q
%build
@@ -93,7 +89,6 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%systemd_post greenboot-grub2-set-success.service
%systemd_post greenboot-rpm-ostree-grub2-check-fallback.service
%systemd_post redboot-auto-reboot.service
-%systemd_post greenboot-service-monitor.service
%post default-health-checks
%systemd_post greenboot-loading-message.service
@@ -108,7 +103,6 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%systemd_preun greenboot-grub2-set-counter.service
%systemd_preun greenboot-grub2-set-success.service
%systemd_preun greenboot-rpm-ostree-grub2-check-fallback.service
-%systemd_preun greenboot-service-monitor.service
%preun default-health-checks
%systemd_preun greenboot-loading-message.service
@@ -123,7 +117,6 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%systemd_postun greenboot-grub2-set-counter.service
%systemd_postun greenboot-grub2-set-success.service
%systemd_postun greenboot-rpm-ostree-grub2-check-fallback.service
-%systemd_postun greenboot-service-monitor.service
%postun default-health-checks
%systemd_postun greenboot-loading-message.service
@@ -164,8 +157,6 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%{_unitdir}/greenboot-rpm-ostree-grub2-check-fallback.service
%{_libexecdir}/%{name}/redboot-auto-reboot
%{_unitdir}/redboot-auto-reboot.service
-%{_libexecdir}/%{name}/greenboot-service-monitor
-%{_unitdir}/greenboot-service-monitor.service
%{_sysconfdir}/%{name}/greenboot.conf
%files default-health-checks
@@ -175,6 +166,21 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
%{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh
%changelog
+* Tue Nov 29 2022 Packit <hello(a)packit.dev> - 0.15.3-1
+- Release 0.15.3 (Paul Whalen)
+- packit: add koji, bodhi jobs, upstream url (Paul Whalen)
+- packit.yaml: Fix deprecated and renamed keys. (Paul Whalen)
+- greenboot: fix exit status with unknown argument (Paul Whalen)
+- greenboot-grub2-set-counter.service: ensure /boot is mounted (Adam Williamson)
+- check-fallbback: ShellCheck fix (Micah Abbott)
+- greenboot-grub2-set-counter: ShellCheck fix (Micah Abbott)
+- greenboot-status: fix or statements to default to true (Micah Abbott)
+- update_platforms_check: quote array for ShellCheck fix (Micah Abbott)
+- watchdog.sh: ShellCheck fixes (Micah Abbott)
+- add shellcheck GH action (Micah Abbott)
+- Revert "disable DefaultDependencies to fix cycle error" (Antonio Murdaca)
+- Revert "Add greenboot-service-monitor.service for service health checking" (Antonio Murdaca)
+
* Fri Sep 23 2022 Adam Williamson <awilliam(a)redhat.com> - 0.15.2-2
- Backport PR #84 to fix RHBZ #2121944
diff --git a/sources b/sources
index d6fd674..7c52037 100755
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (greenboot-0.15.2.tar.gz) = c3d9219cf83d2691368d649e7f29b60f6d5ce65cc1b00f09980c2a917e1e2755ef39850502883c35e67a52ba4fe2899248820949cf32d8d375a26201ba8e72f5
+SHA512 (v0.15.3.tar.gz) = 8cf8586f84c27f9a5462d8bfe127370059aac0a97170b9cf1793f4d9d40c9e61cae772ec6512b0f01356d6a3a599f7ecc25238ac4d6a14485259b82e8d8b5b49
https://src.fedoraproject.org/rpms/greenboot/c/cc9e72d573486be9e6f589818c...
1Â year, 5Â months
pagure pushed to rpms/greenboot (f36). "[packit] 0.15.3 upstream
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 15:49:32 UTC
From 4fd2019dd86c91ed33a4183d6f1b1119a2f269f5 Mon Sep 17 00:00:00 2001
From: Packit <hello(a)packit.dev>
Date: Nov 29 2022 14:41:12 +0000
Subject: [packit] 0.15.3 upstream release
Upstream tag: v0.15.3
Upstream commit: 650ce772
Signed-off-by: Packit <hello(a)packit.dev>
---
diff --git a/.packit.yaml b/.packit.yaml
index 0a9cfb3..66e856d 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -1,19 +1,36 @@
+upstream_project_url: https://github.com/fedora-iot/greenboot
+
specfile_path: greenboot.spec
-synced_files:
+files_to_sync:
- greenboot.spec
- .packit.yaml
upstream_package_name: greenboot
upstream_tag_template: v{version}
downstream_package_name: greenboot
+
jobs:
+
- job: sync_from_downstream
trigger: commit
+
- job: propose_downstream
trigger: release
- metadata:
- dist-git-branch: fedora-all
+ dist_git_branches:
+ - fedora-all
+
- job: tests
trigger: pull_request
- metadata:
- targets:
- - fedora-all
+ targets:
+ - fedora-all
+
+ - job: koji_build
+ trigger: commit
+ dist_git_branches:
+ - fedora-development
+ - fedora-37
+
+ - job: bodhi_update
+ trigger: commit
+ dist_git_branches:
+ # rawhide updates are created automatically
+ - fedora-37
diff --git a/README.packit b/README.packit
index 1be30c8..bdc4243 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
-The file was generated using packit 0.41.0.
+The file was generated using packit 0.63.2.dev8+g33fd64a.
diff --git a/greenboot.spec b/greenboot.spec
index c5b0317..6b4c14b 100644
--- a/greenboot.spec
+++ b/greenboot.spec
@@ -1,8 +1,8 @@
%global debug_package %{nil}
Name: greenboot
-Version: 0.14.0
-Release: 2%{?dist}
+Version: 0.15.3
+Release: 1%{?dist}
Summary: Generic Health Check Framework for systemd
License: LGPLv2+
@@ -76,6 +76,7 @@ install -DpZm 0644 usr/lib/systemd/system/*.service %{buildroot}%{_unitdir}
install -DpZm 0644 usr/lib/tmpfiles.d/greenboot-status-motd.conf %{buildroot}%{_tmpfilesdir}/greenboot-status-motd.conf
install -DpZm 0755 usr/lib/greenboot/check/required.d/* %{buildroot}%{_prefix}/lib/%{name}/check/required.d
install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d
+install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{name}/greenboot.conf
%post
%systemd_post greenboot-healthcheck.service
@@ -156,6 +157,7 @@ install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib
%{_unitdir}/greenboot-rpm-ostree-grub2-check-fallback.service
%{_libexecdir}/%{name}/redboot-auto-reboot
%{_unitdir}/redboot-auto-reboot.service
+%{_sysconfdir}/%{name}/greenboot.conf
%files default-health-checks
%{_prefix}/lib/%{name}/check/required.d/01_repository_dns_check.sh
@@ -164,6 +166,21 @@ install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib
%{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh
%changelog
+* Tue Nov 29 2022 Packit <hello(a)packit.dev> - 0.15.3-1
+- Release 0.15.3 (Paul Whalen)
+- packit: add koji, bodhi jobs, upstream url (Paul Whalen)
+- packit.yaml: Fix deprecated and renamed keys. (Paul Whalen)
+- greenboot: fix exit status with unknown argument (Paul Whalen)
+- greenboot-grub2-set-counter.service: ensure /boot is mounted (Adam Williamson)
+- check-fallbback: ShellCheck fix (Micah Abbott)
+- greenboot-grub2-set-counter: ShellCheck fix (Micah Abbott)
+- greenboot-status: fix or statements to default to true (Micah Abbott)
+- update_platforms_check: quote array for ShellCheck fix (Micah Abbott)
+- watchdog.sh: ShellCheck fixes (Micah Abbott)
+- add shellcheck GH action (Micah Abbott)
+- Revert "disable DefaultDependencies to fix cycle error" (Antonio Murdaca)
+- Revert "Add greenboot-service-monitor.service for service health checking" (Antonio Murdaca)
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 4ef563d..7c52037 100755
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.14.0.tar.gz) = fa46f578acc93c07dc100ff22b9b4f21efa1ea17b3ed6c7d642a50dfd93af103c0530a7a2e18ac442b1b6c5c08b765c9d2b1d5d17d9e159fcc4c0145bf245d90
+SHA512 (v0.15.3.tar.gz) = 8cf8586f84c27f9a5462d8bfe127370059aac0a97170b9cf1793f4d9d40c9e61cae772ec6512b0f01356d6a3a599f7ecc25238ac4d6a14485259b82e8d8b5b49
https://src.fedoraproject.org/rpms/greenboot/c/4fd2019dd86c91ed33a4183d6f...
1Â year, 5Â months
bgurney pushed to rpms/stratis-cli (rawhide). "Update to 3.4.0 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 15:47:00 UTC
From b28a39b260da569ece1b0ec7c33b6099fe19bb47 Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney(a)redhat.com>
Date: Nov 29 2022 15:13:36 +0000
Subject: Update to 3.4.0
Signed-off-by: Bryan Gurney <bgurney(a)redhat.com>
---
diff --git a/.gitignore b/.gitignore
index 9e5c994..462a86a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/stratis-cli-3.1.0.tar.gz
/stratis-cli-3.2.0.tar.gz
/stratis-cli-3.3.0.tar.gz
+/stratis-cli-3.4.0.tar.gz
diff --git a/sources b/sources
index 5f00646..f17824f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stratis-cli-3.3.0.tar.gz) = c5280fc629ea8e63c252359556c23aced21251bbe597e1dedd0411a125c0dd42774686b0e470383ef12a6a07a5fd6f460edf083f1f423cad28dcfd1514b1245c
+SHA512 (stratis-cli-3.4.0.tar.gz) = b7b27b6c0116f16763b27b3f7b4e3bd70cc9ae0759e37fd02c24baf89e470ad826dfcb0ba45f586faa4e82b06feab20b56a1b1d8529a5248042380ad9e6515f6
diff --git a/stratis-cli.spec b/stratis-cli.spec
index a7e152b..e9a0c24 100644
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@@ -1,5 +1,5 @@
Name: stratis-cli
-Version: 3.3.0
+Version: 3.4.0
Release: 1%{?dist}
Summary: Command-line tool for interacting with the Stratis daemon
@@ -11,7 +11,7 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: %{_bindir}/a2x
# It runs without, but totally useless
-Requires: (stratisd >= 3.3.0 with stratisd < 4.0.0)
+Requires: (stratisd >= 3.4.0 with stratisd < 4.0.0)
# stratisd only available on certain arches
ExclusiveArch: %{rust_arches} noarch
@@ -62,6 +62,9 @@ a2x -f manpage docs/stratis.txt
%{python3_sitelib}/stratis_cli-*.egg-info/
%changelog
+* Tue Nov 29 2022 Bryan Gurney <bgurney(a)redhat.com> - 3.4.0-1
+- Update to 3.4.0
+
* Tue Oct 18 2022 Bryan Gurney <bgurney(a)redhat.com> - 3.3.0-1
- Update to 3.3.0
diff --git a/tests/tests.yml b/tests/tests.yml
index 4b319a3..39d4d9f 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,4 +15,4 @@
repositories:
- repo: "https://github.com/stratis-storage/testing.git"
dest: "testing"
- version: "v3.3.0"
+ version: "v3.4.0"
https://src.fedoraproject.org/rpms/stratis-cli/c/b28a39b260da569ece1b0ec7...
1Â year, 5Â months