Patchwork [CONSOLIDATED,PULL,14/18] webkit-gtk: remove spurious install_prepend hack

login
register
mail settings
Submitter Saul Wold
Date July 18, 2012, 7:42 a.m.
Message ID <0c170de4b028140df155b3e88230b81ad1a0eb86.1342597081.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/32389/
State New
Headers show

Comments

Saul Wold - July 18, 2012, 7:42 a.m.
From: Ross Burton <ross.burton@intel.com>

This "fix" causes an (ignored) error now, so at some point it was fixed.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
Martin Jansa - July 18, 2012, 1:54 p.m.
On Wed, Jul 18, 2012 at 12:42:43AM -0700, Saul Wold wrote:
> From: Ross Burton <ross.burton@intel.com>
> 
> This "fix" causes an (ignored) error now, so at some point it was fixed.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
> index 3cef0e4..180861e 100644
> --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
> +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
> @@ -78,10 +78,6 @@ do_configure_append() {
>  	done
>  }
>  
> -do_install_prepend() {
> -	cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
> -}
> -
>  do_install_append() {
>  	rmdir ${D}${libexecdir}
>  }

Both patches (or at least the 2nd) should have PR bump so that if this
change causes some issues it would be found asap, not with next upgrade
when nobody will remember that this was changed here..

But as webkit-gtk takes quite long to build I'm fine with it this time
(my second builder haven't upgraded webkit-gtk yet anyway..), so I'll
test it there.

Cheers,
Ross Burton - July 18, 2012, 2:03 p.m.
On 18 July 2012 14:54, Martin Jansa <martin.jansa@gmail.com> wrote:
> Both patches (or at least the 2nd) should have PR bump so that if this
> change causes some issues it would be found asap, not with next upgrade
> when nobody will remember that this was changed here..
>
> But as webkit-gtk takes quite long to build I'm fine with it this time
> (my second builder haven't upgraded webkit-gtk yet anyway..), so I'll
> test it there.

I've re-pushed my webkit branch with PR bumps.  After the parallel
build my machine rebuilds webkit in under half an hour, which I'm
positively pleased with.

Ross

Patch

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
index 3cef0e4..180861e 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
@@ -78,10 +78,6 @@  do_configure_append() {
 	done
 }
 
-do_install_prepend() {
-	cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
-}
-
 do_install_append() {
 	rmdir ${D}${libexecdir}
 }