From patchwork Fri Feb 7 15:03:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 1235036 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=googlegroups.com (client-ip=2a00:1450:4864:20::437; helo=mail-wr1-x437.google.com; envelope-from=swupdate+bncbaabbspy6xyqkgqe3jbbruy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arri.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=eyyUdsk+; dkim-atps=neutral Received: from mail-wr1-x437.google.com (mail-wr1-x437.google.com [IPv6:2a00:1450:4864:20::437]) (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 48Ddq01QCtz9s3x for ; Sat, 8 Feb 2020 02:03:40 +1100 (AEDT) Received: by mail-wr1-x437.google.com with SMTP id f10sf1376093wro.14 for ; Fri, 07 Feb 2020 07:03:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1581087817; cv=pass; d=google.com; s=arc-20160816; b=PXwp1XpHc9nkQb4PaVQoDLejeLaHaM1d3kZbBe7y2X3SMkoj+tp4e0R+nzmvYqRYXb T9FrRcPFqtj17cvaQiYyfd1EN4r/YTji2cyFhay54jcdLZeHbomLisomId+9Be6JJ4S2 GazneHnYIqTYA+rxKO/A3mDO84/tRWcX2ULbSEOwzVHkmqDoyHfWp4zyZnmHeoRgVtWH Z7m4b1+7drHP2msZFf9tJrAe7WkbJcsAWs61YjK+kmRHMiE7fP8bi/AYohI/9K/w4N3o uwy/whMMYQzVwC9SmFJ4m0TuYiZCBfzjVgf3ZIh01efSe+IlIQCj1IGoBiikW3QJxfZv mgWA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=fl+z2zq/UuVvEEO2bOaKrQI+lBdbcGzq0N/nfGhTnRE=; b=YZhKzOOPCjGQ3aH9/XN5YgeWm1wEjjXOOSxkfMazMhRgOSZ3H2QZWuNL3w2UsiYE86 G2elJbdPAgIbejfPsiMsgvfsdKF7TvKsx+8FwQFpNvUjyKIPVroBvbIpFXeRC2c+qmp9 GKb1OvlpUV7nafdQsZwUwtpTcKuN55Q1PKfMd/KDjKDLIDkPjaHpWqx+7dE47cWgArN4 WQaql1LPOiGYzBFJfGIcO3KrA96dGMq6LDW/8qLSrbZqeZR+b+vLOn+51Jja5o7J6W9/ //Npjy3sFEqStpO0V89AIHEnQ1ETVOyN9USIFhQnekRf5O4w98/KDcVGn4+KNt8CeasV 0eWA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ceggers@arri.de designates 62.245.148.41 as permitted sender) smtp.mailfrom=CEggers@arri.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=fl+z2zq/UuVvEEO2bOaKrQI+lBdbcGzq0N/nfGhTnRE=; b=eyyUdsk+ZSTO0nUmVSXIOtH3pchfb8XJ3x5j8pukxhBKsHmUyNVqHOnJ/cH0F5y6o/ ct2AJ1AHvVuRWTvKZekMvqCwjMleOFjxjZ/bLRPZBhc/jBAw9DT2s4xy42srJmbANiIr h8od3c5MaXrWhoJRnOsL3Qj+HMnYqmj0fXhfER/e90ENDz39EClBZxejrjv4uxFjLkAU scdtLMXPdDWhrPg1hWcvF7FFKkPpzQL9L0QjWcRQTk12DtaGOiVeyFZKzBKSnJFhckiZ ECHyIPX6QeyuLlfeO1f4l0n4vdqfvupPuAPB3nFRk2KcJrgamKX4j1NTgh0kjA7zWQ15 FVbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=fl+z2zq/UuVvEEO2bOaKrQI+lBdbcGzq0N/nfGhTnRE=; b=jZOYjeYUyQUsTbsuP/B4L2iF/qLOsWhMPflQqMAPBPsDHg5aI3dhaxiCO3UIM+0HlQ WPn5xuWVKkU2+pE62IAz7PUqM4SptAlf1oV4rV/HTi0ws9JosEqLzETB36CHnTOiKGBX KVfbpDh7dOHIQuO6IBht3M+7Q8WJ+5LL9+Ot6VjK+VPgbCkvr7k2WSSbfLnrDoClowyx 7Kihr3dNgxVu2rSR9wgyMXq1TnOkivvQYV9GjG2pa0x+Jv4JeulDaw+lJ4DFNbWIVWEg XeQdevWq/96LcyFCjw8ITXqn8ZoEr/o0zKfEyEFhfc/D4SJu/oJy1dcYv100D4NIttzl yLTg== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAUhC+JJZbBzMwi8KwdJyJyvoL2VOxH/rCy8E48qr5Z/wHjEGOhh UHjU247uKwkWAUUFlfjGIEs= X-Google-Smtp-Source: APXvYqyyfXqfThDjVLYqCnw6lrQOSV3US7l2euWeatQ9Ctd4kUwWZMv3O91iOqt+Rs6f9fdHMv87ag== X-Received: by 2002:a05:6000:1284:: with SMTP id f4mr4972838wrx.379.1581087817234; Fri, 07 Feb 2020 07:03:37 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:6a8f:: with SMTP id s15ls6032581wru.7.gmail; Fri, 07 Feb 2020 07:03:36 -0800 (PST) X-Received: by 2002:adf:ee01:: with SMTP id y1mr5457863wrn.152.1581087816452; Fri, 07 Feb 2020 07:03:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581087816; cv=none; d=google.com; s=arc-20160816; b=miXEOR0zSE9SmYXs9n1WppMryWnJ0R8s6ZBdZV2gc+grJaIA3PFRc2jZCbx3Nw8GKD 8GnP72RMduP1Im8HX49efpHwP+9vL+cnw2xV0KmjIO/SqyeHS8eHDoMV+y95SlJmRZq6 A2uwsU1F+LVDBhSVYn7lhKb6KnixthgpOwu2T0HnrhHv21Yfd1kb43OBlkc97iILN71Q r9V9TKGzVxCqoCqQuQcSTvQOvuBWK8HJ6vK/UrFDOS/JMHlTbW1QMFWDMeRvcTEiDyXX KDC2HRlj47zvoDXGG8Qc5PbR33eoFwpVNnxNLXaeWsI79lyzZo1o8fLill0p+xh+D0SI f2MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from; bh=c/fpHdbNUS2Yd2RiAnsnBqWouqKfuaiRD0x+6ohz7QA=; b=n/tcoAb1EbZofdREI/pOsxa5rQnxRTrhcai+EiK/pSS7w3PPLkEyP5hSiECyHNJqL+ dfQqh6Da0lNEHUHt/Gu1I4SrlwwVmJn5C92ozxq4fjqKMlMNCCc/rVwCmeUSAafLy+xy UzGPw67H+J2QwO2f10SHsjGNRqDWiWwUylPwCmm62bW0bJUnNcjGBEe26LhjGJOY1bzb wxjPzhquvFbpWV2ZYT8fTstu2lp3wY/KWicFBcJcWuDwJheLWI5s+77K9OwnWZTxfkUz F6RA8vU+Sycg9Ei48laaRN/cwEM/GlU++79ea88iXuxej13vipWkElL0/Xb+bZthLTzv VrPQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ceggers@arri.de designates 62.245.148.41 as permitted sender) smtp.mailfrom=CEggers@arri.de Received: from mailout02.rmx.de (mailout02.rmx.de. [62.245.148.41]) by gmr-mx.google.com with ESMTPS id d191si522687wmd.2.2020.02.07.07.03.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Feb 2020 07:03:36 -0800 (PST) Received-SPF: pass (google.com: domain of ceggers@arri.de designates 62.245.148.41 as permitted sender) client-ip=62.245.148.41; Received: from kdin02.retarus.com (kdin02.dmz1.retloc [172.19.17.49]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout02.rmx.de (Postfix) with ESMTPS id 48Ddpt5Dc3zNn2b for ; Fri, 7 Feb 2020 16:03:34 +0100 (CET) Received: from ppmail.arri.de (unknown [217.111.95.7]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by kdin02.retarus.com (Postfix) with ESMTPS id 48Ddpt06RTz2TTJX for ; Fri, 7 Feb 2020 16:03:34 +0100 (CET) Received: from mta.arri.de ([192.168.100.141]) by ppmail.arri.de over TLS secured channel with Microsoft SMTPSVC(7.0.6002.18264); Fri, 7 Feb 2020 16:03:33 +0100 Received: from N95HX1G2.arri.de (192.168.201.254) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 7 Feb 2020 16:03:33 +0100 From: Christian Eggers To: CC: , Christian Eggers Subject: [swupdate] [PATCH] doc: Remove special handling of "data" volume Date: Fri, 7 Feb 2020 16:03:23 +0100 Message-ID: <20200207150323.15387-1-ceggers@arri.de> X-Mailer: git-send-email 2.16.4 MIME-Version: 1.0 X-Originating-IP: [192.168.201.254] X-OriginalArrivalTime: 07 Feb 2020 15:03:33.0849 (UTC) FILETIME=[C4469C90:01D5DDC7] X-RMX-ID: 20200207-160334-48Ddpt06RTz2TTJX-0@kdin02 X-RMX-SOURCE: 217.111.95.7 X-Original-Sender: ceggers@arri.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ceggers@arri.de designates 62.245.148.41 as permitted sender) smtp.mailfrom=CEggers@arri.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Special handling of an UBI volume with the name "data" seems not to exist anymore. So remove the remaining documentation and also remove orphan defines. Signed-off-by: Christian Eggers --- doc/source/swupdate.rst | 6 +----- include/flash.h | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/doc/source/swupdate.rst b/doc/source/swupdate.rst index 25c265a..9157d1d 100644 --- a/doc/source/swupdate.rst +++ b/doc/source/swupdate.rst @@ -52,9 +52,7 @@ General Overview - new partition schema. This is bound with UBI volume. SWUpdate can recreate UBI volumes, resizing them and - copying the new software. A special UBI volume with the name "data" - is saved and restored after repartitioning with all data - it contains, to maintain user's data. + copying the new software. - support for compressed images, using the zlib and zstd library. tarball (tgz file) are supported. @@ -345,8 +343,6 @@ A run of SWUpdate consists mainly of the following steps: really in the cpio archive. - modify partitions, if required. This consists in a resize of UBI volumes, not a resize of MTD partition. - A volume with the name "data" is saved and restored after - resizing. - runs pre-install scripts - iterates through all images and call the corresponding handler for installing on target. diff --git a/include/flash.h b/include/flash.h index e180e79..2999c8d 100644 --- a/include/flash.h +++ b/include/flash.h @@ -15,9 +15,6 @@ #include "bsdqueue.h" #define DEFAULT_CTRL_DEV "/dev/ubi_ctrl" -#define UBI_DATA_VOLNAME "data" -#define UBI_DATACPY_VOLNAME "datacpy" -#define MTD_FS_DEVICE 7 struct ubi_part { struct ubi_vol_info vol_info;