From patchwork Mon Oct 21 08:16:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 21195 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7289120356 for ; Mon, 21 Oct 2013 08:17:05 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id c14sf15646178vea.2 for ; Mon, 21 Oct 2013 01:17:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=0v69aJPd5nNJ02Gl37wW54+terCjBYGWQdxIHUwr/Qc=; b=bsr5AoWaEAPUjPH1PiBjuEITEgPL7UF8MtBufEL+7LYCOjwbR1XsGMsYSYKAVSeg30 V4DcqCLFGKnPfQLK4ZBItL0aTOXVaRD+TCWSHXh9mo1uWaBVNAcgjNgDzsSjQ0DvzOQ3 W+aYy9AQU1sDhKvElam2VSV5USNLOoL/CzkgxjcGAgd9NrQGH1NNETaTq7DW+811bN3i sr1h1B1UyfPqOdlESTiL1Ut42h9/f5c3aqVYdBCNvUld1sKQueCjBA3TB0QchUYht/47 fm1xxgWptjABOJIa8ZnDujZ9gPB4XVTmuaTTHnOV1cLtiEzeF46/BknsEgCA5V7KANa1 QU7g== X-Received: by 10.236.101.103 with SMTP id a67mr13782292yhg.25.1382343424518; Mon, 21 Oct 2013 01:17:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.20 with SMTP id u20ls2019928qeb.92.gmail; Mon, 21 Oct 2013 01:17:04 -0700 (PDT) X-Received: by 10.52.98.99 with SMTP id eh3mr240723vdb.29.1382343424408; Mon, 21 Oct 2013 01:17:04 -0700 (PDT) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id m3si4261612vcl.144.2013.10.21.01.17.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Oct 2013 01:17:04 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id g10so1476168vbg.16 for ; Mon, 21 Oct 2013 01:17:04 -0700 (PDT) X-Gm-Message-State: ALoCoQnwPc3gD4tmAqf2LQTllYS/WqkAfXixjGOd7KZdZ2J1YxXN+nts4kDpxrGxoJttziyRiVSj X-Received: by 10.58.232.228 with SMTP id tr4mr290270vec.34.1382343424005; Mon, 21 Oct 2013 01:17:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp134015vcz; Mon, 21 Oct 2013 01:17:03 -0700 (PDT) X-Received: by 10.194.192.131 with SMTP id hg3mr405853wjc.78.1382343422716; Mon, 21 Oct 2013 01:17:02 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id jo9si4159949wjc.114.2013.10.21.01.17.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 21 Oct 2013 01:17:02 -0700 (PDT) Received-SPF: neutral (google.com: 92.243.29.197 is neither permitted nor denied by best guess record for domain of riku.voipio@linaro.org) client-ip=92.243.29.197; Received: from localhost.localdomain (91-157-208-114.elisa-laajakaista.fi [91.157.208.114]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id CC18626551; Mon, 21 Oct 2013 10:17:00 +0200 (CEST) From: Riku Voipio To: openembedded-core@lists.openembedded.org Cc: patches@linaro.org, Riku Voipio Subject: [PATCH 1/3] ltp: cleanup recipe Date: Mon, 21 Oct 2013 11:16:53 +0300 Message-Id: <1382343415-30035-1-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Cleanups for ltp: 1. Instead of using giturl like in Anders's patch use the sourceforge mirror URL. 2. remove to the manual unpack rule and just set S variable to source directory. 3. Follow the OE style guide for variable order. --- meta/recipes-extended/ltp/ltp_20130904.bb | 50 +++++++++++++------------------ 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb index 5e10448..43fe780 100644 --- a/meta/recipes-extended/ltp/ltp_20130904.bb +++ b/meta/recipes-extended/ltp/ltp_20130904.bb @@ -21,44 +21,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS = "attr libaio libcap acl openssl" -SRC_URI = "git://github.com/linux-test-project/ltp.git" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/ltp/LTP%20Source/ltp-${PV}/ltp-full-${PV}.tar.bz2 \ + " -SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "0cf2ccb7199f8318d413c62a085629f0" +SRC_URI[sha256sum] = "662c3661a4d1bfbf3187d0835f35e613b43eedc35a840e3283e378a19606ee0b" export prefix = "/opt/ltp" export exec_prefix = "/opt/ltp" inherit autotools -RDEPENDS_${PN} = "perl e2fsprogs-mke2fs" - -FILES_${PN}-dbg += "/opt/ltp/runtest/.debug" -FILES_${PN}-dbg += "/opt/ltp/testcases/bin/.debug" -FILES_${PN}-dbg += "/opt/ltp/testcases/bin/*/bin/.debug" -FILES_${PN}-dbg += "/opt/ltp/testcases/bin/*/test/.debug" -FILES_${PN}-dbg += "/opt/ltp/scenario_groups/.debug" -FILES_${PN}-dbg += "/opt/ltp/testscripts/.debug" -FILES_${PN}-dbg += "/opt/ltp/testscripts/open_posix_testsuite/.debug" - -FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a" - -FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*" +S = "${WORKDIR}/ltp-full-${PV}" TARGET_CC_ARCH += "${LDFLAGS}" -do_unpack_append() { - bb.build.exec_func('do_extract_tarball', d) -} - -do_extract_tarball() { - if test -f ${WORKDIR}/ltp-full-${PV} ; then - tar x --no-same-owner -f ${WORKDIR}/ltp-full-${PV} -C ${WORKDIR} - rm -rf ${WORKDIR}/ltp-${PV} - mv ${WORKDIR}/ltp-full-${PV} ${WORKDIR}/ltp-${PV} - fi -} - do_install(){ install -d ${D}/opt/ltp/ oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install @@ -66,10 +43,25 @@ do_install(){ # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases - # We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in poky + # We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in oe-core # We will add expect for enhancement in future find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f } +FILES_${PN}-dbg += "/opt/ltp/runtest/.debug \ + /opt/ltp/testcases/bin/.debug \ + /opt/ltp/testcases/bin/*/bin/.debug \ + /opt/ltp/testcases/bin/*/test/.debug \ + /opt/ltp/scenario_groups/.debug \ + /opt/ltp/testscripts/.debug \ + /opt/ltp/testscripts/open_posix_testsuite/.debug \ + " + +FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a" + +FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*" + +RDEPENDS_${PN} = "perl e2fsprogs-mke2fs" + # Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails INHIBIT_PACKAGE_STRIP = "1"