From patchwork Sun Dec 13 19:07:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Bj=C3=B8rn_Mork?= X-Patchwork-Id: 1415644 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mork.no Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=v1l3Ifeg; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=mork.no header.i=@mork.no header.a=rsa-sha256 header.s=b header.b=ZRiTAFtI; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CvDbQ6DXTz9sT6 for ; Mon, 14 Dec 2020 06:09:22 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LWAtBd9WIK85Qfkqv+2H0oQxXlIr9bHkk1oFq/M+6hc=; b=v1l3IfegG+pKYUMX5re3l9FSd 5CSL4dXZRDmVmmKe5IInQkoEYfOYeoJirbCxCRbSYbsi5PqxAJDMSs/z6Fw+CGFqbERyOufwLK0xn 9xli15JAKmmDfYM4fbC1du7dcrxffjzNt4btcCVa+ZPWu3RTnnIuUU9GoTbzXF3XlBA9LmZkg/B1W Gtrq06HB1Y5lQHrkIGdArdBb7QXIbpI1pKwT1N2+9gA+9nxHJ2aNwpkWGXjnhhJJHEgAlvtF9zIxT NHLqswWrITmpU5mYY1m36nbpxSc/LqSMfikeHPp1XPq0RhZICu8MvjbnBUm1uP2N8ZjXyXXyn1DOp z41CwbnPA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1koWii-0003a1-Vy; Sun, 13 Dec 2020 19:07:49 +0000 Received: from canardo.mork.no ([2001:4641::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1koWif-0003Yr-Bq for openwrt-devel@lists.openwrt.org; Sun, 13 Dec 2020 19:07:46 +0000 Received: from canardo.mork.no (ip6-localhost [IPv6:0:0:0:0:0:0:0:1]) by canardo.mork.no (8.15.2/8.15.2) with ESMTPS id 0BDJ7f1S032051 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK); Sun, 13 Dec 2020 20:07:42 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mork.no; s=b; t=1607886462; bh=TZcNJfWZGd0ukbHi9B13uS4HXPbtbgK3cGEA3imx078=; h=From:To:Cc:Subject:Date:Message-Id:References:From; b=ZRiTAFtInOe2ymazK5prG0YCYulYCA+/zRKPMMMd0xf7gk4CeVdoaNy4ob+ByTyb8 AsqG91fYU0lkfuZ3FlLM2A86Dvyrp2xY/ilVyUXmVYL1cS0QbMnyQsVbEe7ABlSZvv FRwg2pn9xNX3jnd9zUvH2H2a5wznSnaUGyNpwPs8= Received: (from bjorn@localhost) by canardo.mork.no (8.15.2/8.15.2/Submit) id 0BDJ7fog032049; Sun, 13 Dec 2020 20:07:41 +0100 From: =?utf-8?q?Bj=C3=B8rn_Mork?= To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 2/2] uboot-envtools: add wrapper scripts for alternate config Date: Sun, 13 Dec 2020 20:07:35 +0100 Message-Id: <20201213190735.31978-3-bjorn@mork.no> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201213190735.31978-1-bjorn@mork.no> References: <20201213190735.31978-1-bjorn@mork.no> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on canardo.mork.no X-Virus-Scanned: clamav-milter 0.102.4 at canardo X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201213_140745_846658_87584F5A X-CRM114-Status: GOOD ( 13.05 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [2001:4641:0:0:0:0:0:1 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Bj=C3=B8rn_Mork?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Now that we can create an alternate configuration file, add two wrapper scripts for simple access to it using the alternate alternate application names `fw_printsys' and `fw_setsys'. Signed-off-by: Bjørn Mork --- package/boot/uboot-envtools/Makefile | 4 +++- package/boot/uboot-envtools/files/fw_printsys | 2 ++ package/boot/uboot-envtools/files/fw_setsys | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 package/boot/uboot-envtools/files/fw_printsys create mode 100644 package/boot/uboot-envtools/files/fw_setsys diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 601627011d56..1e2115754551 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-envtools PKG_DISTNAME:=u-boot PKG_VERSION:=2020.04 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -68,6 +68,8 @@ define Package/uboot-envtools/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $(1)/usr/sbin $(LN) fw_printenv $(1)/usr/sbin/fw_setenv + $(INSTALL_BIN) ./files/fw_printsys $(1)/usr/sbin + $(INSTALL_BIN) ./files/fw_setsys $(1)/usr/sbin $(INSTALL_DIR) $(1)/lib $(INSTALL_DATA) ./files/uboot-envtools.sh $(1)/lib $(INSTALL_DIR) $(1)/etc/uci-defaults diff --git a/package/boot/uboot-envtools/files/fw_printsys b/package/boot/uboot-envtools/files/fw_printsys new file mode 100644 index 000000000000..0c4c4ab25702 --- /dev/null +++ b/package/boot/uboot-envtools/files/fw_printsys @@ -0,0 +1,2 @@ +#!/bin/sh +[ -e /etc/fw_sys.config ] && exec /usr/sbin/fw_printenv -c /etc/fw_sys.config "$@" diff --git a/package/boot/uboot-envtools/files/fw_setsys b/package/boot/uboot-envtools/files/fw_setsys new file mode 100644 index 000000000000..1cdb1a70f7f4 --- /dev/null +++ b/package/boot/uboot-envtools/files/fw_setsys @@ -0,0 +1,2 @@ +#!/bin/sh +[ -e /etc/fw_sys.config ] && exec /usr/sbin/fw_setenv -c /etc/fw_sys.config "$@"