* [PATCH] libxslt: don't replace COPYING with symlink to Copyright
@ 2011-11-01 23:37 Martin Jansa
2011-11-02 0:23 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2011-11-01 23:37 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../dont.replace.COPYING.with.symlink.patch | 27 ++++++++++++++++++++
meta/recipes-support/libxslt/libxslt_1.1.26.bb | 3 +-
2 files changed, 29 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
diff --git a/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch b/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
new file mode 100644
index 0000000..a38b686
--- /dev/null
+++ b/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
@@ -0,0 +1,27 @@
+When it's replaced with symlink to Copyright, then we end with link to nonexistent file like this:
+
+OE om-gta02@shr ~/shr-core $ ll tmp/deploy/licenses/libxslt/
+total 40
+drwxr-xr-x 2 bitbake bitbake 4096 Nov 2 00:27 ./
+drwxr-xr-x 818 bitbake bitbake 32768 Nov 2 00:27 ../
+lrwxrwxrwx 1 bitbake bitbake 9 Nov 2 00:27 COPYING -> Copyright
+lrwxrwxrwx 1 bitbake bitbake 52 Nov 2 00:27 generic_MIT -> /OE/shr-core/tmp/deploy/licenses/common-licenses/MIT
+
+Upstream-Status: Pending
+
+diff -uNr libxslt-1.1.26.orig/configure.in libxslt-1.1.26/configure.in
+--- libxslt-1.1.26.orig/configure.in 2009-09-24 16:27:30.000000000 +0200
++++ libxslt-1.1.26/configure.in 2011-11-02 00:30:47.651452392 +0100
+@@ -671,12 +671,6 @@
+ RELDATE=`date +'%a %b %e %Y'`
+ AC_SUBST(RELDATE)
+
+-( cd $srcdir
+-rm -f COPYING.LIB COPYING
+-$LN_S Copyright COPYING
+-)
+-
+-
+ AC_OUTPUT([
+ Makefile
+ libxslt.pc
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index 96bffc6..4dd6b55 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
SECTION = "libs"
DEPENDS = "libxml2"
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
+ file://dont.replace.COPYING.with.symlink.patch \
file://pkgconfig_fix.patch"
SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
--
1.7.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] libxslt: don't replace COPYING with symlink to Copyright
2011-11-01 23:37 [PATCH] libxslt: don't replace COPYING with symlink to Copyright Martin Jansa
@ 2011-11-02 0:23 ` Saul Wold
2011-11-02 7:42 ` [PATCH] libxslt: use Copyright in LIC_FILES_CHKSUM instead of COPYING Martin Jansa
0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2011-11-02 0:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On 11/01/2011 04:37 PM, Martin Jansa wrote:
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> .../dont.replace.COPYING.with.symlink.patch | 27 ++++++++++++++++++++
> meta/recipes-support/libxslt/libxslt_1.1.26.bb | 3 +-
> 2 files changed, 29 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
>
> diff --git a/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch b/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
> new file mode 100644
> index 0000000..a38b686
> --- /dev/null
> +++ b/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
> @@ -0,0 +1,27 @@
> +When it's replaced with symlink to Copyright, then we end with link to nonexistent file like this:
> +
> +OE om-gta02@shr ~/shr-core $ ll tmp/deploy/licenses/libxslt/
> +total 40
> +drwxr-xr-x 2 bitbake bitbake 4096 Nov 2 00:27 ./
> +drwxr-xr-x 818 bitbake bitbake 32768 Nov 2 00:27 ../
> +lrwxrwxrwx 1 bitbake bitbake 9 Nov 2 00:27 COPYING -> Copyright
> +lrwxrwxrwx 1 bitbake bitbake 52 Nov 2 00:27 generic_MIT -> /OE/shr-core/tmp/deploy/licenses/common-licenses/MIT
> +
> +Upstream-Status: Pending
> +
No Signed-off-by: in the patch itself.
Thanks
Sau!
> +diff -uNr libxslt-1.1.26.orig/configure.in libxslt-1.1.26/configure.in
> +--- libxslt-1.1.26.orig/configure.in 2009-09-24 16:27:30.000000000 +0200
> ++++ libxslt-1.1.26/configure.in 2011-11-02 00:30:47.651452392 +0100
> +@@ -671,12 +671,6 @@
> + RELDATE=`date +'%a %b %e %Y'`
> + AC_SUBST(RELDATE)
> +
> +-( cd $srcdir
> +-rm -f COPYING.LIB COPYING
> +-$LN_S Copyright COPYING
> +-)
> +-
> +-
> + AC_OUTPUT([
> + Makefile
> + libxslt.pc
> diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> index 96bffc6..4dd6b55 100644
> --- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> +++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
>
> SECTION = "libs"
> DEPENDS = "libxml2"
> -PR = "r3"
> +PR = "r4"
>
> SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
> + file://dont.replace.COPYING.with.symlink.patch \
> file://pkgconfig_fix.patch"
>
> SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] libxslt: use Copyright in LIC_FILES_CHKSUM instead of COPYING
2011-11-02 0:23 ` Saul Wold
@ 2011-11-02 7:42 ` Martin Jansa
2011-11-02 8:23 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2011-11-02 7:42 UTC (permalink / raw)
To: openembedded-core
* COPYING is replaced by symlink to Copyright during do_configure
(see configure.in), then we end with link to nonexistent file like this:
OE om-gta02@shr ~/shr-core $ ll tmp/deploy/licenses/libxslt/
total 40
drwxr-xr-x 2 bitbake bitbake 4096 Nov 2 00:27 ./
drwxr-xr-x 818 bitbake bitbake 32768 Nov 2 00:27 ../
lrwxrwxrwx 1 bitbake bitbake 9 Nov 2 00:27 COPYING -> Copyright
lrwxrwxrwx 1 bitbake bitbake 52 Nov 2 00:27 generic_MIT -> /OE/shr-core/tmp/deploy/licenses/common-licenses/MIT
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-support/libxslt/libxslt_1.1.26.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index 96bffc6..addc863 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
@@ -3,11 +3,11 @@ HOMEPAGE = "http://xmlsoft.org/XSLT/"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
+LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458"
SECTION = "libs"
DEPENDS = "libxml2"
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
file://pkgconfig_fix.patch"
--
1.7.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-02 8:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-01 23:37 [PATCH] libxslt: don't replace COPYING with symlink to Copyright Martin Jansa
2011-11-02 0:23 ` Saul Wold
2011-11-02 7:42 ` [PATCH] libxslt: use Copyright in LIC_FILES_CHKSUM instead of COPYING Martin Jansa
2011-11-02 8:23 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox