From: Michał Kępień <openwrt@kempniu.pl>
Date: Mon, 13 May 2024 17:26:15 +0000 (+0200)
Subject: tools: remove kernel2minor
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=77106faa37b9cdfe9468c82e31d289fd3f06192b;p=openwrt%2Fstaging%2Fansuel.git

tools: remove kernel2minor

Since the Yafut tool is now used for both updating the kernel on
MikroTik devices with NAND flash and preparing firmware images for
MikroTik devices with NOR flash, remove the kernel2minor utility from
the tree as it is no longer used for anything.

Signed-off-by: Michał Kępień <openwrt@kempniu.pl>
Link: https://github.com/openwrt/openwrt/pull/13453
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index f2c3f76f91..c3c7a3c6dc 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -430,14 +430,6 @@ define Build/jffs2
 	@mv $@.new $@
 endef
 
-define Build/kernel2minor
-	$(eval temp_file := $(shell mktemp))
-	cp $@ $(temp_file)
-	kernel2minor -k $(temp_file) -r $(temp_file).new $(1)
-	mv $(temp_file).new $@
-	rm -f $(temp_file)
-endef
-
 define Build/yaffs-filesystem
 	let \
 		kernel_size="$$(stat -c%s $@)" \
diff --git a/tools/Makefile b/tools/Makefile
index f4e749d710..009778a495 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -82,7 +82,6 @@ tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_ath79),y) += lzma-old s
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_mxs),y) += elftosb sdimage
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_realtek),y) += 7z
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_tegra),y) += cbootimage cbootimage-configs
-tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USES_MINOR),y) += kernel2minor
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USES_MINOR),y) += yafut
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USE_SPARSE),y) += sparse
 tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USE_LLVM_BUILD),y) += llvm-bpf
diff --git a/tools/kernel2minor/Makefile b/tools/kernel2minor/Makefile
deleted file mode 100644
index 69108f43df..0000000000
--- a/tools/kernel2minor/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2016 adron@yapic.net
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=kernel2minor
-PKG_VERSION:=0.25
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=https://github.com/adron-s/kernel2minor.git
-PKG_MIRROR_HASH:=4e59e6e9883a17b90d09d4b6df0cbff83badad9a0e148dfa730abafce000128d
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1e5a52c7941945f6d64807ebca4a5923ba5466bd
-PKG_HASH:=33ca413403a3341af0c9a8e6d9bb58f4ad080a5339e8a8729b83637d35bfaf1b
-
-include $(INCLUDE_DIR)/host-build.mk
-
-define Host/Install
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/kernel2minor $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
-	rm -f $(STAGING_DIR_HOST)/bin/kernel2minor
-endef
-
-$(eval $(call HostBuild))