mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-03 00:17:43 +00:00
memtester: convert to gentargets and bump to 4.2.1
Also, memtester requires largefile support [ Thomas: add patch to fix memtester's Makefile at installation stage. Bump to 4.2.1. ] Signed-off-by: Martin Banky <Martin.Banky@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
564e0c7e65
commit
39f7af961a
6
CHANGES
6
CHANGES
@ -6,9 +6,9 @@
|
|||||||
Updated/fixed packages: at, busybox, bzip2, dbus,
|
Updated/fixed packages: at, busybox, bzip2, dbus,
|
||||||
direcfb-examples, dmalloc, cloop, cups, ffmpeg, gdk-pixbuf,
|
direcfb-examples, dmalloc, cloop, cups, ffmpeg, gdk-pixbuf,
|
||||||
hostapd, i2c-tools, input-tools, libconfig, lsof,
|
hostapd, i2c-tools, input-tools, libconfig, lsof,
|
||||||
ltp-testsuite, lvm2, m4, mii-diag, mrouted, openssh, openssl,
|
ltp-testsuite, lvm2, m4, memtester, mii-diag, mrouted,
|
||||||
openvpn, pango, qt, rsync, sdl_gfx, sdl_sound, sysklogd,
|
openssh, openssl, openvpn, pango, qt, rsync, sdl_gfx,
|
||||||
sysvinit, udev, usbutils, xz, zlib
|
sdl_sound, sysklogd, sysvinit, udev, usbutils, xz, zlib
|
||||||
|
|
||||||
New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone
|
New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone
|
||||||
|
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
config BR2_PACKAGE_MEMTESTER
|
config BR2_PACKAGE_MEMTESTER
|
||||||
bool "memtester"
|
bool "memtester"
|
||||||
|
depends on BR2_LARGEFILE
|
||||||
help
|
help
|
||||||
A userspace utility for testing the memory subsystem for faults.
|
A userspace utility for testing the memory subsystem for faults.
|
||||||
|
|
||||||
http://pyropus.ca/software/memtester/
|
http://pyropus.ca/software/memtester/
|
||||||
|
|
||||||
|
comment "memtester requires a toolchain with LARGEFILE support"
|
||||||
|
depends on !BR2_LARGEFILE
|
||||||
|
23
package/memtester/memtester-4.2.1-makefile-fix.patch
Normal file
23
package/memtester/memtester-4.2.1-makefile-fix.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
The a/{b,c} construct doesn't work within make, so let's split the
|
||||||
|
creation of the installation directories in two commands.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
---
|
||||||
|
Makefile | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: memtester-4.2.1/Makefile
|
||||||
|
===================================================================
|
||||||
|
--- memtester-4.2.1.orig/Makefile
|
||||||
|
+++ memtester-4.2.1/Makefile
|
||||||
|
@@ -25,8 +25,9 @@
|
||||||
|
all: memtester
|
||||||
|
|
||||||
|
install: all
|
||||||
|
- mkdir -m 755 -p $(INSTALLPATH)/{bin,man/man8}
|
||||||
|
+ mkdir -m 755 -p $(INSTALLPATH)/bin
|
||||||
|
install -m 755 memtester $(INSTALLPATH)/bin/
|
||||||
|
+ mkdir -m 755 -p $(INSTALLPATH)/man/man8
|
||||||
|
gzip -c memtester.8 >memtester.8.gz ; install -m 644 memtester.8.gz $(INSTALLPATH)/man/man8/
|
||||||
|
|
||||||
|
auto-ccld.sh: \
|
@ -3,45 +3,27 @@
|
|||||||
# memtester
|
# memtester
|
||||||
#
|
#
|
||||||
#############################################################
|
#############################################################
|
||||||
MEMTESTER_VERSION:=4.0.6
|
MEMTESTER_VERSION = 4.2.1
|
||||||
MEMTESTER_SOURCE:=memtester-$(MEMTESTER_VERSION).tar.gz
|
MEMTESTER_SOURCE = memtester-$(MEMTESTER_VERSION).tar.gz
|
||||||
MEMTESTER_SITE:=http://pyropus.ca/software/memtester/old-versions/
|
MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions/
|
||||||
MEMTESTER_DIR:=$(BUILD_DIR)/memtester-$(MEMTESTER_VERSION)
|
|
||||||
MEMTESTER_BINARY:=memtester
|
|
||||||
MEMTESTER_TARGET_BINARY:=usr/bin/memtester
|
|
||||||
|
|
||||||
$(DL_DIR)/$(MEMTESTER_SOURCE):
|
MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr
|
||||||
$(call DOWNLOAD,$(MEMTESTER_SITE),$(MEMTESTER_SOURCE))
|
|
||||||
|
|
||||||
memtester-source: $(DL_DIR)/$(MEMTESTER_SOURCE)
|
define MEMTESTER_BUILD_CMDS
|
||||||
|
$(SED) "s,cc,$(TARGET_CC)," $(@D)/conf-*
|
||||||
|
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||||
|
endef
|
||||||
|
|
||||||
$(MEMTESTER_DIR)/.unpacked: $(DL_DIR)/$(MEMTESTER_SOURCE)
|
define MEMTESTER_INSTALL_TARGET_CMDS
|
||||||
$(ZCAT) $(DL_DIR)/$(MEMTESTER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
$(MAKE) $(MEMTESTER_TARGET_INSTALL_OPTS) -C $(@D) install
|
||||||
#toolchain/patch-kernel.sh $(MEMTESTER_DIR) package/memtester/ memtester\*.patch
|
endef
|
||||||
$(SED) "s,cc,$(TARGET_CC)," $(MEMTESTER_DIR)/conf-*
|
|
||||||
touch $(MEMTESTER_DIR)/.unpacked
|
|
||||||
|
|
||||||
$(MEMTESTER_DIR)/$(MEMTESTER_BINARY): $(MEMTESTER_DIR)/.unpacked
|
define MEMTESTER_UNINSTALL_TARGET_CMDS
|
||||||
$(MAKE) -C $(MEMTESTER_DIR)
|
rm -f $(TARGET_DIR)/usr/bin/memtester
|
||||||
$(STRIPCMD) $(MEMTESTER_DIR)/$(MEMTESTER_BINARY)
|
endef
|
||||||
|
|
||||||
$(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY): $(MEMTESTER_DIR)/$(MEMTESTER_BINARY)
|
define MEMTESTER_CLEAN_CMDS
|
||||||
$(INSTALL) -m 0755 -D $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY)
|
-$(MAKE) -C $(@D) clean
|
||||||
|
endef
|
||||||
|
|
||||||
memtester: $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY)
|
$(eval $(call GENTARGETS,package,memtester))
|
||||||
|
|
||||||
memtester-clean:
|
|
||||||
rm -f $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY)
|
|
||||||
-$(MAKE) -C $(MEMTESTER_DIR) clean
|
|
||||||
|
|
||||||
memtester-dirclean:
|
|
||||||
rm -rf $(MEMTESTER_DIR)
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Toplevel Makefile options
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
ifeq ($(BR2_PACKAGE_MEMTESTER),y)
|
|
||||||
TARGETS+=memtester
|
|
||||||
endif
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user