]> code.ossystems Code Review - openembedded-core.git/commitdiff
lsof: handle S in a proper way
authorPetter Mabäcker <petter@technux.se>
Tue, 6 Jan 2015 21:22:21 +0000 (22:22 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 23 Jan 2015 11:35:25 +0000 (11:35 +0000)
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@technux.se>
meta/recipes-extended/lsof/lsof_4.88.bb

index a96b06eae714ccb4a650e178c59c45e43706d0de..0e49f9217c1c985414e9b47c69e67bc769874767 100644 (file)
@@ -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)
 }