mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
From cb72b3e172c238b4b5ae5935dc6be54f5034fcf1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 30 Jun 2017 18:20:06 -0700
|
||||
Subject: [PATCH 1/2] fix problems that causes a segmentation fault under some
|
||||
conditions
|
||||
|
||||
Upstream-Status: Inappropriate [ no upstream ]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
ksym_mod.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/ksym_mod.c b/ksym_mod.c
|
||||
index 6e26da1..a3daa7d 100644
|
||||
--- a/ksym_mod.c
|
||||
+++ b/ksym_mod.c
|
||||
@@ -186,7 +186,6 @@ extern int InitMsyms()
|
||||
else
|
||||
Syslog(LOG_ERR, "Error loading kernel symbols " \
|
||||
"- %s\n", strerror(errno));
|
||||
- fclose(ksyms);
|
||||
return(0);
|
||||
}
|
||||
|
||||
--
|
||||
2.13.2
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From b22f244732cd0f475af2f82fc7eecec49f90623b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 1 Jul 2017 00:01:50 -0700
|
||||
Subject: [PATCH 2/2] Make way for respecting flags from environment
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Makefile | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 5af1689..af699d2 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -17,14 +17,12 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
-CC= gcc
|
||||
#SKFLAGS= -g -DSYSV -Wall
|
||||
#LDFLAGS= -g
|
||||
-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
|
||||
+SKFLAGS = $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce
|
||||
# -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
||||
# -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
|
||||
# $(shell getconf LFS_SKFLAGS)
|
||||
-LDFLAGS= -s
|
||||
|
||||
# Look where your install program is.
|
||||
INSTALL = /usr/bin/install
|
||||
--
|
||||
2.13.2
|
||||
|
||||
@@ -16,6 +16,8 @@ inherit update-rc.d update-alternatives systemd
|
||||
SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
|
||||
file://no-strip-install.patch \
|
||||
file://0001-Fix-build-with-musl.patch \
|
||||
file://0001-fix-problems-that-causes-a-segmentation-fault-under-.patch \
|
||||
file://0002-Make-way-for-respecting-flags-from-environment.patch \
|
||||
file://sysklogd \
|
||||
file://syslog.conf \
|
||||
file://syslogd.service \
|
||||
@@ -32,9 +34,7 @@ SYSTEMD_AUTO_ENABLE = "enable"
|
||||
INITSCRIPT_NAME = "syslog"
|
||||
CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}"
|
||||
|
||||
EXTRA_OEMAKE = "-e MAKEFLAGS="
|
||||
|
||||
CFLAGS_append = " -DSYSV"
|
||||
CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${mandir}/man8 \
|
||||
|
||||
Reference in New Issue
Block a user