summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-08-06 11:30:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-07 16:08:15 +0100
commit83201d04f15b2e2219767730d3b7a94c32af2dd3 (patch)
tree49966e3ecd0c3f928ff992bfa38a4af78c1b3781 /meta
parent7e0957764da25b22bc4d200163b6aca608eae1c8 (diff)
downloadpoky-83201d04f15b2e2219767730d3b7a94c32af2dd3.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch40
1 files changed, 34 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
index 54d128cb39..be198ece49 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
@@ -1,18 +1,34 @@
1sdksyms.sh: don't embed the build path 1Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Thu, 1 Aug 2019 15:24:51 +0100
7Subject: [PATCH] sdksyms.sh: don't embed the build path
2 8
3This script generates a header that has a comment containing the build path for 9This script generates a header that has a comment containing the build path for
4no real reason. As this source can end up deployed on targets in debug packages 10no real reason. As this source can end up deployed on targets in debug packages
5this means there is both potentially sensitive information leakage about the 11this means there is both potentially sensitive information leakage about the
6build environment, and a source of change for reproducible builds. 12build environment, and a source of change for reproducible builds.
7 13---
8Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253] 14 hw/xfree86/sdksyms.sh | 7 +++++--
9Signed-off-by: Ross Burton <ross.burton@intel.com> 15 1 file changed, 5 insertions(+), 2 deletions(-)
10 16
11diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh 17diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
12index 39e33711d..cdb3794b9 100755 18index 39e33711d..bdf47a71a 100755
13--- a/hw/xfree86/sdksyms.sh 19--- a/hw/xfree86/sdksyms.sh
14+++ b/hw/xfree86/sdksyms.sh 20+++ b/hw/xfree86/sdksyms.sh
15@@ -308,7 +308,6 @@ BEGIN { 21@@ -302,13 +302,16 @@ LC_ALL=C
22 export LC_ALL
23 ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
24 ${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
25+function basename(file) {
26+ sub(".*/", "", file)
27+ return file
28+}
29 BEGIN {
30 sdk = 0;
31 print("/*");
16 print(" * These symbols are referenced to ensure they"); 32 print(" * These symbols are referenced to ensure they");
17 print(" * will be available in the X Server binary."); 33 print(" * will be available in the X Server binary.");
18 print(" */"); 34 print(" */");
@@ -20,3 +36,15 @@ index 39e33711d..cdb3794b9 100755
20 print("_X_HIDDEN void *xorg_symbols[] = {"); 36 print("_X_HIDDEN void *xorg_symbols[] = {");
21 37
22 printf("sdksyms.c:") > "sdksyms.dep"; 38 printf("sdksyms.c:") > "sdksyms.dep";
39@@ -337,7 +340,7 @@ BEGIN {
40 # remove quotes
41 gsub(/"/, "", $3);
42 line = $2;
43- header = $3;
44+ header = basename($3);
45 if (! headers[$3]) {
46 printf(" \\\n %s", $3) >> "sdksyms.dep";
47 headers[$3] = 1;
48--
492.20.1
50