[PATCH] lsof_4.83.bb: Make recipe buildable again.

[PATCH] lsof_4.83.bb: Make recipe buildable again.

[Graham Gower]

Breakage introduced by 74e32f114272668dfa4c88805741cf55ef965989.
Other recipes which call base_do_unpack directly do not share this issue.

Signed-off-by: Graham Gower <graham.gower@gmail.com>
---
 recipes/lsof/lsof_4.83.bb |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/recipes/lsof/lsof_4.83.bb b/recipes/lsof/lsof_4.83.bb
index d74c574..0a5d557 100644
--- a/recipes/lsof/lsof_4.83.bb
+++ b/recipes/lsof/lsof_4.83.bb
@@ -9,17 +9,14 @@ SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2;nam
 SRC_URI[lsof483tarbz2.md5sum] = "8f731a6251b8c0143d585df0d5ca779e"
 SRC_URI[lsof483tarbz2.sha256sum] = "b89f930bbe36b970e3cd070b9860ee701d8c7285ffedf2fbcec0e5fa3cb1f544"
 
-LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
+LOCALSRC = "${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
 S = "${WORKDIR}/lsof_${PV}_src"
 
-# the tar.bz2 file contains another tar, cde below unpacks it
-python do_unpack () {
-	bb.build.exec_func('base_do_unpack', d)
-	src_uri = bb.data.getVar('SRC_URI', d)
-	bb.data.setVar('SRC_URI', '${LOCALSRC}', d)
-	bb.build.exec_func('base_do_unpack', d)
-	bb.data.setVar('SRC_URI', src_uri, d)
+# The tar.bz2 file contains another tar.
+do_unpackpost() {
+	tar x --no-same-owner -f ${LOCALSRC} -C ${WORKDIR}
 }
+addtask do_unpackpost before do_patch after do_unpack
 
 export LSOF_OS = "${TARGET_OS}"
 LSOF_OS_linux-uclibc = "linux"
-- 
1.7.1

Re: [PATCH] lsof_4.83.bb: Make recipe buildable again.

[Stefan Schmidt]

Hello.

On Fri, 2010-07-16 at 09:37, Graham Gower wrote:
> Breakage introduced by 74e32f114272668dfa4c88805741cf55ef965989.
> Other recipes which call base_do_unpack directly do not share this issue.
> 
> Signed-off-by: Graham Gower <graham.gower@gmail.com>

Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>

I just run into the same issue and this fixes it for me. Will check this in.

regards
Stefan Schmidt

Re: [PATCH] lsof_4.83.bb: Make recipe buildable again.

[Stanislav Brabec]

Stefan Schmidt wrote:
> Hello.
> 
> On Fri, 2010-07-16 at 09:37, Graham Gower wrote:
> > Breakage introduced by 74e32f114272668dfa4c88805741cf55ef965989.
> > Other recipes which call base_do_unpack directly do not share this issue.
> > 
> > Signed-off-by: Graham Gower <graham.gower@gmail.com>
> 
> Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
> 
> I just run into the same issue and this fixes it for me. Will check this in.

Does not work here. This change fixes it:

diff --git a/recipes/lsof/lsof_4.83.bb b/recipes/lsof/lsof_4.83.bb
index 0a5d557..8982a2c 100644
--- a/recipes/lsof/lsof_4.83.bb
+++ b/recipes/lsof/lsof_4.83.bb
@@ -3,7 +3,7 @@ Its name stands for LiSt Open Files, and it does just that."
 SECTION = "devel"
 LICENSE = "BSD"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2;name=lsof483tarbz2"
 SRC_URI[lsof483tarbz2.md5sum] = "8f731a6251b8c0143d585df0d5ca779e"
@@ -16,7 +16,7 @@ S = "${WORKDIR}/lsof_${PV}_src"
 do_unpackpost() {
 	tar x --no-same-owner -f ${LOCALSRC} -C ${WORKDIR}
 }
-addtask do_unpackpost before do_patch after do_unpack
+addtask unpackpost before do_patch after do_unpack
 
 export LSOF_OS = "${TARGET_OS}"
 LSOF_OS_linux-uclibc = "linux"


-- 

________________________________________________________________________
Stanislav Brabec
http://www.penguin.cz/~utx/zaurus

Re: [PATCH] lsof_4.83.bb: Make recipe buildable again.

[Stefan Schmidt]

Hello.

On Sun, 2010-07-18 at 16:19, Stanislav Brabec wrote:
> Stefan Schmidt wrote:
> > 
> > On Fri, 2010-07-16 at 09:37, Graham Gower wrote:
> > > Breakage introduced by 74e32f114272668dfa4c88805741cf55ef965989.
> > > Other recipes which call base_do_unpack directly do not share this issue.
> > > 
> > > Signed-off-by: Graham Gower <graham.gower@gmail.com>
> > 
> > Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
> > 
> > I just run into the same issue and this fixes it for me. Will check this in.
> 
> Does not work here. This change fixes it:

And you are right here. I wonder why it worked for me when I tested it. It fails
now again and your patch fixes it.

Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>

Will you commit this yourself?

regards
Stefan Schmidt