[OE-core] [PATCH] net-tools_1.60-26.bb: Error fix

[Richard Purdie]

On Tue, 2016-01-12 at 08:02 +0300, Li Xin wrote:
> when set PATCHTOOL = "patch" in conf/local.conf,error will occur
> in the step of do_patch.
> The error is: "quilt: command not found",so fix it.
> 
> Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
> ---
>  meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> index 923d048..e173f54 100644
> --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> @@ -30,6 +30,7 @@ SRC_URI[patch.sha256sum] =
> "aeeeafaff68866a446f01bb639d4e0146a60af34dcd20e31a3e4
>  UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/net-tools/"
>  
>  inherit gettext
> +DEPENDS = "quilt-native"


DEPENDS works against do_configure and you need this in do_patch so
this is incorrect. You need something like:

do_patch[depends] = "quilt-native:do_populate_sysroot"

Cheers,

Richard

>  
>  # The Makefile is lame, no parallel build
>  PARALLEL_MAKE = ""
> @@ -40,7 +41,7 @@ PARALLEL_MAKE = ""
>  # up all previously applied patches in the start
>  nettools_do_patch() {
>  	cd ${S}
> -	quilt pop -a || true
> +	${STAGING_BINDIR_NATIVE}/quilt pop -a || true
>  	if [ -d ${S}/.pc-nettools ]; then
>  		rm -rf ${S}/.pc
>  		mv ${S}/.pc-nettools ${S}/.pc
> -- 
> 1.8.4.2
> 
> 
>