From patchwork Tue May 10 14:35:39 2016 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: 620663 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r42005T7zz9t4Z for ; Wed, 11 May 2016 00:37:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=vgL03CbB; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b08lp-0006Bn-FM; Tue, 10 May 2016 14:36:21 +0000 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b08lh-0005mQ-Fs for lede-dev@lists.infradead.org; Tue, 10 May 2016 14:36:19 +0000 Received: by mail-lf0-x230.google.com with SMTP id m64so17209952lfd.1 for ; Tue, 10 May 2016 07:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6ZUFyMNvmeXpZN3XvTFc7Um7NhuCW8MprmQ5P2RDRr4=; b=vgL03CbBw76H7uw3wzTC2KT6wD0CcD7Vtnb+HyJ3lP3tngAO+P1oXI8+chTVfcsWuk fdaGvSCBAzr2QxeIFTJTBhfqYh7CTlrTyV9n75IXGY5RAkuDGVf3aFK+wTGhL85Q+2db dFp3iBfjIhBh8+EVygnkg5qzmOUyiyIX4zaMtlNe/8+cD0Z7FDyEOh6R5PQvVnDAP0UG iedUJfJr8+Xmp+/E1KC6yVmoYn7y2+7q5YBxwAMYpdf+CHV25fs3ffdKkjKdqWfJWKcK kirmhMgQ5f1hHj3Zkfcgfsm3KCMNDtHYrYt6o84DG6MMk6Yo4NXC97TcPvv9qfp4Z4XT 51aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6ZUFyMNvmeXpZN3XvTFc7Um7NhuCW8MprmQ5P2RDRr4=; b=LLfVFBwJ1MlePUp7vShLWDhWxuey0tMDfAPoDYU+epCbL1qurIyAw4czfx/9kR4/64 NY7Fg8WBv/oub04UjAvV1pDYtgrdBi6VHCmtZZqM1eVKPO8+BuI5y450/+0IL9aHN8kj X7WsCzBkQHvhPodGPgv4Zb7nQLxcedhof1teZh0tmYYZ1Stbb/sRTG2bKZnhFhvPTMSE kj1XWA7Z6sMouEpN2kOsWvq8wlbkHBNRfnaWuxf0PKr4PfTgWFwesFJXLKfJ4tQshdS8 GwdqGU2vgbEctWzjGF13QQU+ii6l0Jto9oOX/+QIUZWaPVmK7aoSaOq5NHzWYvKcuYvg Atng== X-Gm-Message-State: AOPr4FXbCdIjDYF+2fDVxk50z6gfFhIUPWvDJ+KSskxi2bQ8vJiiFxZE6OsevJqUl2PQUA== X-Received: by 10.25.82.73 with SMTP id g70mr17260570lfb.87.1462890950325; Tue, 10 May 2016 07:35:50 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id h16sm448623lfb.7.2016.05.10.07.35.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 May 2016 07:35:49 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: openwrt-devel@lists.openwrt.org, lede-dev@lists.infradead.org Date: Tue, 10 May 2016 16:35:39 +0200 Message-Id: <1462890939-8458-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160510_073613_985211_0DDD03EA X-CRM114-Status: GOOD ( 10.42 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:230 listed in] [list.dnswl.org] -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 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 Subject: [LEDE-DEV] [PATCH] mtd: imagetag: fix compilation with changed mtd_fixtrx call X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Function mtd_fixtrx was changed during trx improvements. Signed-off-by: Rafał Miłecki --- package/system/mtd/src/imagetag.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/system/mtd/src/imagetag.c b/package/system/mtd/src/imagetag.c index b850837..2ad2076 100644 --- a/package/system/mtd/src/imagetag.c +++ b/package/system/mtd/src/imagetag.c @@ -288,7 +288,7 @@ trx_check(int imagefd, const char *mtd, char *buf, int *len) } int -mtd_fixtrx(const char *mtd, size_t offset) +mtd_fixtrx(const char *mtd, size_t offset, size_t data_size) { int fd; struct bcm_tag *tag; @@ -299,6 +299,9 @@ mtd_fixtrx(const char *mtd, size_t offset) uint32_t imagecrc, rootfscrc, headercrc; cfelen = imagelen = imagestart = imagecrc = rootfscrc = headercrc = rootfslen = 0; + if (data_size) + fprintf(stderr, "Specifying data size in unsupported for imagetag\n"); + if (quiet < 2) fprintf(stderr, "Trying to fix trx header in %s at 0x%x...\n", mtd, offset);