mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
xserver-xorg: refresh build path removal patch
The patch has iterated, so update to the latest revision. (From OE-Core rev: 042e8e8a7181bb3ca830185c38f9287f62c68fe6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
7e0957764d
commit
83201d04f1
@@ -1,18 +1,34 @@
|
|||||||
sdksyms.sh: don't embed the build path
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ross Burton <ross.burton@intel.com>
|
||||||
|
Date: Thu, 1 Aug 2019 15:24:51 +0100
|
||||||
|
Subject: [PATCH] sdksyms.sh: don't embed the build path
|
||||||
|
|
||||||
This script generates a header that has a comment containing the build path for
|
This script generates a header that has a comment containing the build path for
|
||||||
no real reason. As this source can end up deployed on targets in debug packages
|
no real reason. As this source can end up deployed on targets in debug packages
|
||||||
this means there is both potentially sensitive information leakage about the
|
this means there is both potentially sensitive information leakage about the
|
||||||
build environment, and a source of change for reproducible builds.
|
build environment, and a source of change for reproducible builds.
|
||||||
|
---
|
||||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
|
hw/xfree86/sdksyms.sh | 7 +++++--
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
|
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
|
||||||
index 39e33711d..cdb3794b9 100755
|
index 39e33711d..bdf47a71a 100755
|
||||||
--- a/hw/xfree86/sdksyms.sh
|
--- a/hw/xfree86/sdksyms.sh
|
||||||
+++ b/hw/xfree86/sdksyms.sh
|
+++ b/hw/xfree86/sdksyms.sh
|
||||||
@@ -308,7 +308,6 @@ BEGIN {
|
@@ -302,13 +302,16 @@ LC_ALL=C
|
||||||
|
export LC_ALL
|
||||||
|
${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
|
||||||
|
${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
|
||||||
|
+function basename(file) {
|
||||||
|
+ sub(".*/", "", file)
|
||||||
|
+ return file
|
||||||
|
+}
|
||||||
|
BEGIN {
|
||||||
|
sdk = 0;
|
||||||
|
print("/*");
|
||||||
print(" * These symbols are referenced to ensure they");
|
print(" * These symbols are referenced to ensure they");
|
||||||
print(" * will be available in the X Server binary.");
|
print(" * will be available in the X Server binary.");
|
||||||
print(" */");
|
print(" */");
|
||||||
@@ -20,3 +36,15 @@ index 39e33711d..cdb3794b9 100755
|
|||||||
print("_X_HIDDEN void *xorg_symbols[] = {");
|
print("_X_HIDDEN void *xorg_symbols[] = {");
|
||||||
|
|
||||||
printf("sdksyms.c:") > "sdksyms.dep";
|
printf("sdksyms.c:") > "sdksyms.dep";
|
||||||
|
@@ -337,7 +340,7 @@ BEGIN {
|
||||||
|
# remove quotes
|
||||||
|
gsub(/"/, "", $3);
|
||||||
|
line = $2;
|
||||||
|
- header = $3;
|
||||||
|
+ header = basename($3);
|
||||||
|
if (! headers[$3]) {
|
||||||
|
printf(" \\\n %s", $3) >> "sdksyms.dep";
|
||||||
|
headers[$3] = 1;
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user