diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2019-06-04 14:42:30 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-04 17:27:19 +0100 |
| commit | 9726c75c98f04735df33f61cf019ee50f67296f5 (patch) | |
| tree | 1a02cb822865e841e3ceb4304ac56536f113dacf | |
| parent | b1fe6ae66360e160eeaeafe456536f335a0eab60 (diff) | |
| download | openembedded-core-contrib-9726c75c98f04735df33f61cf019ee50f67296f5.tar.gz | |
groff: improve reproducibility
As said in ${S}/m4/groff.m4
...
1642 # gdiffmk will attempt to use bash (for option -ef of 'test'). If bash
1643 # is not available it will use /bin/sh.
...
So drop hardcode shebang replacement, and pass variable to configure,
it also remove build path in gdiffmk to improve reproducibility
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/groff_1.22.4.bb | 3 |
2 files changed, 1 insertions, 33 deletions
diff --git a/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch b/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch deleted file mode 100644 index 1b94e8a937..0000000000 --- a/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 54c795c8a3c7356294007b5a4eed1dd47ed6411d Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Sat, 11 May 2019 19:19:27 +0800 -Subject: [PATCH] fix shebang for target - -... -|ERROR: groff-1.22.4-r0 do_package_qa: QA Issue: /usr/bin/gdiffmk contained in -package groff requires tmp-glibc/hosttools/bash, but no providers found in -RDEPENDS_groff? [file-rdeps] -... - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - contrib/gdiffmk/gdiffmk.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh -index 5ce931e..10f2300 100644 ---- a/contrib/gdiffmk/gdiffmk.sh -+++ b/contrib/gdiffmk/gdiffmk.sh -@@ -1,4 +1,4 @@ --#!@BASH_PROG@ -+#!/bin/sh - # Copyright (C) 2004-2018 Free Software Foundation, Inc. - # Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>> - # Thanks to Peter Bray for debugging. --- -2.7.4 - diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb index 37eee9a6cc..a190230b31 100644 --- a/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/meta/recipes-extended/groff/groff_1.22.4.bb @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://0001-replace-perl-w-with-use-warnings.patch \ file://groff-not-search-fonts-on-build-host.patch \ - file://0001-fix-shebang-for-taget.patch \ file://0001-support-musl.patch \ " @@ -27,7 +26,7 @@ MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bind EXTRA_OECONF = "--without-x --without-doc" PARALLEL_MAKE = "" -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no'" do_install_append() { # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location |