From patchwork Sun Aug 30 03:04:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 1353873 X-Patchwork-Delegate: chunkeey@googlemail.com 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=gmail.com 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=BY1LJRde; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=hAaTbzmo; 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 4BfJBg5GMbz9sTT for ; Sun, 30 Aug 2020 13:06:19 +1000 (AEST) 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: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:In-Reply-To:References:List-Owner; bh=o4sNPiShEbOEQ/GkesWDvg27ij04PqxOLiiGzK8uWMc=; b=BY1LJRdefotbMMT/MtdxHvCnmo byESgQ6P/c7+Qh3iZKx/mHeV5zaQXxILublHviFHzzgt+y8iea/illn37z8rLrSXizq81GLINBbFr +oeJpsK0829MlXECh0FtynPKrYsUhnwdcwFbhw4rqFIl5gilyfwaUUm3nFVKZTerKUVIHhgrM4ObD /yEiz4RRP+41ks9i9u2LTaaBSzLlICtvA2AE7UNKTAD5XCQLffvprxP1J2FH1sZGubkOqsNtipRyN tvxo2HeWKDqXjMJEO56nFMaH+Kv8bXQQIiWaY85PGZO4Rxb+2Zt1L0U5W8b2OYUJKqeg28ste7DQn tdIOXFvQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kCDdu-0004ge-Br; Sun, 30 Aug 2020 03:04:30 +0000 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kCDdj-0004d3-LQ for openwrt-devel@lists.openwrt.org; Sun, 30 Aug 2020 03:04:22 +0000 Received: by mail-ej1-x633.google.com with SMTP id m22so4058597eje.10 for ; Sat, 29 Aug 2020 20:04:18 -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:mime-version :content-transfer-encoding; bh=NWCQEB7ohb1EInfX+ybc7Hh5vKIFGtSwsbpy9r7BWtE=; b=hAaTbzmoiECYJX2SzzRoWifGGEEuz7QMhCqaFFtZ65AJdESqn8lIq3kzDDwtZR3oNZ ckQTixQEyQj/SFotZjPnpFn3idnqUyOCUY2GG29kYrP0T6g/55rW5ExMCxYZDrlNxUd2 L3f/h3k+FhZR+Wq74VkeDO1Gkvyf36x7NFvw4qP7WJIoaAACcfepurRu95PNRAk2f4sN yioThBITocz1FdLb8SPZTmQeyVxkgT++B1chCuYOcO+XT5+vba2qj+w7bP3xQuP49WNM NWt4O1+QyVRARvNkPQhwbcg8aGzjUemORVNCGNiCAnVWPG24bqy0ei4q9wtdQ5qEjqsN ZZzg== 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:mime-version :content-transfer-encoding; bh=NWCQEB7ohb1EInfX+ybc7Hh5vKIFGtSwsbpy9r7BWtE=; b=R6TIpCjYEsj44Ug4TOozODFbjmK6wPbvdKD42zxdzIXMC1fdHm3t/lInD2KTPMz8ie /F8+DrgWyltrUChrKwovg+kvJySiXUAe2fGObZKsTrsZkwoySc5K7lefUwEvCwXa+G2g yn6080nLWr2Rb2Ad41WZRVOecE1Bv5Wu2nLTMDZUlbR84v/5GK7yWAvXuo6w4OMeukBO PwGEHyLAXSbF9TqTbO2IfCpdHjB/rK4YdHla+9EkUvDNZMJcW1+lTDM01vopDKrj/3r3 BJlZTlsdNmbtHRdsN+4ICZjzdYB8SjiRfZvy1tE0KFuCtN70xlEaEha4MKEYJ6niiBAx VXJA== X-Gm-Message-State: AOAM533IVkFEjyHAqAQHZ/mY5eVuq/wFPMpToFdr8BjhZH6K1sn3SQFY 5WSjmb1/aXKtYZd6Un3daLhMY1sUQok= X-Google-Smtp-Source: ABdhPJwlVCi2BLtUzi9QM/hppulFuEJVK2cCw2VIKGkDm8h/AHFnsG9tcfj0VWk7k9qvNidnfVHmAA== X-Received: by 2002:a17:906:440c:: with SMTP id x12mr6125418ejo.293.1598756657326; Sat, 29 Aug 2020 20:04:17 -0700 (PDT) Received: from debian64.daheim (pd9e29952.dip0.t-ipconnect.de. [217.226.153.82]) by smtp.gmail.com with ESMTPSA id d6sm3761040edm.31.2020.08.29.20.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 20:04:15 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.94) (envelope-from ) id 1kCDdZ-00HNUD-PJ; Sun, 30 Aug 2020 05:04:09 +0200 From: Christian Lamparter To: openwrt-devel@lists.openwrt.org Subject: [RFC PATCH v1 1/8] base-files: support label-property-less in get_dt_leds Date: Sun, 30 Aug 2020 05:04:00 +0200 Message-Id: X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200829_230419_777918_49DC413A X-CRM114-Status: GOOD ( 14.99 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:633 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [chunkeey[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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: rafal@milecki.pl, hauke@hauke-m.de, f.fainelli@gmail.com, chrisrblake93@gmail.com Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The "label" property we used and loved has been deprecated upstream by: |commit c5d18dd6b64e09dd6984bda9bdd55160af537a8c |Author: Jacek Anaszewski |Date: Sun Jun 9 20:19:04 2019 +0200 | | dt-bindings: leds: Add properties for LED name construction | | Introduce dedicated properties for conveying information about | LED function and color. Mark old "label" property as deprecated. | | Additionally function-enumerator property is being provided | for the cases when neither function nor color can be used | for LED differentiation. in order to be somewhat prepared, this patch adds a fallback as a last resort to get a proper label based on the node-name. Signed-off-by: Christian Lamparter --- package/base-files/Makefile | 2 +- package/base-files/files/lib/functions/leds.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7eb3ac1868..2419849a44 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=227 +PKG_RELEASE:=228 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/functions/leds.sh b/package/base-files/files/lib/functions/leds.sh index 43b2fe02ed..14baeb37b4 100644 --- a/package/base-files/files/lib/functions/leds.sh +++ b/package/base-files/files/lib/functions/leds.sh @@ -18,7 +18,8 @@ get_dt_led() { [ -n "$ledpath" ] && \ label=$(cat "$ledpath/label" 2>/dev/null) || \ - label=$(cat "$ledpath/chan-name" 2>/dev/null) + label=$(cat "$ledpath/chan-name" 2>/dev/null) || \ + label=$(basename "$ledpath") echo "$label" }