From 05e71050f0602805533052d34a7f6bc2235de585 Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Tue, 17 May 2016 13:30:39 -0700 Subject: 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 Signed-off-by: Armin Kuster Signed-off-by: Armin Kuster --- recipes-security/samhain/samhain.inc | 17 +++++++---------- 1 file 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 -- cgit v1.2.3-13-gbd6f