[PATCH] libc6-dbg: improve reproducibility

[PATCH] libc6-dbg: improve reproducibility

[Juro Bystricky]

Prevent bison from generating #line comments containing build
host paths references.

[YOCTO #12625]

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
---
 .../glibc/0029-plural_c_no_preprocessor_lines.patch | 21 +++++++++++++++++++++
 meta/recipes-core/glibc/glibc_2.27.bb               |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch

diff --git a/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch b/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch
new file mode 100644
index 0000000..6f03e1c
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch
@@ -0,0 +1,21 @@
+Improve reproducibility:
+Do not put any #line preprocessor commands in bison generated files.
+These lines contain absolute paths containing file locations on
+the host build machine.
+
+Upstream-Status: Pending
+Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
+
+diff --git a/intl/Makefile b/intl/Makefile
+index 2219717..a203780 100644
+--- a/intl/Makefile
++++ b/intl/Makefile
+@@ -151,7 +151,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out
+ 
+ CPPFLAGS += -D'LOCALEDIR="$(localedir)"' \
+ 	    -D'LOCALE_ALIAS_PATH="$(localedir)"'
+-BISONFLAGS = --yacc --name-prefix=__gettext --output
++BISONFLAGS = --yacc --no-lines --name-prefix=__gettext --output
+ 
+ $(inst_localedir)/locale.alias: locale.alias $(+force)
+ 	$(do-install)
diff --git a/meta/recipes-core/glibc/glibc_2.27.bb b/meta/recipes-core/glibc/glibc_2.27.bb
index 827857d..f626467 100644
--- a/meta/recipes-core/glibc/glibc_2.27.bb
+++ b/meta/recipes-core/glibc/glibc_2.27.bb
@@ -43,6 +43,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0026-reset-dl_load_write_lock-after-forking.patch \
            file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch \
            file://0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch \
+           file://0029-plural_c_no_preprocessor_lines.patch \
 "
 
 NATIVESDKFIXES ?= ""
-- 
2.7.4

✗ patchtest: failure for libc6-dbg: improve reproducibility

[Patchwork]

== Series Details ==

Series: libc6-dbg: improve reproducibility
Revision: 1
URL   : https://patchwork.openembedded.org/series/11613/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at af7ca3e359)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH] libc6-dbg: improve reproducibility

[Khem Raj]

On Thu, Mar 29, 2018 at 1:19 PM, Juro Bystricky
<juro.bystricky@intel.com> wrote:
> Prevent bison from generating #line comments containing build
> host paths references.
>
> [YOCTO #12625]
>
> Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
> ---
>  .../glibc/0029-plural_c_no_preprocessor_lines.patch | 21 +++++++++++++++++++++
>  meta/recipes-core/glibc/glibc_2.27.bb               |  1 +
>  2 files changed, 22 insertions(+)
>  create mode 100644 meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch
>
> diff --git a/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch b/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch
> new file mode 100644
> index 0000000..6f03e1c
> --- /dev/null
> +++ b/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch
> @@ -0,0 +1,21 @@
> +Improve reproducibility:
> +Do not put any #line preprocessor commands in bison generated files.
> +These lines contain absolute paths containing file locations on
> +the host build machine.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
> +
> +diff --git a/intl/Makefile b/intl/Makefile
> +index 2219717..a203780 100644
> +--- a/intl/Makefile
> ++++ b/intl/Makefile
> +@@ -151,7 +151,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out
> +
> + CPPFLAGS += -D'LOCALEDIR="$(localedir)"' \
> +           -D'LOCALE_ALIAS_PATH="$(localedir)"'
> +-BISONFLAGS = --yacc --name-prefix=__gettext --output
> ++BISONFLAGS = --yacc --no-lines --name-prefix=__gettext --output
> +

LGTM

> + $(inst_localedir)/locale.alias: locale.alias $(+force)
> +       $(do-install)
> diff --git a/meta/recipes-core/glibc/glibc_2.27.bb b/meta/recipes-core/glibc/glibc_2.27.bb
> index 827857d..f626467 100644
> --- a/meta/recipes-core/glibc/glibc_2.27.bb
> +++ b/meta/recipes-core/glibc/glibc_2.27.bb
> @@ -43,6 +43,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
>             file://0026-reset-dl_load_write_lock-after-forking.patch \
>             file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch \
>             file://0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch \
> +           file://0029-plural_c_no_preprocessor_lines.patch \
>  "
>
>  NATIVESDKFIXES ?= ""
> --
> 2.7.4
>