From patchwork Tue Jul 3 09:20:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 140921 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp944617ljj; Tue, 3 Jul 2018 02:43:53 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJstf+1RCHZzT9qjoGLpv7KjI4a+O62rfTOEcN3nMAk6JMcpM+qIC7kPIGXiCtJNn4RwYY+ X-Received: by 2002:a63:a502:: with SMTP id n2-v6mr25328586pgf.263.1530611033019; Tue, 03 Jul 2018 02:43:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530611033; cv=none; d=google.com; s=arc-20160816; b=xHMgzDwbe3QAIlMnsFPQzZuGKvotgBINWxDET8JwoX47jrxxMx5DWdD4D2mLaae8BQ uHZDxCxZQg8f5Klt2Nne5bUPDw7YdqSBBpCLUEi6hqcmOkDIituVnDdSuvbttH53joqW kC7F9hyXyd6qPubgG674EXJJ4J172X9SGumMLtEimPclh5TRORoMFmfM8qwDrx0gvFYE /7xSmpYrOp8AQ8ptaLzsjzZSbuXxKk92+QQskeM1ydLhGDFm0QififlMCWNl5tFDdwsx SBSdVYFdukA9hC0uXdlPhSeF6/vUI3YYa+Ow190OP3AjyjdkH5f+6EuVz4zkQfpAs5u5 DgZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=KGRg6ezEQLJxL25903G7edrDcaDrOkIsr41RLp4euuk=; b=APMGmwbbgxyD1Q9kaETim76Ny22+8mel04aMJjQnr5I3jE9sI3AaphHFcS84gvtli9 vWmrD3orW7ONbu0vvHOEmdmoVjlx3wtBQuepYz2TxFl9GueZRJoxcQegF8eFh/xpISUW cUSEg7lty0WJ7Kni//rdICwWLYTGs2yhD6iZTnJ0eMzgQi/6d9OOkU36EnRCxQjsHA+o 8wJpOSzOEMexlRcGbpW2/n3IqHcEliE90Oe2pBpSqFCHGhi2S4McldwxmmSR/uEIPJM4 wI3xjpj5HJSjJYA7b4iWHby9hYKZjLKChnGVqX3hU9t3fpPQyWP/7a/64lqd8gpt2/uR C6IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=q9W1ZYtH; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id i20-v6si667684pgb.547.2018.07.03.02.43.52; Tue, 03 Jul 2018 02:43:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=q9W1ZYtH; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 010B478A30; Tue, 3 Jul 2018 09:43:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by mail.openembedded.org (Postfix) with ESMTP id 526AF7754B for ; Tue, 3 Jul 2018 09:20:26 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id z13-v6so1457410wma.5 for ; Tue, 03 Jul 2018 02:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=KayEzWfAAkIR0EGHaeRWtyUhH08rIIg6npcAXCMkqHo=; b=q9W1ZYtH1rdqVnQBXuuK2CtY9zNarms/NtqMZbCb8q0jJEYKrX0Fs8CK+l8k0LHJfX qB4lT3ptLfj9jHNSCvmBxxHZ9es6cdg7es9ejYspGVcj1DPOvBxSgHHqshur/k6cgGpL tftUe8dpkImzRe3Z5ckPx+JfrdVvmDSMWgEE5Dn7C0Xu2F7WlQEeWlJYiv+J9MBzCnNB Tkw3LP/yAZhxXbpGLhHe0beyz0rGsJTnvRQ5XIppSuzeValHpvOtflL71wFoNmQSxS9/ 1lD2fRs+raNAsA/pdRkcAAilNU1BWqT99KnG/ONC4LC0jjsuLPwQ84anFe/zXoNhKP8F HaSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=KayEzWfAAkIR0EGHaeRWtyUhH08rIIg6npcAXCMkqHo=; b=c0qZQM3jknnupRUh0doEOiHmd28alNjjcJDZZzCpPcGVvskXQsa5Ye9Yhqej7QssOR P8XkxBTHMkmyYlDf6myMPRIlYO+vcMGy1/qA1qkZYcfCtnRFWBUs2xQT1ll2F5iUQ5Ok iivFTljl8KnuKhyQ8kW28rFc4UCJo73s6u0ay9H7538qBXxZhXeOeAKqmZRum+WJXD6U VgRYlLMoPlvVt+fW+Ru26YznkFTp7y/HlMZMjHVqLKd5u8sX8hKwvu7vl/GQmXQxdDLd V8y0dsAHpLdDSdnoYnQDfw5t3iqzW8nq0IDd9BC8IcTQ2krJtthceIX6gTNyKIH0izwE 6tjw== X-Gm-Message-State: APt69E3a3h3oofANr2iqFEgWOmLdVUaKbYrgUABJhDzeDtonN6IulNY9 xqt6VLhMzqg7VtGPoJVoiTZcGl9F X-Received: by 2002:a1c:c8:: with SMTP id 191-v6mr9949110wma.115.1530609626694; Tue, 03 Jul 2018 02:20:26 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id g75-v6sm1041872wmd.38.2018.07.03.02.20.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 02:20:25 -0700 (PDT) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Tue, 3 Jul 2018 10:20:18 +0100 Message-Id: <20180703092018.5018-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180703092018.5018-1-ross.burton@intel.com> References: <20180703092018.5018-1-ross.burton@intel.com> Subject: [oe] [PATCH 4/4] p7zip: simplify recipe X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org The plugin-based 7z binary is mostly useless because it can't find the libraries. Simply just install 7za, and install a compatibility symlink for 7z. Signed-off-by: Ross Burton --- meta-oe/recipes-extended/p7zip/p7zip_16.02.bb | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index d986da9043..13479a90fe 100644 --- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -17,26 +17,9 @@ SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6 S = "${WORKDIR}/${BPN}_${PV}" do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/bin/* ${D}${bindir} -} - -# all3: to build bin/7za, bin/7z (with its plugins), bin/7zr and bin/7zCon.sfx -EXTRA_OEMAKE_class-native = "all3" - -do_install_class-native() { - install -d ${D}${bindir} - install -d ${D}${bindir}/Codecs - install -m 0755 ${S}/bin/7* ${D}${bindir} - install -m 0755 ${S}/bin/Codecs/* ${D}${bindir}/Codecs - - # Create a shell script wrapper to execute next to 7z.so - mv ${D}${bindir}/7z ${D}${bindir}/7z.bin - cat > ${D}${bindir}/7z << 'EOF' -#!/bin/sh -exec "$(dirname "$0")"/7z.bin "$@" -EOF - chmod 0755 ${D}${bindir}/7z + install -d ${D}${bindir} + install -m 0755 ${S}/bin/* ${D}${bindir} + ln -s 7za ${D}${bindir}/7z } BBCLASSEXTEND = "native"