[rdkb][common][app][Remove 0004-remove-psm-db-reference patch]
[Description]
Remove 0004-remove-psm-db-reference patch
1. align meta-turris to remove 0004-remove-psm-db-reference patch
[Release-log]
diff --git a/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/recipes-ccsp/ccsp/ccsp-common-library.bbappend
index 20699bd..e84f6c5 100644
--- a/recipes-ccsp/ccsp/ccsp-common-library.bbappend
+++ b/recipes-ccsp/ccsp/ccsp-common-library.bbappend
@@ -23,7 +23,7 @@
SRC_URI_remove_dunfell = "file://0001-SSLeay_add_all_algorithms-remove-in-openssl-1.1.patch"
SRC_URI += "file://0003-add-dependency-to-pandm.patch;apply=no"
-SRC_URI += "file://0004-remove-psm-db-reference.patch;apply=no"
+
SRC_URI_append_dunfell = " file://0001-DBusLoop-SSL_state-TLS_ST_OK.patch;apply=no"
SRC_URI_append_dunfell = " file://0001-SSLeay_add_all_algorithms-remove-in-openssl-1.1.patch;apply=no"
@@ -32,12 +32,15 @@
do_filogic_patches() {
cd ${S}
if [ ! -e patch_applied ]; then
+ bbnote "Patching 0003-add-dependency-to-pandm.patch"
patch -p1 < ${WORKDIR}/0003-add-dependency-to-pandm.patch
- patch -p1 < ${WORKDIR}/0004-remove-psm-db-reference.patch
- if [ "${@bb.utils.contains('DISTRO_CODENAME', 'dunfell', 'dunfell', '', d)}" = "dunfell" ] ; then
- patch -p1 < ${WORKDIR}/0001-DBusLoop-SSL_state-TLS_ST_OK.patch
- patch -p1 < ${WORKDIR}/0001-SSLeay_add_all_algorithms-remove-in-openssl-1.1.patch
- fi
+ if [ "${@bb.utils.contains('DISTRO_CODENAME', 'dunfell', 'dunfell', '', d)}" = "dunfell" ] ; then
+ bbnote "Patching 0001-DBusLoop-SSL_state-TLS_ST_OK.patch"
+ patch -p1 < ${WORKDIR}/0001-DBusLoop-SSL_state-TLS_ST_OK.patch
+
+ bbnote "Patching 0001-SSLeay_add_all_algorithms-remove-in-openssl-1.1.patch"
+ patch -p1 < ${WORKDIR}/0001-SSLeay_add_all_algorithms-remove-in-openssl-1.1.patch
+ fi
touch patch_applied
fi
}
diff --git a/recipes-ccsp/ccsp/ccsp-common-library/0004-remove-psm-db-reference.patch b/recipes-ccsp/ccsp/ccsp-common-library/0004-remove-psm-db-reference.patch
deleted file mode 100644
index dd98f1c..0000000
--- a/recipes-ccsp/ccsp/ccsp-common-library/0004-remove-psm-db-reference.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/systemd_units/PsmSsp.service b/systemd_units/PsmSsp.service
-index cb4d530d..648a55f9 100644
---- a/systemd_units/PsmSsp.service
-+++ b/systemd_units/PsmSsp.service
-@@ -29,7 +29,6 @@ Environment="Subsys=eRT."
- Environment="LOG4C_RCPATH=/etc"
- EnvironmentFile=/etc/device.properties
- ExecStartPre=/bin/sh -c '(/usr/ccsp/utopiaInitCheck.sh)'
--ExecStartPre=/bin/sh -c '(/usr/ccsp/log_psm.db.sh)'
- ExecStart=/usr/bin/PsmSsp -subsys $Subsys
- ExecStop=/bin/sh -c 'echo "`date`: Stopping/Restarting PsmSsp" >> ${PROCESS_RESTART_LOG}'
- Restart=always