MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-14 22:35:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

apache2: Fix the buildpaths issue

Browse Source 
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>
This commit is contained in:
Mingli Yu 2022-08-03 13:28:04 +08:00 committed by Khem Raj
parent 565e31cb05
commit 4f2025e8d2
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch Normal file
View File

@ -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

1
meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb
View File

@ -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 = " \