From patchwork Mon Oct 26 19:37:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1388042 X-Patchwork-Delegate: freifunk@adrianschmutzler.de 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=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=PDlJe0BR; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4CKlZh2BB3z9sRR for ; Tue, 27 Oct 2020 06:41:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; 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:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=QWxN/SDDGSlW5cpfNKLpD1Mgn830QY9B0PjoMhdxfFQ=; b=PDlJe0BRMZ1jw+1V7q1H+h/BeJ VngttgLMkYYLfeDUKfJuYBoGvJp0IMq4BrXjY1ir9mCOoV9M39sC9F4kenPMt8manyn5ITYAe/QAc OQ5FDmRY3xQlcMgScVBwlwMOfBnc9cqATyzFXfZbGsWkDLed9DV5UJ7uApK5BP/wV1ahQdqytT8F8 5rFAnIVwvSRsASnstvWbOnvvqHdRojHPJRSHSjbKQnZVhkk9hdT6yecYvzt1r1YazmpMCD9z4hEIs 6dPFktbMndaP2bjykz0aIxic3EP6TdfBmilezZRopUv5P7Zm3S9o69lQ8gUGpRflvckto/ez93MO1 sdRrXwLQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX8KZ-0001ql-BT; Mon, 26 Oct 2020 19:38:59 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX8KE-0001gV-EK for openwrt-devel@lists.openwrt.org; Mon, 26 Oct 2020 19:38:51 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MEVBc-1kdAzD2ce2-00G2tk for ; Mon, 26 Oct 2020 20:38:33 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] image: drop unused legacy NAND build recipes Date: Mon, 26 Oct 2020 20:37:43 +0100 Message-Id: <20201026193743.45723-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:gTmGqQ0ccl7lbF5oo2z/zZPp+z1AUxLnPXb2FK6+QIl93u+BFs3 BzZMer1SfummRU48wjUe2nuu+t6i3jb+W4ba/XSm8h+8yZ4mISF0luDCV6EFlyO2qqwQOv2 tz7m3I/RJMvjyNSjQpIWoJiDvCQ3VzaQ/bQWNbZ+geGTDPcVc9Gl/qtDCY3wD2sIT28/n7e OJV1OlPDucRA7kr+2ieiw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:bbjIYmx/8M0=:v1Uq/S55s5RnDIX4UJdHrX ytWpxTxkxBSQuQMMPgsMY9BCotaXvuisjy115lddtqeUusd51VO2+OdxKD0AMz6hvyv24RXC/ IjOSlsHxvoaHockrCwLqFxMPzsAXMXbXXRwFbOmYSNTRxFWBgCrJSEumXKqWFvyb2LcLfo0HW Jr3uHVnkjlyI37MwgrtxhTEb2Gqph5TFNrUc+R4An5FAD+FUCv2uftu44Q/zrWHS+i3xab2qK ef1zizgV6lcTz4qrF4qHkpa2zLVwGasmiEYFraYpw87ABOagRBoxUnoxF8IhTrXSV/j9S8eT/ p9Am83vUEu+bFY9t943StzgMkN+qDZPkyeBtmrUxs2v1D8YrnL1kjWxZU/Y2GMqN/0j0+aWO3 e6LyqjZWVSR0oh/Vo6escAxv2wS/F/dqSOwVxqt1m7wREa8V34aKTskYCmUXVjPRyCrPGbQEW 9HLwxcoxQw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_153838_766583_FD0C948C X-CRM114-Status: UNSURE ( 8.64 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.10 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.10 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 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 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 This drops unused legacy recipes Image/Build/SysupgradeNAND and Image/Build/UbinizeImage. Signed-off-by: Adrian Schmutzler --- include/image.mk | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/include/image.mk b/include/image.mk index 016f5ca524..eb047041fc 100644 --- a/include/image.mk +++ b/include/image.mk @@ -257,35 +257,6 @@ define Image/mkfs/squashfs endef endif -# $(1): board name -# $(2): rootfs type -# $(3): kernel image -# $(4): compat string -ifneq ($(CONFIG_NAND_SUPPORT),) - define Image/Build/SysupgradeNAND - mkdir -p "$(KDIR_TMP)/sysupgrade-$(if $(4),$(4),$(1))/" - echo "BOARD=$(if $(4),$(4),$(1))" > "$(KDIR_TMP)/sysupgrade-$(if $(4),$(4),$(1))/CONTROL" - [ -z "$(2)" ] || $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(if $(4),$(4),$(1))/root" - [ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(if $(4),$(4),$(1))/kernel" - (cd "$(KDIR_TMP)"; $(TAR) cvf \ - "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(if $(4),$(4),$(1)) \ - $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ - ) - endef - -# $(1) board name -# $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage) -# $(3) rootfstype (e.g. squashfs or ubifs) -# $(4) options to pass-through to ubinize (i.e. $($(PROFILE)_UBI_OPTS))) - define Image/Build/UbinizeImage - sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \ - "$(KDIR)/root.$(3)" \ - "$(KDIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \ - $(4) - endef - -endif - define Image/mkfs/ubifs $(STAGING_DIR_HOST)/bin/mkfs.ubifs \ $(UBIFS_OPTS) $(call param_unmangle,$(call param_get,fs,$(1))) \