summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-08-02 21:37:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-03 23:56:01 +0100
commit6fc65530fb6dec46260da25d1fb00616e4a35c09 (patch)
tree7136ed11be9dd64ed6712b3e8e2a7aa1c83f15fe /meta/recipes-graphics
parent3ac93c73e109b10e361efcf6dca6002c18d408e7 (diff)
downloadpoky-6fc65530fb6dec46260da25d1fb00616e4a35c09.tar.gz
xserver-xorg: remove embedded build path in the source
The generated source file sdksyms.c has a comment with the absolute build path, which means xserver-xorg-src contains this build path. This is both potential build information leakage and a source of unreproducibility, so remove the comment. (From OE-Core rev: 2086e0f08d920de15ab4065fb43c2281b1dcc57a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch22
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb1
2 files changed, 23 insertions, 0 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
new file mode 100644
index 0000000000..54d128cb39
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
@@ -0,0 +1,22 @@
1sdksyms.sh: don't embed the build path
2
3This 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
5this means there is both potentially sensitive information leakage about the
6build environment, and a source of change for reproducible builds.
7
8Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10
11diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
12index 39e33711d..cdb3794b9 100755
13--- a/hw/xfree86/sdksyms.sh
14+++ b/hw/xfree86/sdksyms.sh
15@@ -308,7 +308,6 @@ BEGIN {
16 print(" * These symbols are referenced to ensure they");
17 print(" * will be available in the X Server binary.");
18 print(" */");
19- printf("/* topdir=%s */\n", topdir);
20 print("_X_HIDDEN void *xorg_symbols[] = {");
21
22 printf("sdksyms.c:") > "sdksyms.dep";
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
index d7c5e6b355..abc4656b0f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
@@ -4,6 +4,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat
4 file://pkgconfig.patch \ 4 file://pkgconfig.patch \
5 file://0001-test-xtest-Initialize-array-with-braces.patch \ 5 file://0001-test-xtest-Initialize-array-with-braces.patch \
6 file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ 6 file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \
7 file://sdksyms-no-build-path.patch \
7 " 8 "
8SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650" 9SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650"
9SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee" 10SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee"