diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2022-08-03 13:28:04 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-08-06 09:40:09 -0700 |
commit | 4f2025e8d2f1626e97f7e9e675ce3c7d45477807 (patch) | |
tree | 5b80a86e5b72ce85e7fc9f8b42dc8e92e407a85b /meta-webserver | |
parent | 565e31cb05dfe8eacbdb7e4b5d2bfe11356d2e5a (diff) | |
download | meta-openembedded-contrib-4f2025e8d2f1626e97f7e9e675ce3c7d45477807.tar.gz |
apache2: Fix the buildpaths issue
Fixes:
WARNING: apache2-2.4.54-r0 do_package_qa: QA Issue: File /usr/src/debug/apache2/2.4.54-r0/build/server/exports.c in package apache2-src contains reference to TMPDIR [buildpaths]
Before the patch:
# cat ./build/server/exports.c
[snip]
#include "mpm_fdqueue.h"
const void *ap_ugly_hack = NULL;
/*
* /buildarea/build/tmp-glibc/work/core2-32-wrs-linux/apache2/2.4.54-r0/httpd-2.4.54/include/ap_expr.h
*/
const void *ap_hack_ap_expr_exec = (const void *)ap_expr_exec;
[snip]
After the patch:
# cat ./build/server/exports.c
[snip]
#include "mpm_fdqueue.h"
const void *ap_ugly_hack = NULL;
/*
* ap_expr.h
*/
const void *ap_hack_ap_expr_exec = (const void *)ap_expr_exec;
[snip]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch | 32 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch b/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch new file mode 100644 index 0000000000..78f23f0f2d --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch @@ -0,0 +1,32 @@ +From 5b5eae9cdf3bae91756c717349f2f33a31888f24 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 3 Aug 2022 12:35:16 +0800 +Subject: [PATCH] make_exports.awk: not expose the path + +Don't print the full path in the comment line. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + build/make_exports.awk | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build/make_exports.awk b/build/make_exports.awk +index 1cf0568..44d93c5 100644 +--- a/build/make_exports.awk ++++ b/build/make_exports.awk +@@ -47,7 +47,9 @@ function push(line) { + + function do_output() { + printf("/*\n") +- printf(" * %s\n", FILENAME) ++ file = FILENAME ++ sub("([^/]*[/])*", "", file) ++ printf(" * %s\n", file) + printf(" */\n") + + for (i = 0; i < stackptr; i++) { +-- +2.25.1 + diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb index c5f014b3cd..4f30eca59e 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0007-apache2-allow-to-disable-selinux-support.patch \ file://0008-Fix-perl-install-directory-to-usr-bin.patch \ file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ + file://0001-make_exports.awk-not-expose-the-path.patch \ " SRC_URI:append:class-target = " \ |