From patchwork Wed Jul 17 06:02:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1133122 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kneOECnI"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VVxYSc/e"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 45pRWM1ymPz9sLt for ; Wed, 17 Jul 2019 16:02:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date: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=Ki1Zp5VUYwmpTq2qtCePErDquzfYwlMm+hVzQWXCoJQ=; b=kneOECnInc9Nvv 5yImUIIjT+U6kYNpX8X6fm7DYnl+0UVdWs22oB5EIcto1nQbj1VXPALTpTeTzfGF/LabelBSp2rZw Hl8gz4B6/egYgtich0OvSlEzHaM54LFQ4weqnk+HRhdaUYcrGYIAUeFA8XxSF3FrzskXHSRq0TT8F W8sERC8fs4pPjXY0iNaoK6SexmE6Q6yW9F3XXZAFiffJKeOlVNxK4wCAXvi2V5OBzvVy5iI+9Upwq r7zaz/gJ/dIOsSTBEkARz4sGxZURZqyVnO1q8A836nmS0kwYVRbBRU2+rJVw5+mgxDHkBbNMAv8jL R1ElWIEkjMNlXE0Hew6Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnd1E-0002ro-P1; Wed, 17 Jul 2019 06:02:24 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnd1B-0002rR-NR for openwrt-devel@lists.openwrt.org; Wed, 17 Jul 2019 06:02:23 +0000 Received: by mail-lf1-x141.google.com with SMTP id v85so15459070lfa.6 for ; Tue, 16 Jul 2019 23:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tx3qcrwb0Cl/A16bzVLhssiY3Kus8frebf0fYKXhfCo=; b=VVxYSc/eGiVLR/Wr8HPFaWnGFwLIkXTuIVydqa17dX+jbWxay33qs8DwEEVeY5nEV4 od9htfDa/k0tubRthJbvm3XuPXecsJ5OfH5RkCpZ7igPa86QBPQOVNJiM9jv201MBJoK GdVh/3It18YG+ucbBh4rXCI7O/BpJ8zhN3E/02tZWfwgzj5MN5fdUU81/4ibW5w5O3Es adI5IJtQSHXAmkhl3N0+1Im7MZLmY4+Ge2RQ3kKRxdbhSTUPeSxVGyBztVGtWoa+VCyx f3DxCidJAUBz/x9mPfqvDC6BeG52HsgwJ/3fl0Bce1mS7cYqbgNmOc0zdCoFz39ZXZN5 o4yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tx3qcrwb0Cl/A16bzVLhssiY3Kus8frebf0fYKXhfCo=; b=EvlQF8l+5bbGvO9MxR+MX4PH6wkylhQ/kfq6OP7wfbQGCEIFvtYQGmkC97rGGHFki6 tBc7QnVbhHBpxXy3y9RqBMpm0jzEAAh9rVVJijMZuq2mXgigjSnjwarXob9YDxBwBezt krpfr2liw1XXlhYHVOAxd+Q1axkGSbnRHff1SMX0lU5NVabbk4baJtq0xJbP8FAdvIZS n9vFX/DOmbJfJbHfJ57lKmgBoKWwyDCrd69cz8FwnD80JTTmUxktlW/aTCVqhrN2UwN7 8hicOCXXWtyWaUELxpVinlZ3cNuuP82xMLTI7Sg7kNOct6P6TLkQfEMboUkjgcS3g8TL WzJg== X-Gm-Message-State: APjAAAWwkkIuEzNFRVOPJUYi72anHVueffE3MGa6SO+5uc9RROnogdoU iX3/uNB/UggTCNDqHjVdbZq1vt4a X-Google-Smtp-Source: APXvYqxHoJ47wv7u4OMFxXVo+GejXLjcX9InXdGOUPNNf8PDxDcbLoLKwAMTZ8gZCAmfDTxjIbzx3Q== X-Received: by 2002:ac2:44c5:: with SMTP id d5mr17195896lfm.134.1563343339550; Tue, 16 Jul 2019 23:02:19 -0700 (PDT) Received: from localhost.localdomain (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id m28sm4201996ljb.68.2019.07.16.23.02.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 23:02:18 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Date: Wed, 17 Jul 2019 08:02:05 +0200 Message-Id: <20190717060205.18414-1-zajec5@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190716_230221_800218_31B13FCB X-CRM114-Status: UNSURE ( 8.96 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:141 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) 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_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH] layerscape: sysupgrade: get rid of platform_pre_upgrade() X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki 1) RAMFS_COPY_BIN and RAMFS_COPY_DATA can be defined at top of the file like it's done for all other targets. 2) fw_printenv.lock can be created one step later in the platform_do_upgrade(). It seems to be working well on many other targets. Signed-off-by: Rafał Miłecki --- .../base-files/lib/upgrade/platform.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/target/linux/layerscape/base-files/lib/upgrade/platform.sh b/target/linux/layerscape/base-files/lib/upgrade/platform.sh index 1c924997e6..8236a12bea 100644 --- a/target/linux/layerscape/base-files/lib/upgrade/platform.sh +++ b/target/linux/layerscape/base-files/lib/upgrade/platform.sh @@ -1,8 +1,11 @@ - #!/bin/sh # # Copyright 2015-2019 Traverse Technologies # + +RAMFS_COPY_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /usr/sbin/ubinfo /bin/echo" +RAMFS_COPY_DATA="/etc/fw_env.config /var/lock/fw_printenv.lock" + platform_do_upgrade_traverse_nandubi() { bootsys=$(fw_printenv bootsys | awk -F= '{{print $2}}') newbootsys=2 @@ -39,6 +42,10 @@ platform_check_image() { platform_do_upgrade() { local board=$(board_name) + # Force the creation of fw_printenv.lock + mkdir -p /var/lock + touch /var/lock/fw_printenv.lock + case "$board" in traverse,ls1043v | \ traverse,ls1043s) @@ -49,11 +56,3 @@ platform_do_upgrade() { ;; esac } -platform_pre_upgrade() { - # Force the creation of fw_printenv.lock - mkdir -p /var/lock - touch /var/lock/fw_printenv.lock - - export RAMFS_COPY_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /usr/sbin/ubinfo /bin/echo ${RAMFS_COPY_BIN}" - export RAMFS_COPY_DATA="/etc/fw_env.config /var/lock/fw_printenv.lock ${RAMFS_COPY_DATA}" -}