* [Buildroot] [PATCH 1/2] package/memtest86: bump to version 6.20 @ 2023-11-10 20:59 Brandon Maier via buildroot 2023-11-10 21:00 ` [Buildroot] [PATCH 2/2] package/memtest86: rename package to memtest86plus Brandon Maier via buildroot 2023-11-18 18:30 ` [Buildroot] [PATCH 1/2] package/memtest86: bump to version 6.20 Yann E. MORIN 0 siblings, 2 replies; 4+ messages in thread From: Brandon Maier via buildroot @ 2023-11-10 20:59 UTC (permalink / raw) To: buildroot Cc: Steve Kenton, Brandon Maier, Kalpesh Panchal, Thomas Petazzoni, Abhishek Anand From: Kalpesh Panchal <kalpesh.panchal2@collins.com> - bumped package version to 6.20 - as 6.20 prebuilt version is not available on same download site but source code is released at https://github.com/memtest86plus/memtest86plus/releases so updated mk file to download source from git release - prebuilt binary not found in 6.20 package and also README.md does not mention any toolchain limitation for compilation so added source build command depending on 32-bit or 64-bit x86 target. - corrected License file name - installed memtest binaries to image folder like other bootable images(grub , kernel) are copied. - updated config help as per package README.md 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> --- package/memtest86/Config.in | 30 ++++++++++++++++++++++-------- package/memtest86/memtest86.hash | 4 ++-- package/memtest86/memtest86.mk | 26 +++++++++++++++++++------- 3 files changed, 43 insertions(+), 17 deletions(-) diff --git a/package/memtest86/Config.in b/package/memtest86/Config.in index 79c0161020..81c69e0222 100644 --- a/package/memtest86/Config.in +++ b/package/memtest86/Config.in @@ -14,14 +14,28 @@ config BR2_PACKAGE_MEMTEST86 back again and verifies whether the result of the read is the same as what was written to memory. - Memtest86+ will only work on 32-bit or 64-bit x86 targets. - It boots as an i486 program and autodetects hardware. It can - be added to the grub2 boot menu by adding the following - lines to the bottom of /boot/grub/grub.cfg - note the use of - linux16. - - menuentry "Memtest86+" { - linux16 /boot/memtest86+.bin + Memtest86+ will only work on 32-bit or 64-bit x86 targets. It + boots and autodetects hardware. Refer README.md for boot + options. + + It can be loaded and run either directly by a PC BIOS (legacy + or UEFI) or via an intermediate bootloader that supports the + Linux 16-bit, 32-bit, 64-bit, or EFI handover boot protocol. + + It can be added to the grub2 boot menu by adding the following + lines to the bottom of grub.cfg + + Example for legacy BIOS using the Linux 16-bit boot protocol + + menuentry "Start Memtest86+, use built-in support for USB keyboards" { + linux16 /boot/memtest.bin console=ttyS0,115200 keyboard=both + } + + Or for UEFI BIOS using the Linux 32-bit or 64-bit boot + protocols. + + menuentry "Start Memtest86+, use built-in support for USB keyboards" { + linux /EFI/BOOT/memtest.efi console=ttyS0,115200 keyboard=both } Other boot loaders will have similar requirements. diff --git a/package/memtest86/memtest86.hash b/package/memtest86/memtest86.hash index 559ae0ac6c..df4699c63b 100644 --- a/package/memtest86/memtest86.hash +++ b/package/memtest86/memtest86.hash @@ -1,3 +1,3 @@ # locally computed using sha256sum -sha256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 memtest86+-5.01.tar.gz -sha256 2e15e2174b86640d7fbfcb62b51d9182062d9db71d66a46e5b01d736c68150ea README +sha256 463b2db66128e45c96be76136272e2ee940f1319804b1b88cc2ef04edccd01d8 memtest86+-6.20.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/memtest86/memtest86.mk b/package/memtest86/memtest86.mk index eb071cc29d..332157ab26 100644 --- a/package/memtest86/memtest86.mk +++ b/package/memtest86/memtest86.mk @@ -4,15 +4,27 @@ # ################################################################################ -MEMTEST86_VERSION = 5.01 -MEMTEST86_SOURCE = memtest86+-$(MEMTEST86_VERSION).tar.gz -MEMTEST86_SITE = http://www.memtest.org/download/$(MEMTEST86_VERSION) +MEMTEST86_VERSION = 6.20 +MEMTEST86_SITE = $(call github,memtest86plus,memtest86plus,v$(MEMTEST86_VERSION)) MEMTEST86_LICENSE = GPL-2.0 -MEMTEST86_LICENSE_FILES = README +MEMTEST86_LICENSE_FILES = LICENSE +MEMTEST86_INSTALL_IMAGES = YES +MEMTEST86_INSTALL_TARGET = NO -# memtest86+ is sensitive to toolchain changes, use the shipped binary version -define MEMTEST86_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/precomp.bin $(TARGET_DIR)/boot/memtest86+.bin +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)) -- 2.41.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/memtest86: rename package to memtest86plus 2023-11-10 20:59 [Buildroot] [PATCH 1/2] package/memtest86: bump to version 6.20 Brandon Maier via buildroot @ 2023-11-10 21:00 ` Brandon Maier via buildroot 2023-11-18 18:34 ` Yann E. MORIN 2023-11-18 18:30 ` [Buildroot] [PATCH 1/2] package/memtest86: bump to version 6.20 Yann E. MORIN 1 sibling, 1 reply; 4+ messages in thread From: Brandon Maier via buildroot @ 2023-11-10 21:00 UTC (permalink / raw) To: buildroot Cc: Steve Kenton, Brandon Maier, Kalpesh Panchal, Thomas Petazzoni, Abhishek Anand 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/memtest86: rename package to memtest86plus 2023-11-10 21:00 ` [Buildroot] [PATCH 2/2] package/memtest86: rename package to memtest86plus Brandon Maier via buildroot @ 2023-11-18 18:34 ` Yann E. MORIN 0 siblings, 0 replies; 4+ messages in thread From: Yann E. MORIN @ 2023-11-18 18:34 UTC (permalink / raw) To: Brandon Maier Cc: Steve Kenton, Abhishek Anand, Kalpesh Panchal, Thomas Petazzoni, buildroot Kalpesh, Brandon, All, On 2023-11-10 21:00 +0000, Brandon Maier via buildroot spake thusly: > 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. I don't think it makes sense to rename the package as a whole; just change the prompt to refer to memtest86+: # For legacy reasons, the memtest86+ package is just # named memtest86. config BR2_PACKAGE_MEMTEST86 bool "memtest86+" Since we do have a package for memtest86 (old), the renaming is not necessary. And even if we were to add a package for memtest86, then it would conflict with the previous pakcage for memtest86+ anyway, so we could not introduce it as memtest86; we'd need to itroduce it as memetest86-old (or -legacy). So, the renaming is not needed. Regards, Yann E. MORIN. > 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 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/memtest86: bump to version 6.20 2023-11-10 20:59 [Buildroot] [PATCH 1/2] package/memtest86: bump to version 6.20 Brandon Maier via buildroot 2023-11-10 21:00 ` [Buildroot] [PATCH 2/2] package/memtest86: rename package to memtest86plus Brandon Maier via buildroot @ 2023-11-18 18:30 ` Yann E. MORIN 1 sibling, 0 replies; 4+ messages in thread From: Yann E. MORIN @ 2023-11-18 18:30 UTC (permalink / raw) To: Brandon Maier Cc: Steve Kenton, Abhishek Anand, Kalpesh Panchal, Thomas Petazzoni, buildroot Kalpesh, Brandon, All, On 2023-11-10 20:59 +0000, Brandon Maier via buildroot spake thusly: > From: Kalpesh Panchal <kalpesh.panchal2@collins.com> > > - bumped package version to 6.20 > - as 6.20 prebuilt version is not available on same download site but > source code is released at https://github.com/memtest86plus/memtest86plus/releases > so updated mk file to download source from git release > - prebuilt binary not found in 6.20 package and also README.md > does not mention any toolchain limitation for compilation > so added source build command depending on 32-bit or 64-bit x86 target. > - corrected License file name > - installed memtest binaries to image folder like other bootable > images(grub , kernel) are copied. > - updated config help as per package README.md > > 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> Thanks for this patch, here are a few comments: > --- > package/memtest86/Config.in | 30 ++++++++++++++++++++++-------- > package/memtest86/memtest86.hash | 4 ++-- > package/memtest86/memtest86.mk | 26 +++++++++++++++++++------- > 3 files changed, 43 insertions(+), 17 deletions(-) > > diff --git a/package/memtest86/Config.in b/package/memtest86/Config.in > index 79c0161020..81c69e0222 100644 > --- a/package/memtest86/Config.in > +++ b/package/memtest86/Config.in > @@ -14,14 +14,28 @@ config BR2_PACKAGE_MEMTEST86 > back again and verifies whether the result of the read is the > same as what was written to memory. > > - Memtest86+ will only work on 32-bit or 64-bit x86 targets. > - It boots as an i486 program and autodetects hardware. It can > - be added to the grub2 boot menu by adding the following > - lines to the bottom of /boot/grub/grub.cfg - note the use of > - linux16. > - > - menuentry "Memtest86+" { > - linux16 /boot/memtest86+.bin > + Memtest86+ will only work on 32-bit or 64-bit x86 targets. It > + boots and autodetects hardware. Refer README.md for boot > + options. > + > + It can be loaded and run either directly by a PC BIOS (legacy > + or UEFI) or via an intermediate bootloader that supports the > + Linux 16-bit, 32-bit, 64-bit, or EFI handover boot protocol. > + > + It can be added to the grub2 boot menu by adding the following > + lines to the bottom of grub.cfg > + > + Example for legacy BIOS using the Linux 16-bit boot protocol > + > + menuentry "Start Memtest86+, use built-in support for USB keyboards" { > + linux16 /boot/memtest.bin console=ttyS0,115200 keyboard=both > + } > + > + Or for UEFI BIOS using the Linux 32-bit or 64-bit boot > + protocols. > + > + menuentry "Start Memtest86+, use built-in support for USB keyboards" { > + linux /EFI/BOOT/memtest.efi console=ttyS0,115200 keyboard=both > } $ ./utils/docker-run make check-package package/memtest86/Config.in:30: help text: <tab><2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/memtest86/Config.in:31: help text: <tab><2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/memtest86/Config.in:37: help text: <tab><2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/memtest86/Config.in:38: help text: <tab><2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) I've rewrittten the help text to avoid this limitation. > Other boot loaders will have similar requirements. > diff --git a/package/memtest86/memtest86.hash b/package/memtest86/memtest86.hash > index 559ae0ac6c..df4699c63b 100644 > --- a/package/memtest86/memtest86.hash > +++ b/package/memtest86/memtest86.hash > @@ -1,3 +1,3 @@ > # locally computed using sha256sum > -sha256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 memtest86+-5.01.tar.gz > -sha256 2e15e2174b86640d7fbfcb62b51d9182062d9db71d66a46e5b01d736c68150ea README > +sha256 463b2db66128e45c96be76136272e2ee940f1319804b1b88cc2ef04edccd01d8 memtest86+-6.20.tar.gz --------------------------------------------------------------------------------------^ $ make memtest86-source >>> memtest86 6.20 Downloading [...] ERROR: No hash found for memtest86-6.20.tar.gz make[1]: *** [package/pkg-generic.mk:179: /home/ymorin/dev/buildroot/O/next/build/memtest86-6.20/.stamp_downloaded] Error 1 make: *** [Makefile:23: _all] Error 2 I've fixed that as well. > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE > diff --git a/package/memtest86/memtest86.mk b/package/memtest86/memtest86.mk > index eb071cc29d..332157ab26 100644 > --- a/package/memtest86/memtest86.mk > +++ b/package/memtest86/memtest86.mk > @@ -4,15 +4,27 @@ > # > ################################################################################ > > -MEMTEST86_VERSION = 5.01 > -MEMTEST86_SOURCE = memtest86+-$(MEMTEST86_VERSION).tar.gz > -MEMTEST86_SITE = http://www.memtest.org/download/$(MEMTEST86_VERSION) > +MEMTEST86_VERSION = 6.20 > +MEMTEST86_SITE = $(call github,memtest86plus,memtest86plus,v$(MEMTEST86_VERSION)) > MEMTEST86_LICENSE = GPL-2.0 > -MEMTEST86_LICENSE_FILES = README > +MEMTEST86_LICENSE_FILES = LICENSE > +MEMTEST86_INSTALL_IMAGES = YES > +MEMTEST86_INSTALL_TARGET = NO > > -# memtest86+ is sensitive to toolchain changes, use the shipped binary version > -define MEMTEST86_INSTALL_TARGET_CMDS > - $(INSTALL) -m 0755 -D $(@D)/precomp.bin $(TARGET_DIR)/boot/memtest86+.bin > +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)/ When the destination of installation is a directory, one must ensure the directory exists beforehand, with an explicit mkdir first. But here, I've changed that to install the two files explicitly. Applied to next with the above changes, thanks. Regards, Yann E. MORIN. > endef > > $(eval $(generic-package)) > -- > 2.41.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-11-18 18:35 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-11-10 20:59 [Buildroot] [PATCH 1/2] package/memtest86: bump to version 6.20 Brandon Maier via buildroot 2023-11-10 21:00 ` [Buildroot] [PATCH 2/2] package/memtest86: rename package to memtest86plus Brandon Maier via buildroot 2023-11-18 18:34 ` Yann E. MORIN 2023-11-18 18:30 ` [Buildroot] [PATCH 1/2] package/memtest86: bump to version 6.20 Yann E. MORIN
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.