mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
syslog-ng: upgrade 3.38.1 -> 4.0.1
* upgrade 3.38.1 to 4.0.1 * fix buildpath warning Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,55 @@
|
|||||||
|
From d85a7a3ae2bb9f5267b2af43784633ae8f011f21 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Changqing Li <changqing.li@windriver.com>
|
||||||
|
Date: Mon, 13 Mar 2023 09:50:15 +0800
|
||||||
|
Subject: [PATCH] Fix buildpaths warning
|
||||||
|
|
||||||
|
Fix buildpath warning:
|
||||||
|
WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/include/syslog-ng/syslog-ng-config-64.h in package syslog-ng-dev contains reference to TMPDIR [buildpaths]
|
||||||
|
WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/bin/syslog-ng-update-virtualenv in package syslog-ng contains reference to TMPDIR
|
||||||
|
File /usr/bin/pdbtool in package syslog-ng contains reference to TMPDIR [buildpaths]
|
||||||
|
WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/lib/syslog-ng/libdbparser.so in package syslog-ng-libs contains reference to TMPDIR [buildpaths]
|
||||||
|
|
||||||
|
* SYSLOG_NG_PATH_TOPSRC_DIR is /yocto/build/tmp/work/core2-64-poky-linux/syslog-ng/4.0.1-r0,
|
||||||
|
which is used to get xsd dir in build SYSLOG_NG_PATH_TOPSRC_DIR/doc/xsd,
|
||||||
|
which is not suitable for target, set it to "/source" for fixing this buildpath warning
|
||||||
|
|
||||||
|
* SYSTEM_PYTHON is /yocto/build/tmp/hosttools/python3, set to python3
|
||||||
|
for target.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe specific]
|
||||||
|
|
||||||
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||||
|
---
|
||||||
|
configure.ac | 2 +-
|
||||||
|
scripts/syslog-ng-update-virtualenv.in | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 79a1502..1ad6508 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -1930,7 +1930,7 @@ AC_DEFINE_UNQUOTED(PYTHON_SYSCONF_MODULE_DIR, "$python_sysconf_moduledir", [Pyth
|
||||||
|
AC_DEFINE_UNQUOTED(PATH_LOGGENPLUGINDIR, "$loggenplugindir", [loggenplugin installation directory])
|
||||||
|
AC_DEFINE_UNQUOTED(MODULE_PATH, "$module_path", [module search path])
|
||||||
|
AC_DEFINE_UNQUOTED(JAVA_MODULE_PATH, "$java_module_path", [java module search path])
|
||||||
|
-AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "$abs_topsrcdir", [self-defined top_srcdir path])
|
||||||
|
+AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "/source", [self-defined top_srcdir path])
|
||||||
|
AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$PACKAGE_NAME", [package name])
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/scripts/syslog-ng-update-virtualenv.in b/scripts/syslog-ng-update-virtualenv.in
|
||||||
|
index ed85baf..b1a9e34 100755
|
||||||
|
--- a/scripts/syslog-ng-update-virtualenv.in
|
||||||
|
+++ b/scripts/syslog-ng-update-virtualenv.in
|
||||||
|
@@ -62,7 +62,7 @@ done
|
||||||
|
set -e
|
||||||
|
|
||||||
|
REQUIREMENTS_FILE=${python_moduledir}/requirements.txt
|
||||||
|
-SYSTEM_PYTHON=@PYTHON@
|
||||||
|
+SYSTEM_PYTHON=python3
|
||||||
|
VENV_PYTHON=${python_venvdir}/bin/python
|
||||||
|
|
||||||
|
if [ "$display_prompt" -ne 0 ]; then
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
+2
-1
@@ -22,10 +22,11 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
|
|||||||
file://volatiles.03_syslog-ng \
|
file://volatiles.03_syslog-ng \
|
||||||
file://syslog-ng-tmp.conf \
|
file://syslog-ng-tmp.conf \
|
||||||
file://syslog-ng.service-the-syslog-ng-service.patch \
|
file://syslog-ng.service-the-syslog-ng-service.patch \
|
||||||
|
file://0001-Fix-buildpaths-warning.patch \
|
||||||
"
|
"
|
||||||
SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch"
|
SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7"
|
SRC_URI[sha256sum] = "c16eafe447191c079f471846182876b7919d3d789af8c1f9fe55ab14521ceb2c"
|
||||||
|
|
||||||
UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"
|
UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"
|
||||||
|
|
||||||
Reference in New Issue
Block a user