From patchwork Fri Dec 1 21:48:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Senior X-Patchwork-Id: 1870818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=dNDKhAi0; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=personaltelco-net.20230601.gappssmtp.com header.i=@personaltelco-net.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=tT3ASaUm; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Shn8K6wSqz23nT for ; Sat, 2 Dec 2023 09:01:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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:Cc :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=j08qFPKeDBKoHPSVUueTp4BvzsjjL7lFknYrvzzmmDY=; b=dNDKhAi005/92O 2ArRPTdzjo23kOAt+luQVDQ6nkKtLAyG5EoZCLUibvrXQZXyRcrOfj2ijJQNaPKbmi5YMdgVgHf3Z yDXeLDUJ64UeDS1Yg78UpyJ2b3COlNQBNUVCqMstVlt5RldQ9P9q/4mswHgZUvZnDGfKlpMsH8Aag VwBgD/Dx4t5mUkcG3Tx/nWQQ32MegiQUCW7/0Kp5+fu6iDzjo+u7PBe8SsBfXrRF9KC/btDmFigdv mgBRMaD5mSG/pWFpLi/ESpjjYL2B1N+fFz/nA0N9Ai+W/6f5PhFQK3J0icl9EmoU1NcqBeqGJMWiN 8wcsmTuMFo18J94nd3aA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r9BWX-00Ehi9-1b; Fri, 01 Dec 2023 21:58:13 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r9BWT-00Ehhp-12 for openwrt-devel@lists.openwrt.org; Fri, 01 Dec 2023 21:58:11 +0000 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6cdd9c53282so2376026b3a.3 for ; Fri, 01 Dec 2023 13:58:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=personaltelco-net.20230601.gappssmtp.com; s=20230601; t=1701467887; x=1702072687; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/KYR7m9E0wQwkjqQy2Z9MOsBR1Brup0kqElRoTIqgnE=; b=tT3ASaUm3GzLQBX+F7MnQwrRIFvmrPLF/XT9rKR2X3imvjKuchl0/C7USricx6owyo Q4si0VlcUXE4PiGGjkUH3Zz0OE46Ktf3dhPRKeTrjmUQw/cHxqv+/uANEh1G89FLryZB zhV5tS4meNZSaNK4nM9wxBIgvF4s5s2Fyhgww1n10qXk5SDa4CfKwqRWVs5fE3O0DY/8 QNE+NmYNOjUlSBLQ+glDU+AwpHlrRp0t9GwHo9BvGByMkRxan1nu5k1Z52FaBXbhnHG0 B3HZAvvkcy7PfdM3a6MDr/wYttHu5/K85DcIiLHgNFf/kN2nQkj/6DbdAAKPm8n7uwvl twnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701467887; x=1702072687; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/KYR7m9E0wQwkjqQy2Z9MOsBR1Brup0kqElRoTIqgnE=; b=WclauRgpZQe8Pa47DUI/EyDbwrY6bB7AQ3A0vYPaqeOMUKBSEe1/3/xeCFoScVVryP 6etAYmmn5RKwABeEPl1DHizcoc6cr7J817uhYpPLAr46B6IOFLrziouoCTvK6mJ6mMX+ of4ZU80M49Zq4Wk8TcABy7rNH28LuK/Ka7kOVf3XDGFBjFXf5rxEeXuTJsbgfjYUdX2x XJHq/2YTWbnEIXjZ4pEe51GOKseyWqUnuR89xJhwoDOnq4zN3j9TstapBQUHuGtYzlaH REJEw8P5OaZzTQ3XEPVg9JsE5AKN0mq+mfNjgYBk++68Vpn0YuR4ZmHRjd3hSQzmUXcG m+qQ== X-Gm-Message-State: AOJu0Yxud8bru22/Vcf4qgg4uM84q2u28aA+uunelPMcHLr0Muo8c1gz z/PptY9Jcx7DP9q+o5CYCZB1nj5jHzRInzyw2tU= X-Google-Smtp-Source: AGHT+IGfyajEvi1LTSiiTLg+lrkVP0JRGCX40y/Iuj449mwtfMLlAAWixUn1VAaIdcofjALe1mJlFA== X-Received: by 2002:a05:6a20:9716:b0:18f:97c:927f with SMTP id hr22-20020a056a20971600b0018f097c927fmr132044pzc.100.1701467887160; Fri, 01 Dec 2023 13:58:07 -0800 (PST) Received: from hawg.ptp ([2602:3f:e4ac:bf01:3162:4332:e1bf:a4c2]) by smtp.gmail.com with ESMTPSA id q5-20020a170902b10500b001cf83962743sm3771742plr.250.2023.12.01.13.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 13:58:06 -0800 (PST) From: Russell Senior To: openwrt-devel@lists.openwrt.org Cc: Russell Senior Subject: [PATCH 1/2] qoriq: add missing compat_version to allow sysupgrade to save old config Date: Fri, 1 Dec 2023 13:48:55 -0800 Message-ID: <20231201214949.2333622-1-russell@personaltelco.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231201_135809_600365_36D593F9 X-CRM114-Status: GOOD ( 11.06 ) X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Currently, sysupgrade without the -n option complains: # sysupgrade -v tmp/openwrt-qoriq-generic-watchguard_firebox-m300-squashfs-sysupgrade.img.gz upgrade: The device is supported, but the config is incompatible to the new image (1.0->1.1). Please upgra [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:431 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 -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 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 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 Currently, sysupgrade without the -n option complains: # sysupgrade -v tmp/openwrt-qoriq-generic-watchguard_firebox-m300-squashfs-sysupgrade.img.gz upgrade: The device is supported, but the config is incompatible to the new image (1.0->1.1). Please upgrade without keeping config (sysupgrade -n). upgrade: Kernel switched to FIT uImage. Update U-Boot environment. upgrade: Reading partition table from bootdisk... upgrade: Extract boot sector from the image upgrade: Reading partition table from image... Image check failed. So, add the missing 05_compat-version to /etc/board.d/ Signed-off-by: Russell Senior --- .../base-files/etc/board.d/05_compat-version | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 target/linux/qoriq/base-files/etc/board.d/05_compat-version diff --git a/target/linux/qoriq/base-files/etc/board.d/05_compat-version b/target/linux/qoriq/base-files/etc/board.d/05_compat-version new file mode 100644 index 0000000000..62ad804389 --- /dev/null +++ b/target/linux/qoriq/base-files/etc/board.d/05_compat-version @@ -0,0 +1,18 @@ +# +# Copyright (C) 2020 OpenWrt.org +# + +. /lib/functions.sh +. /lib/functions/uci-defaults.sh + +board_config_update + +case "$(board_name)" in + watchguard,firebox-m300) + ucidef_set_compat_version "1.1" + ;; +esac + +board_config_flush + +exit 0