[Buildroot] [PATCH 2/2] package/memtest86: rename package to memtest86plus

[Brandon Maier via buildroot <buildroot@buildroot.org>]

From: Kalpesh Panchal <kalpesh.panchal2@collins.com>

Memtest86+, is a development fork of the original MemTest86.
But now, MemTest86(https://www.memtest86.com/) and
Memtest86+(https://memtest.org/) are two different tools and
maintained separately. The intention of this package is to use
opensource version Memtest86+. So to avoid confusion the package
is renamed to memtest86plus like the name on github.

Signed-off-by: Kalpesh Panchal <kalpesh.panchal2@collins.com>
Signed-off-by: Abhishek Anand <abhishek.anand@collins.com>
Signed-off-by: Brandon Maier <brandon.maier@collins.com>
---
 Config.in.legacy                              |  8 +++++
 DEVELOPERS                                    |  2 +-
 package/Config.in                             |  2 +-
 package/memtest86/memtest86.mk                | 30 -------------------
 .../{memtest86 => memtest86plus}/Config.in    |  8 ++---
 .../memtest86plus.hash}                       |  2 +-
 package/memtest86plus/memtest86plus.mk        | 30 +++++++++++++++++++
 7 files changed, 43 insertions(+), 39 deletions(-)
 delete mode 100644 package/memtest86/memtest86.mk
 rename package/{memtest86 => memtest86plus}/Config.in (87%)
 rename package/{memtest86/memtest86.hash => memtest86plus/memtest86plus.hash} (83%)
 create mode 100644 package/memtest86plus/memtest86plus.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 312d53943c..620d890b15 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -267,6 +267,14 @@ config BR2_PACAKGE_OPENFPGALOADER_CMSIS
 
 comment "Legacy options removed in 2023.02"
 
+config BR2_PACKAGE_MEMTEST86
+	bool "memtest86 has been renamed"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_LEGACY
+	select BR2_PACKAGE_MEMTEST86PLUS
+	help
+	  memtest86 package has been renamed to memtest86plus.
+
 config BR2_PACKAGE_PUGIXML_HEADER_ONLY
 	bool "pugixml header-only removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index d80931e84a..82fe28551c 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2813,7 +2813,7 @@ F:	package/libcli/
 N:	Steve Kenton <skenton@ou.edu>
 F:	package/dvdauthor/
 F:	package/dvdrw-tools/
-F:	package/memtest86/
+F:	package/memtest86plus/
 F:	package/mjpegtools/
 F:	package/udftools/
 F:	package/xorriso/
diff --git a/package/Config.in b/package/Config.in
index dac5058bbe..eff6d227db 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -556,7 +556,7 @@ endmenu
 	source "package/mdadm/Config.in"
 	source "package/mdevd/Config.in"
 	source "package/mdio-tools/Config.in"
-	source "package/memtest86/Config.in"
+	source "package/memtest86plus/Config.in"
 	source "package/memtester/Config.in"
 	source "package/memtool/Config.in"
 	source "package/mhz/Config.in"
diff --git a/package/memtest86/memtest86.mk b/package/memtest86/memtest86.mk
deleted file mode 100644
index 332157ab26..0000000000
--- a/package/memtest86/memtest86.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-#
-# memtest86
-#
-################################################################################
-
-MEMTEST86_VERSION = 6.20
-MEMTEST86_SITE = $(call github,memtest86plus,memtest86plus,v$(MEMTEST86_VERSION))
-MEMTEST86_LICENSE = GPL-2.0
-MEMTEST86_LICENSE_FILES = LICENSE
-MEMTEST86_INSTALL_IMAGES = YES
-MEMTEST86_INSTALL_TARGET = NO
-
-ifeq ($(BR2_i386),y)
-MEMTEST86_BUILD_DIR = build32
-else
-ifeq ($(BR2_x86_64),y)
-MEMTEST86_BUILD_DIR = build64
-endif
-endif
-
-define MEMTEST86_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(MEMTEST86_BUILD_DIR)
-endef
-
-define MEMTEST86_INSTALL_IMAGES_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/$(MEMTEST86_BUILD_DIR)/memtest.* $(BINARIES_DIR)/
-endef
-
-$(eval $(generic-package))
diff --git a/package/memtest86/Config.in b/package/memtest86plus/Config.in
similarity index 87%
rename from package/memtest86/Config.in
rename to package/memtest86plus/Config.in
index 81c69e0222..912c4ce2ec 100644
--- a/package/memtest86/Config.in
+++ b/package/memtest86plus/Config.in
@@ -1,13 +1,9 @@
-config BR2_PACKAGE_MEMTEST86
-	bool "memtest86"
+config BR2_PACKAGE_MEMTEST86PLUS
+	bool "memtest86plus"
 	depends on BR2_i386 || BR2_x86_64
 	help
 	  Memtest86+ is a bootable standalone memory test program.
 
-	  Buildroot does not support packages with a '+' sign in their
-	  name, which explains why it is named memtest86 and not
-	  memtest86+.
-
 	  Memtest86+ is a utility designed to test whether your memory
 	  is in working order. It repeatedly writes an enormous amount
 	  of different patterns to all memory locations and reads them
diff --git a/package/memtest86/memtest86.hash b/package/memtest86plus/memtest86plus.hash
similarity index 83%
rename from package/memtest86/memtest86.hash
rename to package/memtest86plus/memtest86plus.hash
index df4699c63b..9e42583fcf 100644
--- a/package/memtest86/memtest86.hash
+++ b/package/memtest86plus/memtest86plus.hash
@@ -1,3 +1,3 @@
 # locally computed using sha256sum
-sha256  463b2db66128e45c96be76136272e2ee940f1319804b1b88cc2ef04edccd01d8  memtest86+-6.20.tar.gz
+sha256  463b2db66128e45c96be76136272e2ee940f1319804b1b88cc2ef04edccd01d8  memtest86plus-6.20.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE
diff --git a/package/memtest86plus/memtest86plus.mk b/package/memtest86plus/memtest86plus.mk
new file mode 100644
index 0000000000..ad3c5c5b4c
--- /dev/null
+++ b/package/memtest86plus/memtest86plus.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# memtest86plus
+#
+################################################################################
+
+MEMTEST86PLUS_VERSION = 6.20
+MEMTEST86PLUS_SITE = $(call github,memtest86plus,memtest86plus,v$(MEMTEST86PLUS_VERSION))
+MEMTEST86PLUS_LICENSE = GPL-2.0
+MEMTEST86PLUS_LICENSE_FILES = LICENSE
+MEMTEST86PLUS_INSTALL_IMAGES = YES
+MEMTEST86PLUS_INSTALL_TARGET = NO
+
+ifeq ($(BR2_i386),y)
+MEMTEST86PLUS_BUILD_DIR = build32
+else
+ifeq ($(BR2_x86_64),y)
+MEMTEST86PLUS_BUILD_DIR = build64
+endif
+endif
+
+define MEMTEST86PLUS_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(MEMTEST86PLUS_BUILD_DIR)
+endef
+
+define MEMTEST86PLUS_INSTALL_IMAGES_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/$(MEMTEST86PLUS_BUILD_DIR)/memtest.* $(BINARIES_DIR)/
+endef
+
+$(eval $(generic-package))
-- 
2.41.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot