From patchwork Tue Jul 14 14:28:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1328933 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=sF2toHLw; 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 4B5jfC4Bkbz9sQt for ; Wed, 15 Jul 2020 00:32:35 +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=bb+S7cJTHNxVnHz79QBA2skIzTIIHCHMiKnhP3K3Lhg=; b=sF2toHLwZ1KKN0nV0AFv1KAJD7 25ZEZ4yJI0YzLx0w7AzfHn6Kolb00BSiqo2zmbHO1gq+Hf8Y69ZbZRh/ofHerrcVgQBcZWBeR5rjw HDL3c3gZXkw5FjSYexbrUI10lDMvf7E55RF4vCc3Df8WMNuWvQrkwwlCwXLcl+9R6l+Hq1k9Qa8IM R8dG9maXlWp7OTWYeq/4pX5YCoSZ053MwlpJoQ90V0fNXxCOtonKHJ1bCMC9zru24zZrD2WB+ygSb TcL7scKNCIsCGZ9Gltwloq8SuEGnZ58vIT8Ma0DaPoEd40Lloa772xBnlrn1gx8jUGGMcCuQeqwlC foik77LA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvLw2-0000OI-Rc; Tue, 14 Jul 2020 14:29:30 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvLvr-0000IJ-25 for openwrt-devel@lists.openwrt.org; Tue, 14 Jul 2020 14:29:20 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MCKO4-1k4jqk02ny-009Me3 for ; Tue, 14 Jul 2020 16:29:12 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 6/6] kirkwood: implement compatibility version for DSA migration Date: Tue, 14 Jul 2020 16:28:25 +0200 Message-Id: <20200714142825.16889-7-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200714142825.16889-1-freifunk@adrianschmutzler.de> References: <20200714142825.16889-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:MWQvph4OJ+4SLfHBERRf6Y0hoCLZi2XuBIIx7BTEkUJqKyxEFDD aNSNNJ1aA0Lnii4H/bLkk4wa2YyFQFNmYWBXUtOm9Y5z5rsSEjtdokvSPRGW+cyD4xr5jfG hDCzjGNwnU8JiopsaQ6g0szr9Ieh6xEaPgY/AMKrTaz7Mhmfhb1RHV39QrRmN/3M0BXEoBL 5GUEG48MEiPM1gRQb71Rg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:hgeVg3HzXuE=:HUfEXXjkw1zDViSN4Txig0 wVZjrSC8qXS3e34iaEYxITnai913FJmCOpGX9Twz06dITLHgsD4aAeyPpjKldONzjFJl7Dkeb SyNuqbAuK4V5Mcmv7tSJSgObjHWF26FHSwHlDbi5JE42jZnx49SuzFmq4KV1lYh39UIbp2BB7 tWoYYWNu4f3R0nOa4l5f6Np4n1BscH0nb8v0I4/PRTNqS6yr82vQjbdelGssQazv9GIojD5QI blTkDuz2e7cCJ+J8oqd6CMUr0HIERUg6S6sT//BNebI1Ap0iuUN5yM3FyZXCRs+AoKHQqyBCV /AKDN599RCDXvMBj/xaeJ+XnbEaDvwRJwB9TWHczX8hIzEIb/TBZw3YanOz7m/cEX2kY6NzWS 3Z1b0cAcwhwSJ4fWFkvD0vSZ69O6JLPYj5lRYzeXcF0rDi/u3XGLu0btmgN1dxhk++NAdz7pW GW8wRZJMYy6qQAvtLMpQXll+eadJlrmEtlDsgZycudS/JpQRuyMe2ZDAe6RkuJGqQYXONCTyw dArf+DNYizWXYKcxUKJjZsUI9QOKqOGW3nliE0caXH39pi8prYbzr9+VPQSqKtDWusefdiaDI EXG1by+cIxON+I8FR8lrcnQbzTpQMJhy190FXs100gEXS/YudB+YzegM3/HLqCseKzwd0vdpq azm27+6wG88/lONRfM48bNXOVe2byCnGZO0ECzE282kUctWThuavTfnmEL0UIyocLfoUOc0B6 CU+gfDhtrxOzu4Xd5XBll2HcFsPHubnKDKrM4gG2OF+ONdF/dEk8jQEA6sGYvmSj1I00f8jHA qVXlzmCfb2MRCKn3x55ufD5bFB17ePVp18AVWMrNuxXocBH5vnvxHOYILBKGMDfxMO34znZmm JvwAxn24r1xt2Pex9TwA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200714_102919_386914_9054D580 X-CRM114-Status: UNSURE ( 7.53 ) 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 [217.72.192.74 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.74 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 implements the newly introduced compat-version to prevent upgrade between swconfig and DSA for kirkwood. Just define a compat version with minor increment and an appropriate message for both image (in Makefile) and device (in base-files). Since we never removed SUPPORTED_DEVICES for this target, we don't have to add it back either. Signed-off-by: Adrian Schmutzler --- Added in v2 --- target/linux/kirkwood/base-files/etc/board.d/02_network | 1 + target/linux/kirkwood/image/Makefile | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/target/linux/kirkwood/base-files/etc/board.d/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network index 658ce13346..45c0182493 100755 --- a/target/linux/kirkwood/base-files/etc/board.d/02_network +++ b/target/linux/kirkwood/base-files/etc/board.d/02_network @@ -32,6 +32,7 @@ case "$board" in "linksys,viper") ucidef_set_interfaces_lan_wan "ethernet1 ethernet2 ethernet3 ethernet4" "internet" ucidef_set_interface_macaddr "wan" $( mtd_get_mac_ascii u_env eth1addr ) + ucidef_set_compat_version "1.1" ;; "zyxel,nsa310b"|\ "zyxel,nsa325") diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index ba93fffeb2..6554fc2669 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -10,6 +10,11 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR:=0x8000 +define Device/dsa-migration + DEVICE_COMPAT_VERSION := 1.1 + DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA +endef + define Device/Default PROFILES := Default DEVICE_DTS = $$(if $$(BOARD_NAME),kirkwood-$$(BOARD_NAME),) @@ -92,6 +97,7 @@ endef TARGET_DEVICES += iom_ix2-200 define Device/linksys_audi + $(Device/dsa-migration) DEVICE_VENDOR := Linksys DEVICE_MODEL := EA3500 (Audi) DEVICE_PACKAGES := kmod-mwl8k wpad-basic kmod-gpio-button-hotplug @@ -107,6 +113,7 @@ endef TARGET_DEVICES += linksys_audi define Device/linksys_viper + $(Device/dsa-migration) DEVICE_VENDOR := Linksys DEVICE_MODEL := E4200v2 / EA4500 (Viper) DEVICE_PACKAGES := kmod-mwl8k wpad-basic kmod-gpio-button-hotplug