From patchwork Tue Jul 14 14:28:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1328929 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=QDJWx2Nw; 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 4B5jdG6KRkz9sR4 for ; Wed, 15 Jul 2020 00:31:46 +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: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:In-Reply-To:References:List-Owner; bh=Cp6vLfO+u149zZVal06V8im8d+wdhEJpkslcglZidl8=; b=QDJWx2NwmU8O2QUdWpSKSO+m1N BSEihamPYhimMwgy9OMY9+p/L8RQN1cZX24pgKCyOznF0q8mpKXGXW3QSGe54q1Kye8W1/yLnUZxg iwW+j+hdfWdkmr9GRHIxBi2NRVmlmNLF1TYXE2NDaRboV2/KdBBtpKgLjyEsHzl/IyWZGOeTF5j0K 4fh3noYXJWfDK3Yk95ZivlrA+0ICcc94pW+byUwZYAqQ5vcfKItQIuWTf1BRJ3buBPKgXaZtEDmZq Y6O9gmSe/3N75PH6703o54fyrV7xaN+XyqrAppCQQQDEFyfbZjh1zq4y0SbTvWhbUeYBhBXUoRr5q vtuuTT3Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvLvz-0000Nb-II; Tue, 14 Jul 2020 14:29:29 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvLvo-0000Ff-3q for openwrt-devel@lists.openwrt.org; Tue, 14 Jul 2020 14:29:19 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MwQKp-1kkZXO1NQb-00sQA0 for ; Tue, 14 Jul 2020 16:29:11 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 0/6] sysupgrade: introduce compatibility version for devices Date: Tue, 14 Jul 2020 16:28:19 +0200 Message-Id: <20200714142825.16889-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:gC02SV+1s+0tkM1YWk+ecyP7HSHQ4eIJ1m9GMATJGaT5+DQ+h+K gE1jotTqcodHoSunuCQr4TXKl8HK/r7BWDGounu8IL8xZPDB1B0vAjQfuEPIVYea3dPAmW+ tpkhUfHVPayUfk5XhgXQJAtwZtof3mIjj02WyNCh7JKmRWa7qPECUyg+668z9gj2hiP7KCg CeR9GDDPE4ok1xjJhRNPw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:0D0SoJaQd0Y=:0KBncBEuMe70c47FkdQ5tc MX/sNZwgY1PYQm8dIoVepLqOj+ldCDMDyOyXPjIWCULb8ZBPY0oi/yTslPyRtlghusJBji16O O0RDvM0fOWedlUvdDrPYoD6UP2r2KvwRfTc/AcXwM1rBN/db7IgcfJjfFIh8AY2IaAWdROuiw puDLZabcqI/VVL6xylNFOFNGDad4Co55Dige2dy+TP1jfX/SLRza5g0VfTwjdko4R9hkguPkS OMKgP3oQnfGlYrerPvXXQSINCl6Njcn28cTq2TYzyKK382W5nXP6/CEIDB2TW/j1dDSNgu6Ol 6PAjJV1IZvxjYs3C9Ce40GjQVpm2bgoBZQBO99HM4+Y6XhG7lPZU0yX+sxKXoLYZTQs1g+Eg9 OWzcDyygRJi7tmfofIGAK0N5Lfdg9agMOE7B62UuohFQaCCF1eJBsdEVLXhpTjjIEkdZNvYRo UH1NIaF2ExL9vWgr5eH+GiWt4Z1uOSLhY58iG81NxrbHLiJVhvT79+EOocvKslnIK937ach1x dlVCGaA8zsJJnHy87VCr8CuHbOdk4EIWQx6rddA1q+Kv35B4IkBDs++bGy5TONm3gXio6Eyqp naZrmLbcoIdo6Z4zGTHhcnqcvzZpJLSzcSIm9CsUmK74RLqZuvlXVjuAOMoZqQ1gacn6MjJjs 5jo5rDuhOt4eBw+fSp6rvTI4Ck9LmzASh8CceUng5xsXxBWRUgQ9lpwj4//kLj/WljuhmoBED JyVAPfEnUHP9Jm/wCJLTA+4YMJhin22qmOmaUvWA1vx4nXB8lhnOuEHT6W+UsK/SI2qV16AAA GDGln9bwzh9yxhh6HDcyp3iyIcO2gTfEVhZovpQo0y4/McAAdx0EgIEActvenb7EIzLgwqLmI 469l/a85gwpXcSuF6Vaw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200714_102916_390055_8A1B9A6D X-CRM114-Status: UNSURE ( 8.35 ) X-CRM114-Notice: Please train this message. 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.13 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.13 listed in wl.mailspike.net] -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 This revised patchset provides some polishing to the initial submission. It does not change the mechanics substantially, but just provides some aesthetic improvements. Notable functional changes: - compat version check is now executed _after_ the supported_devices check - the DEVICE_COMPAT_MESSAGE is now also printed for the legacy sysupgrade hack Cosmetic changes: - The "error" message have been reworded to be more conclusive and provide more information. Further additions: - Instead of the example implementation patch for ath79, this now features the actual implementation for swconfig->DSA change in mvebu and kirkwood. (adding mt7621 will be considered after merge) While v1 has been device-tested, I have not run-tested this patchset so far, as changes between them are mostly cosmetic and I want to wait for feedback first. Adrian Schmutzler (6): build: add DEVICE_COMPAT_VERSION and DEVICE_COMPAT_MESSAGE base-files: add support for compat_version on device base-files: fwtool: implement compatibility check for images base-files: fwtool: make compat_version backward compatible mvebu: implement compatibility version for DSA migration kirkwood: implement compatibility version for DSA migration include/image-commands.mk | 10 ++++-- include/image.mk | 3 ++ package/base-files/files/bin/config_generate | 7 +++++ .../files/lib/functions/uci-defaults.sh | 6 ++++ .../base-files/files/lib/upgrade/fwtool.sh | 31 +++++++++++++++++-- .../base-files/etc/board.d/02_network | 1 + target/linux/kirkwood/image/Makefile | 7 +++++ .../base-files/etc/board.d/02_network | 14 +++++---- target/linux/mvebu/image/cortexa9.mk | 19 ++++++++++++ 9 files changed, 88 insertions(+), 10 deletions(-)