From patchwork Tue Jul 28 18:47:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1337961 X-Patchwork-Delegate: freifunk@adrianschmutzler.de 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=adrianschmutzler.de 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=rmmtBcrQ; 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 4BGQj570R4z9sRN for ; Wed, 29 Jul 2020 04:50:17 +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: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:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=e/q4Pp0B2zW6EGhXyFpU/cmu8rYFBa2zf8E7i+iypds=; b=rmmtBcrQqBbYDQ2DRUeU9Ig3ui V9HhphJQ2Id1XWpthw5hBdWeImz1rMwWMKh9mFZNEUJ1TiquBfaUPR2gGHCzDKOzqQiiPkm+kF4ec 9QvDaj/ynI4vRMta+EjxzjwJkspY/HIZ8uOkxoTP9AjmOzjh7p5ymw4WrVK4N+pa8qRrPJF+NWM/9 uiw+nimjgRsZm6ZPhAKtkGidGsCPFv1DHKEyO23Mn5BoJzLVRKU1RASb+TMQzkQFQ9h0mWPaQWhQs 5yDfVCAPZZ2TAN8F+4yV9iVu9iAX6tS5STGzmKTsYDjUHaUKG/sLExF2jmpzOZ8PJta5HuV9a8UCE TvZVnGwg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0UeW-0000pw-Vf; Tue, 28 Jul 2020 18:48:40 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0UeT-0000of-A0 for openwrt-devel@lists.openwrt.org; Tue, 28 Jul 2020 18:48:38 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MvJsF-1krdMq2uGH-00rK8f for ; Tue, 28 Jul 2020 20:48:29 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/3] build: add option to mark devices as BROKEN Date: Tue, 28 Jul 2020 20:47:34 +0200 Message-Id: <20200728184735.44206-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200728184735.44206-1-freifunk@adrianschmutzler.de> References: <20200728184735.44206-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:aszJBlxq2f83zgbJpCDFgdlGyYOyl3QQOTJROKmmwIw5pKSqOBB 6dpgURbYtMg3ek6rfy/R70X0LegYJnIEgnYbgQcd2llL5vzLrBKLO0ghb902RKEvvFVzCp+ B4f0S8jk9KMmjQ52LxmJS6RxLndKGoXz/jNdkdjfKe/DZm6AI4DrwguE3KiEwgk0C/QlrQW aH6sBcucQQWVlBhJd9K7g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:nuQNVf8WRmg=:drHfMgXP+B/unds9uIpX+4 SnMhOdPSwO0jtoAoHM7rqzBaxZxxVlvmrpyt9GHpztfb8V2Mh788sJjaBTJssF3wJOaqEt6so 4MdLx36YcP2ZtZZIRjgmor1jpIhdz6RGS4IG6vSCEkXinu5ZWGKxWJBf+n4FQPynVCJ4j2OSX NM6yqJidXmY47FCvOdL3wW9/mDLg0VweSvh7L5Y2wQcpwwE1Rm/b1LJEfuVoEAmhFyB+Oi3Sm GuiVkDpalZu2D4Z9jVth41sV27z9gMf5NUAjqNNSPZ/1oouL0GaRYZuum4TKJMQJGRKDOApSN 261hPLQgC2gqRtdPvUVnY/7k1UZ2VIeEsH1lS667CLd4AZ9s22/qx5EWRlqk9gfPXASY/1gRp HL/6FDe1vvUxFBqWy2RYKyZUnP989QuUl/DyadtCczLAbR3uczIl/7P5b6rHeXkNQDmmb5djJ 7LAaHW826raqwEy8zgae1jEY9mC3MLZZtt8B4WQy+Ht77DJ63cqs41/3ge475cg2mlCiICnDo VSJFFjE9me3B1fTMiYOoC07VRSSAdfNxC6+1jV6fnffo2hF3Xf88UqyXNZMaVC917S09AJ/6r 9x7Aoc1OLkv7oUB+W6fIIRQaRzZZ1Sp7yQEnNI78zGnHw7ymFI+96cQrnHwsej7LPrBngLuk9 AHFIzs/pLaLzybtB0aETF0v6JmZVXFO7xe1m0WJti3s63hBJQ1H378w0bjuoXpgbtT6tPIyEl UO4BNFrN0eIeeUGZ8NDmeWoOQ1WyKT8gbdPAzOFaBoK3U0OaisSeNw1qOruYS73+BWmt0bM+F xEPk6VKNuPFPaBUlbS0HFyDNPeADSJ0s0dryY9vfXNWbXmKNMN35lWm6TcU3ZgH5LaKnzJTvB qDQ+1QM0NqggYklTXJnA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200728_144837_607627_140A2FC8 X-CRM114-Status: GOOD ( 14.90 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.10 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org By specifying "BROKEN := 1" or "BROKEN := y" for a device, it will be hidden (and deselected) by default. By that, it provides a stronger option to "disable" a device beyond just using DEFAULT := n. To make these devices visible, just enable the BROKEN option in developer settings as already implemented for targets and packages. Signed-off-by: Adrian Schmutzler --- config/Config-devel.in | 2 +- include/image.mk | 2 ++ scripts/metadata.pm | 4 ++++ scripts/target-metadata.pl | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config/Config-devel.in b/config/Config-devel.in index 11741c7070..6447a79db2 100644 --- a/config/Config-devel.in +++ b/config/Config-devel.in @@ -9,7 +9,7 @@ menuconfig DEVEL default n config BROKEN - bool "Show broken platforms / packages" if DEVEL + bool "Show broken platforms / packages / devices" if DEVEL default n config BINARY_FOLDER diff --git a/include/image.mk b/include/image.mk index 300f7a6619..be934e94d3 100644 --- a/include/image.mk +++ b/include/image.mk @@ -426,6 +426,7 @@ define Device/Init UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-$(1) + BROKEN := DEFAULT := endef @@ -638,6 +639,7 @@ Target-Profile-Name: $(DEVICE_DISPLAY) Target-Profile-Packages: $(DEVICE_PACKAGES) Target-Profile-hasImageMetadata: $(if $(foreach image,$(IMAGES),$(findstring append-metadata,$(IMAGE/$(image)))),1,0) Target-Profile-SupportedDevices: $(SUPPORTED_DEVICES) +$(if $(BROKEN),Target-Profile-Broken: $(BROKEN)) $(if $(DEFAULT),Target-Profile-Default: $(DEFAULT)) Target-Profile-Description: $(DEVICE_DESCRIPTION) diff --git a/scripts/metadata.pm b/scripts/metadata.pm index 1826a040a1..f6dce39662 100644 --- a/scripts/metadata.pm +++ b/scripts/metadata.pm @@ -158,6 +158,10 @@ sub parse_target_metadata($) { }; /^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ]; /^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE); + /^Target-Profile-Broken:\s*(.+)\s*$/ and do { + $profile->{broken} = 1; + $profile->{default} = "n"; + }; /^Target-Profile-Default:\s*(.+)\s*$/ and $profile->{default} = $1; } close FILE; diff --git a/scripts/target-metadata.pl b/scripts/target-metadata.pl index ee0ab5a718..c58f096573 100755 --- a/scripts/target-metadata.pl +++ b/scripts/target-metadata.pl @@ -239,6 +239,7 @@ config TARGET_$target->{conf}_$profile->{id} bool "$profile->{name}" depends on TARGET_$target->{conf} EOF + $profile->{broken} and print "\tdepends on BROKEN\n"; my @pkglist = merge_package_lists($target->{packages}, $profile->{packages}); foreach my $pkg (@pkglist) { print "\tselect DEFAULT_$pkg\n"; @@ -298,6 +299,7 @@ menuconfig TARGET_DEVICE_$target->{conf}_$profile->{id} depends on TARGET_$target->{conf} default $profile->{default} EOF + $profile->{broken} and print "\tdepends on BROKEN\n"; my @pkglist = merge_package_lists($target->{packages}, $profile->{packages}); foreach my $pkg (@pkglist) { print "\tselect DEFAULT_$pkg if !TARGET_PER_DEVICE_ROOTFS\n";