| Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 1 | From d85a7a3ae2bb9f5267b2af43784633ae8f011f21 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Mon, 13 Mar 2023 09:50:15 +0800 |
| 4 | Subject: [PATCH] Fix buildpaths warning |
| 5 | |
| 6 | Fix buildpath warning: |
| 7 | 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] |
| 8 | 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 |
| 9 | File /usr/bin/pdbtool in package syslog-ng contains reference to TMPDIR [buildpaths] |
| 10 | 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] |
| 11 | |
| 12 | * SYSLOG_NG_PATH_TOPSRC_DIR is /yocto/build/tmp/work/core2-64-poky-linux/syslog-ng/4.0.1-r0, |
| 13 | which is used to get xsd dir in build SYSLOG_NG_PATH_TOPSRC_DIR/doc/xsd, |
| 14 | which is not suitable for target, set it to "/source" for fixing this buildpath warning |
| 15 | |
| 16 | * SYSTEM_PYTHON is /yocto/build/tmp/hosttools/python3, set to python3 |
| 17 | for target. |
| 18 | |
| 19 | Upstream-Status: Inappropriate [oe specific] |
| 20 | |
| 21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 22 | --- |
| 23 | configure.ac | 2 +- |
| 24 | scripts/syslog-ng-update-virtualenv.in | 2 +- |
| 25 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 26 | |
| 27 | diff --git a/configure.ac b/configure.ac |
| 28 | index 79a1502..1ad6508 100644 |
| 29 | --- a/configure.ac |
| 30 | +++ b/configure.ac |
| 31 | @@ -1930,7 +1930,7 @@ AC_DEFINE_UNQUOTED(PYTHON_SYSCONF_MODULE_DIR, "$python_sysconf_moduledir", [Pyth |
| 32 | AC_DEFINE_UNQUOTED(PATH_LOGGENPLUGINDIR, "$loggenplugindir", [loggenplugin installation directory]) |
| 33 | AC_DEFINE_UNQUOTED(MODULE_PATH, "$module_path", [module search path]) |
| 34 | AC_DEFINE_UNQUOTED(JAVA_MODULE_PATH, "$java_module_path", [java module search path]) |
| 35 | -AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "$abs_topsrcdir", [self-defined top_srcdir path]) |
| 36 | +AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "/source", [self-defined top_srcdir path]) |
| 37 | AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$PACKAGE_NAME", [package name]) |
| 38 | |
| 39 | |
| 40 | diff --git a/scripts/syslog-ng-update-virtualenv.in b/scripts/syslog-ng-update-virtualenv.in |
| 41 | index ed85baf..b1a9e34 100755 |
| 42 | --- a/scripts/syslog-ng-update-virtualenv.in |
| 43 | +++ b/scripts/syslog-ng-update-virtualenv.in |
| 44 | @@ -62,7 +62,7 @@ done |
| 45 | set -e |
| 46 | |
| 47 | REQUIREMENTS_FILE=${python_moduledir}/requirements.txt |
| 48 | -SYSTEM_PYTHON=@PYTHON@ |
| 49 | +SYSTEM_PYTHON=python3 |
| 50 | VENV_PYTHON=${python_venvdir}/bin/python |
| 51 | |
| 52 | if [ "$display_prompt" -ne 0 ]; then |
| 53 | -- |
| 54 | 2.25.1 |
| 55 | |