diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch | 50 |
1 files changed, 0 insertions, 50 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 deleted file mode 100644 index be198ece49..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Thu, 1 Aug 2019 15:24:51 +0100 | ||
7 | Subject: [PATCH] sdksyms.sh: don't embed the build path | ||
8 | |||
9 | This script generates a header that has a comment containing the build path for | ||
10 | no real reason. As this source can end up deployed on targets in debug packages | ||
11 | this means there is both potentially sensitive information leakage about the | ||
12 | build environment, and a source of change for reproducible builds. | ||
13 | --- | ||
14 | hw/xfree86/sdksyms.sh | 7 +++++-- | ||
15 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh | ||
18 | index 39e33711d..bdf47a71a 100755 | ||
19 | --- a/hw/xfree86/sdksyms.sh | ||
20 | +++ b/hw/xfree86/sdksyms.sh | ||
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("/*"); | ||
32 | print(" * These symbols are referenced to ensure they"); | ||
33 | print(" * will be available in the X Server binary."); | ||
34 | print(" */"); | ||
35 | - printf("/* topdir=%s */\n", topdir); | ||
36 | print("_X_HIDDEN void *xorg_symbols[] = {"); | ||
37 | |||
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 | -- | ||
49 | 2.20.1 | ||
50 | |||