diff options
| author |   Lei Maohui <leimaohui@cn.fujitsu.com> | 2016-05-17 13:30:39 -0700 |
|---|---|---|
| committer |   Armin Kuster <akuster@mvista.com> | 2016-06-26 11:50:57 -0700 |
| commit | 05e71050f0602805533052d34a7f6bc2235de585 (patch) | |
| tree | c18905524c73843d55ca60fffd50b01cee3f51c7 | |
| parent | d1e8ef4b294672813e142734c0c31377a43fe532 (diff) | |
| download | meta-security-05e71050f0602805533052d34a7f6bc2235de585.tar.gz meta-security-05e71050f0602805533052d34a7f6bc2235de585.tar.bz2 meta-security-05e71050f0602805533052d34a7f6bc2235de585.zip | |
samhain: Avoid empty source archiver
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>
| -rw-r--r-- | recipes-security/samhain/samhain.inc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc index 23bc8f5..5c0142b 100644 --- a/recipes-security/samhain/samhain.inc +++ b/recipes-security/samhain/samhain.inc @@ -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 |