From 9d2572980ad60b7c6b783c2dd27929fe6df6abef Mon Sep 17 00:00:00 2001 From: Gerry Kopec Date: Thu, 17 Mar 2022 12:47:07 -0400 Subject: [PATCH] debian: Add status method to lsb for centos compatibility In debian builds, patch lsb-base package to add method to /lib/lsb/init-functions to wrap status calls to use correct method status_of_proc() This fixes fm-mgr service failing to recover on host unlock on debian. Test Plan: PASS: Package builds and install successfully with debian build PASS: fm-mgr service recovers on host unlock on debian on AIO-SX PASS: No impact on centos build, install or provisioning of AIO-SX Closes-Bug: 1963296 Signed-off-by: Gerry Kopec Change-Id: I607c4b3b6ed8aaaff2654e97d0baa826c57741a2 --- base/lsb/debian/meta_data.yaml | 7 +++++ ...us_of_proc-wrapper-for-centos-compat.patch | 26 +++++++++++++++++++ base/lsb/debian/patches/series | 1 + debian_pkg_dirs | 1 + 4 files changed, 35 insertions(+) create mode 100644 base/lsb/debian/meta_data.yaml create mode 100644 base/lsb/debian/patches/0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch create mode 100644 base/lsb/debian/patches/series diff --git a/base/lsb/debian/meta_data.yaml b/base/lsb/debian/meta_data.yaml new file mode 100644 index 000000000..48242fc7c --- /dev/null +++ b/base/lsb/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: lsb +debver: 11.1.0 +achive: https://snapshot.debian.org/archive/debian/20210103T144403Z/pool/main/l/lsb/ +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/base/lsb/debian/patches/0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch b/base/lsb/debian/patches/0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch new file mode 100644 index 000000000..d0107fc03 --- /dev/null +++ b/base/lsb/debian/patches/0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch @@ -0,0 +1,26 @@ +From 8f08d53f0db99289b106451a8c520355a93ca2f7 Mon Sep 17 00:00:00 2001 +From: Gerry Kopec +Date: Wed, 9 Mar 2022 21:35:36 -0500 +Subject: [PATCH] stx: Add status_of_proc wrapper for centos compat + +--- + init-functions | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/init-functions b/init-functions +index 207b270..88662e6 100644 +--- a/init-functions ++++ b/init-functions +@@ -209,6 +209,9 @@ status_of_proc () { + fi + } + ++# Wrapper for centos compatibility ++status() { status_of_proc $@; }; ++ + log_use_fancy_output () { + TPUT=/usr/bin/tput + EXPR=/usr/bin/expr +-- +2.29.2 + diff --git a/base/lsb/debian/patches/series b/base/lsb/debian/patches/series new file mode 100644 index 000000000..668707d80 --- /dev/null +++ b/base/lsb/debian/patches/series @@ -0,0 +1 @@ +0001-stx-Add-status_of_proc-wrapper-for-centos-compat.patch diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 2ea979dc5..52e5b1e59 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -5,6 +5,7 @@ base/dnsmasq base/libfdt base/lighttpd base/linuxptp +base/lsb base/pf-bb-config base/systemd base/watchdog