diff options
author | Petter Mabäcker <petter@technux.se> | 2015-01-06 22:22:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:36:27 +0000 |
commit | 06a2dd73eaf4afaf1c28b8e24204cb85f5da0a1f (patch) | |
tree | 0a1e77d9c393ca3ba6f5db767b75fd54aa173a06 | |
parent | ed3ddd467ffc313aad467f1993200dddd6351c70 (diff) | |
download | poky-06a2dd73eaf4afaf1c28b8e24204cb85f5da0a1f.tar.gz |
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]
(From OE-Core rev: 3693b63c5d33a88591be818a942324954b12e076)
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/lsof/lsof_4.88.bb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/recipes-extended/lsof/lsof_4.88.bb b/meta/recipes-extended/lsof/lsof_4.88.bb index a96b06eae7..0e49f9217c 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" | |||
15 | LIC_FILES_CHKSUM = "file://${S}/00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" | 15 | LIC_FILES_CHKSUM = "file://${S}/00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" |
16 | 16 | ||
17 | python do_unpack () { | 17 | python do_unpack () { |
18 | # temporarily change S for unpack | ||
19 | # of lsof_${PV} | ||
20 | s = d.getVar('S') | ||
21 | d.setVar('S', '${WORKDIR}/lsof_${PV}') | ||
18 | bb.build.exec_func('base_do_unpack', d) | 22 | bb.build.exec_func('base_do_unpack', d) |
23 | # temporarily change SRC_URI for unpack | ||
24 | # of lsof_${PV}_src | ||
19 | src_uri = d.getVar('SRC_URI') | 25 | src_uri = d.getVar('SRC_URI') |
20 | d.setVar('SRC_URI', '${LOCALSRC}') | 26 | d.setVar('SRC_URI', '${LOCALSRC}') |
27 | d.setVar('S', s) | ||
21 | bb.build.exec_func('base_do_unpack', d) | 28 | bb.build.exec_func('base_do_unpack', d) |
22 | d.setVar('SRC_URI', src_uri) | 29 | d.setVar('SRC_URI', src_uri) |
23 | } | 30 | } |