From patchwork Mon Oct 7 08:22:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1172650 X-Patchwork-Delegate: ynezz@true.cz 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=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WxoxBGru"; 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 46mtlC69jcz9sPJ for ; Mon, 7 Oct 2019 19:22:47 +1100 (AEDT) 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:In-Reply-To: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:References: List-Owner; bh=HgGa/7WgBYBGSAAUtWP1YFAsxQaCycv+WpZy3r5vGLU=; b=WxoxBGru+Rl62H n90t6iEZ7dnvEBfDY4CQGjJiY9RO6ELMzI86HnP2Jea0x+Wn4rq/5xyUvJbtD566M2KocZp7W2CC+ HbEAeib90LcGp8qRwd9PuivhNvR+No0d+fb0zrMjLWjDHdeYKMDnUiD32shhgY9c99YS/OFcjXZYR X7yywZhJOT3ORcbPjjPXOUskEQA0sHe7WWH38KRUrqDQ4E9BIZYp1iB8VYuelGtlUxuEqzNJM8+lS lPUvyZ33WivmsyR33KEE80/CbcZZwjaMh6fhnkmcb+4++Z1+pvxQAJTUJcwLXUDIUXCPBTLeWOFpe oAorF+kZhBuPzcki2s9w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHOHk-0006JP-Sd; Mon, 07 Oct 2019 08:22:28 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHOHg-0006It-PD for openwrt-devel@lists.openwrt.org; Mon, 07 Oct 2019 08:22:26 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 1E8CD4D9B; Mon, 7 Oct 2019 10:22:19 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 40160a65; Mon, 7 Oct 2019 10:22:09 +0200 (CEST) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 10:22:04 +0200 Message-Id: <20191007082204.30380-1-ynezz@true.cz> MIME-Version: 1.0 In-Reply-To: <7b533443-c8d0-69ac-66fd-4602c423fade@aparcar.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_012224_972973_1249ED30 X-CRM114-Status: UNSURE ( 5.26 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.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 [178.217.244.18 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH] ath79: make UBNT Nano/Loco AC factory images reproducible 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?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Current factory images are built on top of sysupgrade images which contains metadata which are causing image reproducibility issues, so let's build factory images from the scratch. While at it, refactor the shared vars into common base as well. Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-October/019205.html Reported-by: Paul Spooren Signed-off-by: Petr Štetiar --- target/linux/ath79/image/generic-ubnt.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 6ae766e29331..9ab11324b411 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -114,40 +114,40 @@ define Device/ubnt_bullet-m-xw endef TARGET_DEVICES += ubnt_bullet-m-xw +define Device/ubnt-nano-ac + DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct + IMAGE_SIZE := 15744k + IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ + append-rootfs | pad-rootfs | mkubntimage-split | \ + check-size $$$$(IMAGE_SIZE) +endef + define Device/ubnt_lap-120 $(Device/ubnt-wa) DEVICE_MODEL := LiteAP ac DEVICE_VARIANT := LAP-120 - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct - IMAGE_SIZE := 15744k - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split + $(Device/ubnt-nano-ac) endef TARGET_DEVICES += ubnt_lap-120 define Device/ubnt_nanobeam-ac $(Device/ubnt-wa) DEVICE_MODEL := NanoBeam AC - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct - IMAGE_SIZE := 15744k - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split + $(Device/ubnt-nano-ac) endef TARGET_DEVICES += ubnt_nanobeam-ac define Device/ubnt_nanostation-ac $(Device/ubnt-wa) DEVICE_MODEL := Nanostation AC - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct - IMAGE_SIZE := 15744k - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split + $(Device/ubnt-nano-ac) endef TARGET_DEVICES += ubnt_nanostation-ac define Device/ubnt_nanostation-ac-loco $(Device/ubnt-wa) DEVICE_MODEL := Nanostation AC loco - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct - IMAGE_SIZE := 15744k - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split + $(Device/ubnt-nano-ac) endef TARGET_DEVICES += ubnt_nanostation-ac-loco