mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-01-12 03:10:13 +00:00
Code Issues Projects Releases Wiki Activity

samhain: Avoid empty source archiver

Browse Source 
It is better to put necessary work into do_patch task than add a new task.
Otherwise,you can not get correct source code in some functions(such as archiver.bbclass).

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
This commit is contained in:
Lei Maohui
2016-05-17 13:30:39 -07:00
committed by Armin Kuster
parent 2a1f79040b
commit e5ef0f1582
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-security/samhain/samhain.inc
View File

@@ -25,17 +25,14 @@ INITSCRIPT_PARAMS ?= "defaults"
PACKAGECONFIG ??= ""
# We have to unpack the tar ball twice to get to the source.
# Also as soon as OE gets the tar ball it unpacks and
# proceeds to apply the patches. But what you still have after
# the first unpack is another tar ball. So we do a do_unpack_extra()
# and tell OE to do the second unpack before do_patch(), otherwise
# do_patch() will fail when trying to apply the patches.
do_unpack_extra () {
cd ${WORKDIR}
tar -xzvf samhain-${PV}.tar.gz
do_unpack_samhain() {
cd ${WORKDIR}
tar -xzvf samhain-${PV}.tar.gz
}
python do_unpack_append() {
bb.build.exec_func('do_unpack_samhain', d)
}
addtask unpack_extra after do_unpack before do_patch
do_configure_prepend_arm() {
export sh_cv___va_copy=yes