From patchwork Wed Oct 17 16:50:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 149077 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp894774lji; Wed, 17 Oct 2018 09:50:17 -0700 (PDT) X-Google-Smtp-Source: ACcGV62fVKEGk73GDYXhl2qBtIg+jxO2FUMyjMEqlyJ/C40l5Aa5EDnodiWyqSzF2bFQDYij5tgH X-Received: by 2002:a17:902:9a04:: with SMTP id v4-v6mr26239637plp.247.1539795017244; Wed, 17 Oct 2018 09:50:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539795017; cv=none; d=google.com; s=arc-20160816; b=crbbj+MNjgbQy+ZjWjUR14NrxjR9MI6drZFTNvtGEKF6LxAgDOlz48Qageww2cUnpv IfDIe9K8jX3eOmOXHR3QpMQEUDcEz2CpSNF6KXm5uMHiHhj+fMqBW6XhLpTkd+iO+nZn frjWtCXbY2tH02C6+BpRKwXzm/A/g2MD+IJbM2WEf5QW3eDl5Fw13wlg+/x47J0FWudH +N2FUCRMTSWFPnvRj/sgLgeXyIkBdJPN0+jAdVzPda8pK3dKUCSDlGHin1Z1cIEYCZTN kRJ2PUnRqZH5RDwbRb560r0kbLSVaIaxwZRRvmOr5z8j7lPBBfG0Kfd2PGrt+kZCAQzB w0qw== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=LOAnDFU/Z7y+v568cG1zC0dnRx3ekZYM4q0jOsdnGJk=; b=Yc1xft8NkrKeQpY40dXwdC2zQZ07Wgi2YoD/Kw7BjRYIpKFoET8XwbBQ0lpPhWj6JS Tf6h0ojGlXhxzZx/sam1pcS1gpueKgIa3KanO0lpTOU76QiHaB5J3SygUnlpi5YgOjCx RYXT17I1wt2T5gHsii/MtAY7QkOSbqPkeE1ncWJDLTDu5g8XxaZZhitZ6VSVadD9aBHe fMZjm5AMtEKOyXqirxfT/+nA4UdwyYVQd55fqfoF0COOv2rjn2h40amlpNA8U6AZ9vpV fuV/hwoz7/BJlcZ+dbe1NKez+Ggqb5r7n+xM9aauvF2exfo0x4JVB8Ifhgnz8vLzGVX0 3sug== 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=fhNSrqZt; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-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 v38-v6si18426501pgl.539.2018.10.17.09.50.16; Wed, 17 Oct 2018 09:50:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=fhNSrqZt; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D569C79B89; Wed, 17 Oct 2018 16:50:12 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 2E88579B2D for ; Wed, 17 Oct 2018 16:50:10 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y16so30501112wrw.3 for ; Wed, 17 Oct 2018 09:50:12 -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; bh=6ZSd9W7qojyJN+ep/SudWkEwrH3eWef7ZvLeYh40Zrs=; b=fhNSrqZtsgICzC6170tQoHiYMMQaCobSJwQy1PzyepSC0pvoGuZVski6tA7b3cIEVW FSAyVshxm6NUOJNlwWJTCK6EDnasFfeAwPKVa9owaUQ2jKGgYPVBKpBqEHQbhPhXKyLD bBvd4cDjNPKeTVUDbCDAUJX564IegPHqt7GytKWiSxKsbbLUrnzbEX2G/DQFQgMF2gKb NsxtzdUU+coSkK4RhIqUA5iUPDjx/x7o12XWfOapv1mPB5yrizdFihKSh+8t88hObM2z 07ng9LLNf6vg4b4l0rc6FZVzJ56Ud9q1uRyL9Km6ltBCSuqa/ct0le04aZ6AhqydKmMJ nhGA== 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; bh=6ZSd9W7qojyJN+ep/SudWkEwrH3eWef7ZvLeYh40Zrs=; b=FQBgXEZSTLBx2baXIJQENTTjbY+R1BgQOO1TvrJcJnd9OqOOjC4Lp1GzxLdnNY3PrM l0a/awNBHWHEtJDFlprT1XXTaPVO94sZVg2TPujbVTsL+oIWTX0/auj/gFte+HlQmvVw l48P8GdGfg+C+igstMwUyT7G8II3ZhYrvOHx9+JVrbyDCv0gJdD2GPU7ew08WmSPH3zZ EF/6NjBZVwJ5H2Grhfr0pco/pkyG4yGr/BOBLBdUMpzH5UzHGTfsxujByzNPQxf6FtDN /rG7+txJY+z8kLKuSM6Nw9BTK65aXfEebV6qyQsjiX6WxshUwj0p8Fr8HlS9lM5zVlRB JPag== X-Gm-Message-State: ABuFfojCyLQ3rFV6ZtbCWn63bA7J+xdd+9yZXt6TxPY7bQXy8ooK1qOo muZoQ7dhyXFVb+Yq/9pW9dggf5DajM0= X-Received: by 2002:adf:d249:: with SMTP id o9-v6mr22721382wri.66.1539795011311; Wed, 17 Oct 2018 09:50:11 -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 h63-v6sm1413480wmf.31.2018.10.17.09.50.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Oct 2018 09:50:10 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 17 Oct 2018 17:50:08 +0100 Message-Id: <20181017165008.5385-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] package_manager: implement PACKAGE_EXCLUDE for opkg X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org opkg has supported the --add-exclude option to install since 0.3.0, so use it to implement support for PACKAGE_EXCLUDE. Signed-off-by: Ross Burton --- meta/lib/oe/package_manager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 1ab3761c24a..b32d6464b21 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1334,7 +1334,11 @@ class OpkgPM(OpkgDpkgPM): if not pkgs: return - cmd = "%s %s install %s" % (self.opkg_cmd, self.opkg_args, ' '.join(pkgs)) + cmd = "%s %s" % (self.opkg_cmd, self.opkg_args) + for exclude in (self.d.getVar("PACKAGE_EXCLUDE") or "").split(): + cmd += " --add-exclude %s" % exclude + cmd += " install " + cmd += " ".join(pkgs) os.environ['D'] = self.target_rootfs os.environ['OFFLINE_ROOT'] = self.target_rootfs