From 250f1066ffe0aa76b515725f46c2dba121482ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= Date: Thu, 28 Mar 2019 16:24:42 +0100 Subject: [PATCH] support byte-by-byte reproducible build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit build path ends in the final binary package causing the build not to be reproducible byte-by-byte. Reference: https://bugs.debian.org/899358 Signed-off-by: Héctor Orón Martínez --- compositor/meson.build | 2 -- ivi-shell/meson.build | 2 -- weston.ini.in | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/compositor/meson.build b/compositor/meson.build index 3824d6ff..61860a7a 100644 --- a/compositor/meson.build +++ b/compositor/meson.build @@ -160,8 +160,6 @@ endif weston_ini_config = configuration_data() weston_ini_config.set('bindir', dir_bin) weston_ini_config.set('libexecdir', dir_libexec) -weston_ini_config.set('abs_top_srcdir', meson.source_root()) -weston_ini_config.set('abs_top_builddir', meson.build_root()) configure_file( input: '../weston.ini.in', output: 'weston.ini', diff --git a/ivi-shell/meson.build b/ivi-shell/meson.build index fceaf804..17ab5ea5 100644 --- a/ivi-shell/meson.build +++ b/ivi-shell/meson.build @@ -40,8 +40,6 @@ if get_option('shell-ivi') ivi_test_config = configuration_data() ivi_test_config.set('bindir', dir_bin) ivi_test_config.set('libexecdir', dir_libexec) - ivi_test_config.set('abs_top_srcdir', meson.current_source_dir()) - ivi_test_config.set('abs_top_builddir', meson.current_build_dir()) ivi_test_config.set('plugin_prefix', meson.current_build_dir()) ivi_test_config.set('westondatadir', join_paths(dir_data, 'weston')) ivi_test_ini = configure_file( diff --git a/weston.ini.in b/weston.ini.in index 846ef746..74bcb512 100644 --- a/weston.ini.in +++ b/weston.ini.in @@ -38,7 +38,7 @@ path=/usr/bin/google-chrome [launcher] icon=/usr/share/icons/gnome/24x24/apps/arts.png -path=@abs_top_builddir@/weston-flower +path=@bindir@/weston-flower [input-method] path=@libexecdir@/weston-keyboard