All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] net-tools_1.60-26.bb: Error fix
@ 2016-01-12  5:02 Li Xin
  2016-01-12  8:49 ` Khem Raj
  2016-01-12 11:32 ` Richard Purdie
  0 siblings, 2 replies; 6+ messages in thread
From: Li Xin @ 2016-01-12  5:02 UTC (permalink / raw)
  To: openembedded-core

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@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"
 
 # 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





^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] net-tools_1.60-26.bb: Error fix
  2016-01-12  5:02 [PATCH] net-tools_1.60-26.bb: Error fix Li Xin
@ 2016-01-12  8:49 ` Khem Raj
  2016-01-12 11:32 ` Richard Purdie
  1 sibling, 0 replies; 6+ messages in thread
From: Khem Raj @ 2016-01-12  8:49 UTC (permalink / raw)
  To: Li Xin; +Cc: Patches and discussions about the oe-core layer

On Mon, Jan 11, 2016 at 9:02 PM, Li Xin <lixin.fnst@cn.fujitsu.com> 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@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"
>
>  # 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

Can you see if this change is sstate safe ?

>         if [ -d ${S}/.pc-nettools ]; then
>                 rm -rf ${S}/.pc
>                 mv ${S}/.pc-nettools ${S}/.pc
> --
> 1.8.4.2
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] net-tools_1.60-26.bb: Error fix
  2016-01-12  5:02 [PATCH] net-tools_1.60-26.bb: Error fix Li Xin
  2016-01-12  8:49 ` Khem Raj
@ 2016-01-12 11:32 ` Richard Purdie
  2016-01-13  1:05   ` [PATCH v2] " Li Xin
  1 sibling, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2016-01-12 11:32 UTC (permalink / raw)
  To: Li Xin, openembedded-core

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@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
> 
> 
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH v2] net-tools_1.60-26.bb: Error fix
  2016-01-12 11:32 ` Richard Purdie
@ 2016-01-13  1:05   ` Li Xin
  2016-01-13 13:10     ` Burton, Ross
  0 siblings, 1 reply; 6+ messages in thread
From: Li Xin @ 2016-01-13  1:05 UTC (permalink / raw)
  To: openembedded-core

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@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..cf820db 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
@@ -31,6 +31,7 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/net-tools/"
 
 inherit gettext
 
+do_patch[depends] = "quilt-native:do_populate_sysroot"
 # 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





^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH v2] net-tools_1.60-26.bb: Error fix
  2016-01-13  1:05   ` [PATCH v2] " Li Xin
@ 2016-01-13 13:10     ` Burton, Ross
  2016-01-15  1:25       ` [PATCH v3] " Li Xin
  0 siblings, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2016-01-13 13:10 UTC (permalink / raw)
  To: Li Xin; +Cc: OE-core

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

On 13 January 2016 at 01:05, Li Xin <lixin.fnst@cn.fujitsu.com> wrote:

> -       quilt pop -a || true
> +       ${STAGING_BINDIR_NATIVE}/quilt pop -a || true
>

Isn't this in PATH already?

Ross

[-- Attachment #2: Type: text/html, Size: 594 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH v3] net-tools_1.60-26.bb: Error fix
  2016-01-13 13:10     ` Burton, Ross
@ 2016-01-15  1:25       ` Li Xin
  0 siblings, 0 replies; 6+ messages in thread
From: Li Xin @ 2016-01-15  1:25 UTC (permalink / raw)
  To: openembedded-core

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@cn.fujitsu.com>
---
 meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 1 +
 1 file changed, 1 insertion(+)

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..632aee7 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
@@ -31,6 +31,7 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/net-tools/"
 
 inherit gettext
 
+do_patch[depends] = "quilt-native:do_populate_sysroot"
 # The Makefile is lame, no parallel build
 PARALLEL_MAKE = ""
 
-- 
1.8.4.2





^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-15  1:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-12  5:02 [PATCH] net-tools_1.60-26.bb: Error fix Li Xin
2016-01-12  8:49 ` Khem Raj
2016-01-12 11:32 ` Richard Purdie
2016-01-13  1:05   ` [PATCH v2] " Li Xin
2016-01-13 13:10     ` Burton, Ross
2016-01-15  1:25       ` [PATCH v3] " Li Xin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.