[oe-commits] =?UTF-8?Q?Petter=20Mab=C3=A4cker=20?=: lsof: handle S in a proper way

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 3693b63c5d33a88591be818a942324954b12e076
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3693b63c5d33a88591be818a942324954b12e076

Author: Petter Mabäcker <petter at technux.se>
Date:   Tue Jan  6 22:22:21 2015 +0100

lsof: handle S in a proper way

Since lsof are doing two unpacks and S should be set to match
the second unpack of an internal archive, we should let the build
system know that we are aware of this.

Solve this by temporarily set S like lsof are doing with SRC_URI.

[YOCTO #5627]

Signed-off-by: Petter Mabäcker <petter at technux.se>

---

 meta/recipes-extended/lsof/lsof_4.88.bb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meta/recipes-extended/lsof/lsof_4.88.bb b/meta/recipes-extended/lsof/lsof_4.88.bb
index a96b06e..0e49f92 100644
--- a/meta/recipes-extended/lsof/lsof_4.88.bb
+++ b/meta/recipes-extended/lsof/lsof_4.88.bb
@@ -15,9 +15,16 @@ S = "${WORKDIR}/lsof_${PV}_src"
 LIC_FILES_CHKSUM = "file://${S}/00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a"
 
 python do_unpack () {
+    # temporarily change S for unpack
+    # of lsof_${PV}
+    s = d.getVar('S')
+    d.setVar('S', '${WORKDIR}/lsof_${PV}')
     bb.build.exec_func('base_do_unpack', d)
+    # temporarily change SRC_URI for unpack
+    # of lsof_${PV}_src
     src_uri = d.getVar('SRC_URI')
     d.setVar('SRC_URI', '${LOCALSRC}')
+    d.setVar('S', s)
     bb.build.exec_func('base_do_unpack', d)
     d.setVar('SRC_URI', src_uri)
 }