| Message ID | 20180906151113.16805-1-yszhou4tech@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Yousong Zhou |
| Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=198.137.202.133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mU4tYAyl"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jDk4NPhB"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 425kZ54Pnwz9s4V for <incoming@patchwork.ozlabs.org>; Fri, 7 Sep 2018 01:11:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=6nz8zrVxlJrtmhNVSuH4oRig/FuFf9utDVRNnpj+wP8=; b=mU4tYAylgSf4ne MASWNauv3E6GLj7wuyOKyFLdH2cSYVKbwzcm+trsxMhDoMiC5HXlNCQ0wLbRnzMdChGBfHvUMKHnU fkQzMPJ0AJb38jlGi8AkVUBwU3b2AkLGNzNkavWbRsfKh7MHngdzROojUNKw8jOijHUCwJEYWrbDy JKqSl05hU2vwFYtVJQSOPOFYCRp7irGjNfWldYvQNSl0Xn2PJTx5Dkr0dWQy8IeOrJB9iejf7/ZZG yPk0h/I5KXg4HWziLUCthWut2+rGOL90HG4siVjY3Z9tQCCcuR8mEWMkICgNFjUt3Qo8YY3c7HpmP IQuECVsFPP/WUMDXX2zA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxvwg-0002Wn-Uf; Thu, 06 Sep 2018 15:11:46 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxvwZ-0002SY-LD for openwrt-devel@lists.openwrt.org; Thu, 06 Sep 2018 15:11:45 +0000 Received: by mail-pf1-x442.google.com with SMTP id x17-v6so5449057pfh.5 for <openwrt-devel@lists.openwrt.org>; Thu, 06 Sep 2018 08:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xRNbr5vj4TsK/eSSgcZ2Eo70gWhq8OSaGWqHksQ0D2o=; b=jDk4NPhBc5KyNwlfP9rtK9sJbDob0wnxIn2LcgzPhS1chXc9eB7YGYD7axnY3ZWH8F +H7b/3z33svmgTPf/+7Dz5Y5XsKBqSQ1YMu3M2VjnEPfrkYrwvE9GtODtDeSlIFxPOhT 1W1ldBneCm57R8tOR8IdXN3nwKSXKckYbI4I/SMvysE3w8Zp755GscAHn/VYXWiyKYAV NcvPCVkiyDiJd0x7LjU+nAbKOcMHJ3yIgqPjalfYpYnhRkqnqd+I9jwGQvFqPQeeZPqn /yKWzaS3J0Iy/s2F7eFUUQLaU1MWgUHWVyn2Kjb+dTxIZH2xbm8Pkus1HOSgaYAGxMir gGgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xRNbr5vj4TsK/eSSgcZ2Eo70gWhq8OSaGWqHksQ0D2o=; b=NSsVN7EOs5gysieiKLOZUERd3EzG9xDWMAtur/4Tq9MAAHu/pjfJDyIwZgXqDK2eIG lUAqNlnhic02i4FPCXUrnbnrK8cSCgHRPIklkHJI0Ikt2qzJIOAdQohFD69WOSX3mgeE leyTTRnu4fwBMglofrB57hyTA+uPhRn0NBP/wrS7KlxtRkB04wAzwGBviZpxTbeck6Gr fG8YrI1o/ZQ6KVUeOvhUmaCLr8mwRxdTa8HZOm7ibCPiqu+sKE4iUTMyqAE5BNBzbmLb sXHA0ndjMbRpIBpwBZpXZjagT/8vOVDoWyUkBnhJ97Gs9zkGb6Nrx40U20kIbYnhGPSY 3DAA== X-Gm-Message-State: APzg51CGLu2Q/MI5v85byDK3ooYl10tgH7qP44Cu+/bHwrcqoQ0me9gW r06BOaHAUw5FZvpVK9uYpeBEf8iUG9k= X-Google-Smtp-Source: ANB0VdYiJgK97gHYY45GNCrpVxPlyb933czXwqY2e6THO3lgE1+0a/qKJMO0vvDccHYtbDsAO5KI8Q== X-Received: by 2002:a65:6398:: with SMTP id h24-v6mr3226072pgv.245.1536246687552; Thu, 06 Sep 2018 08:11:27 -0700 (PDT) Received: from titan.hq.cloud.yunionyun.com ([47.52.22.109]) by smtp.gmail.com with ESMTPSA id v72-v6sm14856828pfj.22.2018.09.06.08.11.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Sep 2018 08:11:26 -0700 (PDT) From: Yousong Zhou <yszhou4tech@gmail.com> To: openwrt-devel@lists.openwrt.org Date: Thu, 6 Sep 2018 15:11:13 +0000 Message-Id: <20180906151113.16805-1-yszhou4tech@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180906_081139_735624_6E20547A X-CRM114-Status: GOOD ( 10.53 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (yszhou4tech[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH] scripts/ipkg-build: quash error messages when conffiles.resolved is empty X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Cc: Yousong Zhou <yszhou4tech@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
| Series |
[OpenWrt-Devel] scripts/ipkg-build: quash error messages when conffiles.resolved is empty
|
expand
|
diff --git a/scripts/ipkg-build b/scripts/ipkg-build index 845a6ed04e..e42da2ecbc 100755 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -60,8 +60,10 @@ pkg_appears_sane() { done rm $CONTROL/conffiles - mv $CONTROL/conffiles.resolved $CONTROL/conffiles - chmod 0644 $CONTROL/conffiles + if [ -f $CONTROL/conffiles.resolved ]; then + mv $CONTROL/conffiles.resolved $CONTROL/conffiles + chmod 0644 $CONTROL/conffiles + fi fi cd $owd
When Package/xx/conffiles only contains directories that are empty at package time, conffiles.resolved will be missing and the following error messages will appear in the build log. /home/yousong/git-repo/openwrt/openwrt/scripts/ipkg-build -c -o 0 -g 0 /home/yousong/git-repo/openwrt/openwrt/build_dir/target-mips_24kc_musl/linux-malta_be/openvswitch-2.10.0/ipkg-mips_24kc/openvswitch-common /home/yousong/git-repo/openwrt/openwrt/bin/packages/mips_24kc/packages mv: cannot stat 'CONTROL/conffiles.resolved': No such file or directory chmod: cannot access 'CONTROL/conffiles': No such file or directory It will not break the ipkg-build process. The change is merely cosmetic to not cause confusion when reading logs Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> --- scripts/ipkg-build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)