Patchwork strace: Don't package strace-graph

login
register
mail settings
Submitter Phil Blundell
Date Sept. 26, 2012, 10:18 a.m.
Message ID <1348654710.31293.93.camel@phil-desktop>
Download mbox | patch
Permalink /patch/37255/
State Accepted
Commit 2e887af1c81f9b373684180f61a7c25163ed0e2c
Headers show

Comments

Phil Blundell - Sept. 26, 2012, 10:18 a.m.
Commit 9c9ea24b115a9bb87df1323b5f185ce426262aec made strace depend on perl because the
strace-graph script needs it.  However, this cost of the dependency is large (building
all of perl) and the value of the script is marginal.  Let's just delete the script
instead and remove the dependency again.

If anybody wants strace-graph then it should be packaged in its own recipe and that one
can be made to depend on perl without disrupting the main strace package.

Signed-off-by: Phil Blundell <pb@pbcl.net>
---
 meta/recipes-devtools/strace/strace_4.7.bb |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
Saul Wold - Oct. 18, 2012, 8:03 p.m.
On 09/26/2012 03:18 AM, Phil Blundell wrote:
> Commit 9c9ea24b115a9bb87df1323b5f185ce426262aec made strace depend on perl because the
> strace-graph script needs it.  However, this cost of the dependency is large (building
> all of perl) and the value of the script is marginal.  Let's just delete the script
> instead and remove the dependency again.
>
> If anybody wants strace-graph then it should be packaged in its own recipe and that one
> can be made to depend on perl without disrupting the main strace package.
>
> Signed-off-by: Phil Blundell <pb@pbcl.net>
> ---
>   meta/recipes-devtools/strace/strace_4.7.bb |   11 ++++++-----
>   1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-devtools/strace/strace_4.7.bb b/meta/recipes-devtools/strace/strace_4.7.bb
> index 21dd47a..e1a5e82 100644
> --- a/meta/recipes-devtools/strace/strace_4.7.bb
> +++ b/meta/recipes-devtools/strace/strace_4.7.bb
> @@ -3,11 +3,7 @@ HOMEPAGE = "http://strace.sourceforge.net"
>   SECTION = "console/utils"
>   LICENSE = "BSD"
>   LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=124500c21e856f0912df29295ba104c7"
> -PR = "r1"
> -
> -PACKAGES =+ "${PN}-graph "
> -FILES_${PN}-graph = "${bindir}/strace-graph"
> -RDEPENDS_${PN}-graph = "perl"
> +PR = "r2"
>
>   SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
>              file://strace-eglibc-2.16.patch \
> @@ -20,4 +16,9 @@ inherit autotools
>
>   export INCLUDES = "-I. -I./linux"
>
> +do_install_append() {
> +	# We don't ship strace-graph here because it needs perl
> +	rm ${D}${bindir}/strace-graph
> +}
> +
>   BBCLASSEXTEND = "native"
>
Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-devtools/strace/strace_4.7.bb b/meta/recipes-devtools/strace/strace_4.7.bb
index 21dd47a..e1a5e82 100644
--- a/meta/recipes-devtools/strace/strace_4.7.bb
+++ b/meta/recipes-devtools/strace/strace_4.7.bb
@@ -3,11 +3,7 @@  HOMEPAGE = "http://strace.sourceforge.net"
 SECTION = "console/utils"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=124500c21e856f0912df29295ba104c7"
-PR = "r1"
-
-PACKAGES =+ "${PN}-graph "
-FILES_${PN}-graph = "${bindir}/strace-graph"
-RDEPENDS_${PN}-graph = "perl"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
            file://strace-eglibc-2.16.patch \
@@ -20,4 +16,9 @@  inherit autotools
 
 export INCLUDES = "-I. -I./linux"
 
+do_install_append() {
+	# We don't ship strace-graph here because it needs perl
+	rm ${D}${bindir}/strace-graph
+}
+
 BBCLASSEXTEND = "native"