From b7aedf558a0a2db0b1742283e4a6536411cd91f7 Mon Sep 17 00:00:00 2001 From: Ryan Cook Date: Tue, 1 Feb 2022 16:15:34 -0500 Subject: [PATCH 1/2] force packaging versions Signed-off-by: Ryan Cook --- packaging/rpm/microshift.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index 39dc364f6a..eb36f485a8 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -14,6 +14,10 @@ # SELinux specifics %global selinuxtype targeted +%define selinux_policyver 3.14.3-67 +%define container_policyver 2.167.0-1 +%define container_policy_epoch 2 + # Git related details %global shortcommit %(c=%{git_commit}; echo ${c:0:7}) @@ -118,9 +122,9 @@ restorecon -R /var/hpvolumes %package selinux Summary: SELinux policies for MicroShift -BuildRequires: selinux-policy -BuildRequires: selinux-policy-devel -Requires: container-selinux +BuildRequires: selinux-policy >= %{selinux_policyver} +BuildRequires: selinux-policy-devel >= %{selinux_policyver} +Requires: container-selinux >= %{container_policy_epoch}:%{container_policyver} BuildArch: noarch %{?selinux_requires} @@ -269,4 +273,4 @@ mv /usr/lib/systemd/system/microshift-containerized.service /usr/lib/systemd/sys - add missing BuildRequires on systemd and policycoreutils * Mon Sep 20 2021 Miguel Angel Ajo . 4.7.0-2021_08_31_224727 -- Initial packaging \ No newline at end of file +- Initial packaging From 39e747252f2638e09048501d96b2cb12294fc456 Mon Sep 17 00:00:00 2001 From: Ryan Cook Date: Wed, 2 Feb 2022 10:26:25 -0500 Subject: [PATCH 2/2] new packaging message Signed-off-by: Ryan Cook --- packaging/rpm/microshift.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index eb36f485a8..8eef6e8b0d 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -259,6 +259,9 @@ mv /usr/lib/systemd/system/microshift-containerized.service /usr/lib/systemd/sys %{_unitdir}/microshift-containerized.service %changelog +* Wed Feb 2 2022 Ryan Cook . 4.8.0-nightly-14-g8a3819ee +- Define specific selinux policy version to help manage selinux package + * Thu Nov 4 2021 Miguel angel Ajo . 4.8.0-nightly-14-g973b9c78 - Add microshift-containerized subpackage which contains the microshift-containerized systemd definition.