[OE-core] [PATCH] quilt: Fix paths for patch and perl
Richard Purdie
richard.purdie at linuxfoundation.org
Thu Mar 30 09:02:04 UTC 2017
On Wed, 2017-03-29 at 17:44 +0300, Jussi Kukkonen wrote:
> --with-perl value is used as part of shebang lines: the previous
> do_install_append hack did not work as it was often used as
> #! /usr/bin/env perl -w
> Env does not support arguments, set --with-perl instead. Native
> recipe already overrides this so should not break.
>
> --with-patch is used within the gnu patch wrapper only: before this
> commit the wrapper contained a path to (build host) native patch.
>
> Also tweak one test so busybox mv output is accepted.
>
> All ptests should now pass: Fixes [YOCTO #11221].
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
> ---
> meta/recipes-devtools/quilt/quilt.inc | 3 ++-
> ...0001-tests-Allow-different-output-from-mv.patch | 29
> ++++++++++++++++++++++
> meta/recipes-devtools/quilt/quilt_0.65.bb | 10 --------
> 3 files changed, 31 insertions(+), 11 deletions(-)
> create mode 100644 meta/recipes-devtools/quilt/quilt/0001-tests-
> Allow-different-output-from-mv.patch
>
> diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-
> devtools/quilt/quilt.inc
> index 57e2a14..e6a63ce 100644
> --- a/meta/recipes-devtools/quilt/quilt.inc
> +++ b/meta/recipes-devtools/quilt/quilt.inc
> @@ -8,6 +8,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-
> ${PV}.tar.gz \
> file://run-ptest \
> file://Makefile \
> file://test.sh \
> + file://0001-tests-Allow-different-output-from-mv.patch \
> "
>
> SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6"
> @@ -33,7 +34,7 @@ RDEPENDS_${PN} = "bash"
> EXTRA_OE_MAKE_ARGS_darwin ?= ""
> EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}"
>
> -EXTRA_OECONF = "--with-perl=perl"
> +EXTRA_OECONF = "--with-perl=${bindir}/perl --with-patch=patch"
Unfortunately I think this would break nativesdk-quilt since we'd no
longer be using env and hence would require the buildtools tarball and
sdks contained perl?
Cheers,
Richard
More information about the Openembedded-core
mailing list