From patchwork Mon Oct 26 19:41:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1388047 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=MxxdFUfW; 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 4CKld03M75z9sRR for ; Tue, 27 Oct 2020 06:43:32 +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=DlfHiuYNKPQd9pT+c/7Gu0ba6pLNZ47/4aQNARlzeuI=; b=MxxdFUfWUTjCLx4dZ4WSdrC9HH MDLRr5xVUDAo0LgE8/TQ/ye5dyi9ibhotRXWpiEQQO7Ytk3BKMKahMcQjk2Ia+0qlYLfp+p2b8Fiz mFG4JqFybZwjiXJVSzQy1isAMy1wyMRfJ2Vy8nsjh8aXV4fdBhh0VnLWhCfQ6Z7lNuXZ9TmpPr8od lXe156XkAq+DBdVvvhq616OlrHuy54lBHpwof5TO1NXmKItuSAmALdOVh4PmVuwlisk8V1J7+BhL2 vvOsKGLEJOzXvBT2m3lKpk4xPM6AWhbe7MNIvwUpZIoZzTbGOUby6sri+Ildk8vC7AlDYgpz/xlDX jtuGS7FA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX8Ng-0003E7-6x; Mon, 26 Oct 2020 19:42:12 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX8Nc-0003CO-4u for openwrt-devel@lists.openwrt.org; Mon, 26 Oct 2020 19:42:09 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MgNpJ-1jty8w1WLH-00hzHD for ; Mon, 26 Oct 2020 20:42:05 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] image: drop obsolete legacy image recipes Date: Mon, 26 Oct 2020 20:41:02 +0100 Message-Id: <20201026194102.46013-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:2ipPc2SLbLgryT/byk19fx7qZ59pllKlMUpMZfFTatVkUflbpJT +xRf46WyegTC9gr9MTRyYhwn1lUIJfumWgE1+OdVjKlWUZtr4t+C7sfa4wtGQVsmW72fsb5 /oEs1aEr1fpPa6MujdScvsW3jyzAQnlli+ftUJ0rClsW1VbU32elpXVyc6OqTsIMhy6WI+E 4BV9UkVs83OQCoYUKJcTQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:vEbqTuJOQG8=:g1Bdmzizs+70zOTZf8nM/F iKc8E8xXY5cybRtoKiiIhtjVPZWTtVOXJtgpb0sAjj0csiqq3Q52/LIlwP2yNcw+lbfIh1fjz aOb5pXJPXQ0cG3PZ57XKs8sMsbXPLxJ+xM/pH04XbYDgC8cxc70h0jHU7qmS7hxPC8Wv7WJqF 9wv1ejvDw7vCZfIdl6NtkAs/7FuPPgyAHpErpEAHvqj3JOFmKPeYLsu2dvV/BfEmdmsLycU6C 3z/todka8kVMaNqdfc+XZ3iVRRGV+4ooeI+zjQT6aU2Tbc3CtZnB2n1hE0xn24YC1avxDP2eY F+aiWQsqFQVjr6epQlAJ2BVUwalftUeCeqSI13FkJu9DbLazDq0RLOkFMWmI5x13P0UBh4xjR vaZfWIZMIWw/6EhGHD6TVKQsyMPl/JXOHuCMhP7b06AqRhG9w1LcclhM95sSbhzIYyrpxIsqu ciI1/ExtuQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_154208_469082_DC1B8078 X-CRM114-Status: GOOD ( 11.45 ) 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.24 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.24 listed in wl.mailspike.net] -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 LegacyDevice is not used anymore in our tree, so let's drop it together with the relevant definitions and recipes. Signed-off-by: Adrian Schmutzler --- include/image-legacy.mk | 93 ----------------------------------------- include/image.mk | 11 ----- 2 files changed, 104 deletions(-) delete mode 100644 include/image-legacy.mk diff --git a/include/image-legacy.mk b/include/image-legacy.mk deleted file mode 100644 index 1ccaec09b0..0000000000 --- a/include/image-legacy.mk +++ /dev/null @@ -1,93 +0,0 @@ -ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) - define Image/mkfs/ubifs/generate - $(CP) ./ubinize$(1).cfg $(KDIR) - ( cd $(KDIR); \ - $(STAGING_DIR_HOST)/bin/ubinize \ - $(if $($(PROFILE)_UBI_OPTS),$($(PROFILE)_UBI_OPTS),$(shell echo $(UBI_OPTS))) \ - -o $(KDIR)/root$(1).ubi \ - ubinize$(1).cfg \ - ) - endef - - define Image/mkfs/ubifs/legacy - - $(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS), - $(STAGING_DIR_HOST)/bin/mkfs.ubifs \ - $(if $($(PROFILE)_UBIFS_OPTS),$($(PROFILE)_UBIFS_OPTS),$(UBIFS_OPTS)) \ - $(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--compr=none) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--compr=lzo) \ - $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--compr=zlib) \ - $(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \ - --squash-uids \ - -o $(KDIR)/root.ubifs \ - -d $(TARGET_DIR) - ) - $(call Image/Build,ubifs) - - $(if $($(PROFILE)_UBI_OPTS)$(UBI_OPTS), - $(if $(wildcard ./ubinize.cfg),$(call Image/mkfs/ubifs/generate,)) - $(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay)) - ) - $(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi)) - endef -endif - -LegacyDevice/Dump = $(Device/Dump) - -define LegacyDevice/Check - $(Device/Check/Common) - _TARGET_PREPARE := $$(if $$(_PROFILE_SET),legacy-images-prepare,prepare-disabled) - _TARGET := $$(if $$(_PROFILE_SET),legacy-images,install-disabled) - $$(if $$(_PROFILE_SET),install: legacy-images-make) - ifndef IB - $$(if $$(_PROFILE_SET),kernel_prepare: legacy-images-prepare-make) - endif -endef - -ifdef TARGET_PER_DEVICE_ROOTFS - define Image/Build/Profile/Filesystem - cp $(KDIR)/root.$(2)+pkg=$(3) $(KDIR)/root.$(2) - $(call Image/Build/$(2),$(2)) - $(call Image/Build/Profile,$(1),$(2)) - endef -else - Image/Build/Profile/Filesystem = $(Image/Build/Profile) -endif - -define LegacyDevice/Build - $$(_TARGET): legacy-image-$(1) - $$(_TARGET_PREPARE): legacy-image-prepare-$(1) - .PHONY: legacy-image-prepare-$(1) legacy-image-$(1) - - legacy-image-prepare-$(1): - $$(call Image/Prepare/Profile,$(1)) - - ifndef IB - ifdef CONFIG_TARGET_PER_DEVICE_ROOTFS - ROOTFS/$(1) := $(foreach fs,$(TARGET_FILESYSTEMS), \ - $(KDIR)/root.$(fs)$$(strip $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),+pkg=$$(ROOTFS_ID/$(1)))) \ - ) - - $$(ROOTFS/$(1)): target-dir-$$(ROOTFS_ID/$(1)) - legacy-images-make: $$(if $$(_PROFILE_SET),$$(ROOTFS/$(1))) - endif - endif - - legacy-image-$(1): - $$(call Image/BuildKernel/Profile,$(1)) - $(foreach fs,$(TARGET_FILESYSTEMS), - $$(call Image/Build/Profile/Filesystem,$(1),$(fs),$$(ROOTFS_ID/$(1))) - ) - -endef - -define LegacyDevice - $(call Device/InitProfile,$(1)) - $(call Device/Default,$(1)) - $(call LegacyDevice/Default,$(1)) - $(call LegacyDevice/$(1),$(1)) - $(call LegacyDevice/Check,$(1)) - $(call LegacyDevice/$(if $(DUMP),Dump,Build),$(1)) - -endef diff --git a/include/image.mk b/include/image.mk index 28f40fe6a9..016f5ca524 100644 --- a/include/image.mk +++ b/include/image.mk @@ -17,7 +17,6 @@ ifndef IB endif endif -include $(INCLUDE_DIR)/image-legacy.mk include $(INCLUDE_DIR)/feeds.mk include $(INCLUDE_DIR)/rootfs.mk @@ -712,8 +711,6 @@ define BuildImage prepare: compile: clean: - legacy-images-prepare: - legacy-images: image_prepare: ifeq ($(IB),) @@ -729,9 +726,6 @@ define BuildImage rm -rf $(BUILD_DIR)/json_info_files $(call Image/Prepare) - legacy-images-prepare-make: image_prepare - $(MAKE) legacy-images-prepare BIN_DIR="$(BIN_DIR)" - else image_prepare: mkdir -p $(BIN_DIR) $(KDIR)/tmp @@ -745,17 +739,12 @@ define BuildImage $(call Image/InstallKernel) $(foreach device,$(TARGET_DEVICES),$(call Device,$(device))) - $(foreach device,$(LEGACY_DEVICES),$(call LegacyDevice,$(device))) install-images: kernel_prepare $(foreach fs,$(filter-out $(if $(UBIFS_OPTS),,ubifs),$(TARGET_FILESYSTEMS) $(fs-subtypes-y)),$(KDIR)/root.$(fs)) $(foreach fs,$(TARGET_FILESYSTEMS), $(call Image/Build,$(fs)) ) - legacy-images-make: install-images - $(call Image/mkfs/ubifs/legacy) - $(MAKE) legacy-images BIN_DIR="$(BIN_DIR)" - install: install-images $(call Image/Manifest)