config-files: remove the patch of changing the log source

The log source "systemd_journal" will not be used at all in stx
after unlock and there will not be any log redirected to syslog files,
so we should not change the log source to "systemd_journal", remove
the patch to revert back to use /dev/log

Issue-ID: INF-65
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I0b755247bbc232c3690ac8826f292f4ae5e8c40f

diff --git a/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb b/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb
index 67b0e5e..b61260c 100644 (file)
--- a/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb
+++ b/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb
@@ -49,7 +49,6 @@ SRC_URI = " \
        file://util-linux-pam-postlogin.patch \
        file://syslog-ng-config-parse-err.patch \
        file://syslog-ng-config-systemd-service.patch \
-       file://syslog-ng-conf-fix-the-source.patch \
        file://syslog-ng-conf-replace-match-with-message.patch \
        file://lighttpd-init-script-chroot.patch \
        "

diff --git a/meta-stx/recipes-core/stx-config-files/files/syslog-ng-conf-fix-the-source.patch b/meta-stx/recipes-core/stx-config-files/files/syslog-ng-conf-fix-the-source.patch
deleted file mode 100644 (file)
index a493093..0000000
--- a/meta-stx/recipes-core/stx-config-files/files/syslog-ng-conf-fix-the-source.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 466367eb5ebc4ea1b9b1457d496834c57ed1dd66 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Thu, 26 Mar 2020 23:41:59 +0800
-Subject: [PATCH] syslog-ng.conf: fix the source
-
-ERROR: Using /dev/log Unix socket with systemd is not possible.
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- syslog-ng-config/files/syslog-ng.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/syslog-ng-config/files/syslog-ng.conf b/syslog-ng-config/files/syslog-ng.conf
-index b1bab2c..1e06c02 100644
---- a/syslog-ng-config/files/syslog-ng.conf
-+++ b/syslog-ng-config/files/syslog-ng.conf
-@@ -62,7 +62,7 @@ options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no);
- # This is the default behavior of sysklogd package
- # Logs may come from unix stream, but not from another machine.
- #
--source s_src { unix-dgram("/dev/log"   ); internal();
-+source s_src { systemd_journal(); internal();
-                file("/proc/kmsg" program_override("kernel")   );
- };
- 
--- 
-2.7.4
-