summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-01 00:04:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-08 13:34:45 +0100
commit25018c4807a431382488dcf46731c83c2e9baffb (patch)
tree1191df6c536e445b4da2edefdf675cb885b18df8
parentdc3b3a8df3297367e9386dd3ac098b64f7f46d06 (diff)
downloadpoky-25018c4807a431382488dcf46731c83c2e9baffb.tar.gz
sysklogd: Improve build and fix runtime crash
Patch the makefile so it can respect flags from environment add a patch to fix a run time crash (From OE-Core rev: 39c00c7c42fe7e555eb65ea7c01bfc9cb8a34514) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch28
-rw-r--r--meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch35
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc6
3 files changed, 66 insertions, 3 deletions
diff --git a/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch b/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
new file mode 100644
index 0000000000..56431af845
--- /dev/null
+++ b/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
@@ -0,0 +1,28 @@
1From cb72b3e172c238b4b5ae5935dc6be54f5034fcf1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 30 Jun 2017 18:20:06 -0700
4Subject: [PATCH 1/2] fix problems that causes a segmentation fault under some
5 conditions
6
7Upstream-Status: Inappropriate [ no upstream ]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 ksym_mod.c | 1 -
12 1 file changed, 1 deletion(-)
13
14diff --git a/ksym_mod.c b/ksym_mod.c
15index 6e26da1..a3daa7d 100644
16--- a/ksym_mod.c
17+++ b/ksym_mod.c
18@@ -186,7 +186,6 @@ extern int InitMsyms()
19 else
20 Syslog(LOG_ERR, "Error loading kernel symbols " \
21 "- %s\n", strerror(errno));
22- fclose(ksyms);
23 return(0);
24 }
25
26--
272.13.2
28
diff --git a/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch b/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
new file mode 100644
index 0000000000..ebbdef303b
--- /dev/null
+++ b/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
@@ -0,0 +1,35 @@
1From b22f244732cd0f475af2f82fc7eecec49f90623b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 1 Jul 2017 00:01:50 -0700
4Subject: [PATCH 2/2] Make way for respecting flags from environment
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 Makefile | 4 +---
11 1 file changed, 1 insertion(+), 3 deletions(-)
12
13diff --git a/Makefile b/Makefile
14index 5af1689..af699d2 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -17,14 +17,12 @@
18 # along with this program; if not, write to the Free Software
19 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20
21-CC= gcc
22 #SKFLAGS= -g -DSYSV -Wall
23 #LDFLAGS= -g
24-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
25+SKFLAGS = $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce
26 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
27 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
28 # $(shell getconf LFS_SKFLAGS)
29-LDFLAGS= -s
30
31 # Look where your install program is.
32 INSTALL = /usr/bin/install
33--
342.13.2
35
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 78b8d7a985..644728ae67 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -16,6 +16,8 @@ inherit update-rc.d update-alternatives systemd
16SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \ 16SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
17 file://no-strip-install.patch \ 17 file://no-strip-install.patch \
18 file://0001-Fix-build-with-musl.patch \ 18 file://0001-Fix-build-with-musl.patch \
19 file://0001-fix-problems-that-causes-a-segmentation-fault-under-.patch \
20 file://0002-Make-way-for-respecting-flags-from-environment.patch \
19 file://sysklogd \ 21 file://sysklogd \
20 file://syslog.conf \ 22 file://syslog.conf \
21 file://syslogd.service \ 23 file://syslogd.service \
@@ -32,9 +34,7 @@ SYSTEMD_AUTO_ENABLE = "enable"
32INITSCRIPT_NAME = "syslog" 34INITSCRIPT_NAME = "syslog"
33CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}" 35CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}"
34 36
35EXTRA_OEMAKE = "-e MAKEFLAGS=" 37CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
36
37CFLAGS_append = " -DSYSV"
38 38
39do_install () { 39do_install () {
40 install -d ${D}${mandir}/man8 \ 40 install -d ${D}${mandir}/man8 \