sysklogd: removed tabs from syslog.conf

Yocto #2926: syslog.conf should not have tabs within the selector field.
Removed tabs from the selector field of syslog rules. Tabs or spaces
should be used, in syslog.conf, only when separating selectors from
actions.

(From OE-Core rev: 1316be4e597332a629842b3f5a7dde8e45dd057d)

Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Resolved merge conflicts with denzil branch.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>

diff --git a/meta/recipes-extended/sysklogd/files/syslog.conf b/meta/recipes-extended/sysklogd/files/syslog.conf
index 7d1858ca5bbd8db3c2eca3f690de9688d64eb350..0849de12687209470b300c8ac57b5bc0da928fd6 100644 (file)
--- a/meta/recipes-extended/sysklogd/files/syslog.conf
+++ b/meta/recipes-extended/sysklogd/files/syslog.conf
@@ -34,12 +34,13 @@ news.notice                 -/var/log/news.notice
 # Some `catch-all' logfiles.
 #
 *.=debug;\
-       auth,authpriv.none;\
-       news.none;mail.none     -/var/log/debug
+auth,authpriv.none;\
+news.none;mail.none    -/var/log/debug
+
 *.=info;*.=notice;*.=warn;\
-       auth,authpriv.none;\
-       cron,daemon.none;\
-       mail,news.none          -/var/log/messages
+auth,authpriv.none;\
+cron,daemon.none;\
+mail,news.none         -/var/log/messages
 
 #
 # Emergencies are sent to everybody logged in.
@@ -51,9 +52,9 @@ news.notice                   -/var/log/news.notice
 # console I usually leave idle.
 #
 #daemon,mail.*;\
-#      news.=crit;news.=err;news.=notice;\
-#      *.=debug;*.=info;\
-#      *.=notice;*.=warn       /dev/tty8
+#news.=crit;news.=err;news.=notice;\
+#*.=debug;*.=info;\
+#*.=notice;*.=warn     /dev/tty8
 
 # The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
 # you must invoke `xconsole' with the `-file' option:
@@ -64,7 +65,7 @@ news.notice                   -/var/log/news.notice
 #      busy site..
 #
 daemon.*;mail.*;\
-       news.err;\
-       *.=debug;*.=info;\
-       *.=notice;*.=warn       |/dev/xconsole
+news.err;\
+*.=debug;*.=info;\
+*.=notice;*.=warn      |/dev/xconsole
 

diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
index b58094e69e9f6f43be63794a44447bd11a7ea8e1..471c8c85bfccfb5d6df28a1b6492524c234ef20d 100644 (file)
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
@@ -1,5 +1,5 @@
 require sysklogd.inc
-PR = "r5"
+PR = "r6"
 
 SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
 SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"