[oe-commits] [openembedded-core] 07/11: xserver-xorg: refresh build path removal patch

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 4082158eab8489885b14b8fd33e5c8bb5801f6ba
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Aug 6 11:30:51 2019 +0100

    xserver-xorg: refresh build path removal patch
    
    The patch has iterated, so update to the latest revision.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../xserver-xorg/sdksyms-no-build-path.patch       | 40 ++++++++++++++++++----
 1 file 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 54d128c..be198ec 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 @@
-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 at intel.com>
+
+From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton at 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
 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
 build environment, and a source of change for reproducible builds.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
-Signed-off-by: Ross Burton <ross.burton at intel.com>
+---
+ hw/xfree86/sdksyms.sh | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 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
 +++ 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(" * will be available in the X Server binary.");
      print(" */");
@@ -20,3 +36,15 @@ index 39e33711d..cdb3794b9 100755
      print("_X_HIDDEN void *xorg_symbols[] = {");
  
      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
+

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.