!7 Upgrade version to 4.5.1

From: @YukariChiba 
Reviewed-by: @licihua 
Signed-off-by: @licihua
This commit is contained in:
openeuler-ci-bot 2022-08-02 06:08:15 +00:00 committed by Gitee
commit 1541226c27
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 15 additions and 51 deletions

View File

@ -1,36 +0,0 @@
diff -urN memtester-4.3.0/tests.c memtester-4.3.0-bak/tests.c
--- memtester-4.3.0/tests.c 2012-06-10 05:45:22.000000000 +0800
+++ memtester-4.3.0-bak/tests.c 2021-08-04 17:09:27.971110499 +0800
@@ -27,6 +27,9 @@
#define PROGRESSOFTEN 2500
#define ONE 0x00000001L
+type_mword8 mword8;
+type_mword16 mword16;
+
/* Function definitions. */
int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
diff -urN memtester-4.3.0/types.h memtester-4.3.0-bak/types.h
--- memtester-4.3.0/types.h 2012-06-10 05:45:22.000000000 +0800
+++ memtester-4.3.0-bak/types.h 2021-08-04 17:09:10.390965532 +0800
@@ -25,12 +25,15 @@
int (*fp)();
};
-union {
+typedef union {
unsigned char bytes[UL_LEN/8];
ul val;
-} mword8;
+} type_mword8;
-union {
+typedef union {
unsigned short u16s[UL_LEN/16];
ul val;
-} mword16;
+} type_mword16;
+
+extern type_mword8 mword8;
+extern type_mword16 mword16;

Binary file not shown.

BIN
memtester-4.5.1.tar.gz Normal file

Binary file not shown.

View File

@ -1,23 +1,23 @@
diff -urN memtester-4.3.0/Makefile memtester-4.3.0-bak/Makefile diff --color -urN memtester-4.5.1/Makefile memtester-4.5.1-new/Makefile
--- memtester-4.3.0/Makefile 2012-06-10 05:45:22.000000000 +0800 --- memtester-4.5.1/Makefile 2021-05-31 01:10:52.000000000 +0800
+++ memtester-4.3.0-bak/Makefile 2020-05-03 11:26:52.615501049 +0800 +++ memtester-4.5.1-new/Makefile 2022-07-05 03:32:36.885577441 +0800
@@ -17,7 +17,9 @@ @@ -17,7 +17,8 @@
OBJECTS = $(SOURCES:.c=.o) OBJECTS = $(SOURCES:.c=.o)
HEADERS = memtester.h HEADERS = memtester.h
TARGETS = *.o compile load auto-ccld.sh find-systype make-compile make-load systype extra-libs TARGETS = *.o compile load auto-ccld.sh find-systype make-compile make-load systype extra-libs
-INSTALLPATH = /usr/local -INSTALLPATH = /usr/local
+ +BINDIR = ${DESTDIR}/usr/bin
+BINDIR = ${DESTDIR}/usr/bin +MANDIR = ${DESTDIR}/usr/share/man/man8
+MANDIR = ${DESTDIR}/usr/share/man/man8
# #
# Targets # Targets
@@ -25,9 +27,10 @@ @@ -25,10 +26,10 @@
all: memtester all: memtester
install: all install: all
- mkdir -m 755 -p $(INSTALLPATH)/{bin,man/man8} - mkdir -m 755 -p $(INSTALLPATH)/bin
- install -m 755 memtester $(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/ - gzip -c memtester.8 >memtester.8.gz ; install -m 644 memtester.8.gz $(INSTALLPATH)/man/man8/
+ mkdir -m 755 -p $(BINDIR) + mkdir -m 755 -p $(BINDIR)
+ mkdir -m 755 -p $(MANDIR) + mkdir -m 755 -p $(MANDIR)

View File

@ -1,15 +1,14 @@
%global debug_package %{nil} %global debug_package %{nil}
Name: memtester Name: memtester
Version: 4.3.0 Version: 4.5.1
Release: 2 Release: 1
Summary: A userspace utility for testing the memory subsystem for faults Summary: A userspace utility for testing the memory subsystem for faults
License: GPLv2 License: GPLv2
URL: http://pyropus.ca/software/memtester/ URL: http://pyropus.ca/software/memtester/
Source0: http://pyropus.ca/software/memtester/old-versions/%{name}-%{version}.tar.gz Source0: http://pyropus.ca/software/memtester/old-versions/%{name}-%{version}.tar.gz
Patch0: memtester-fix-make-install-path.patch Patch0: memtester-fix-make-install-path.patch
Patch1: fix-multi-difine.patch
BuildRequires: gcc BuildRequires: gcc
@ -17,9 +16,7 @@ BuildRequires: gcc
A userspace utility for testing the memory subsystem for faults. It's portable and should compile and work on any 32- or 64-bit Unix-like system. (Yes, even weird, proprietary Unices, and even Mac OS X.) For hardware developers, memtester can be told to test memory starting at a particular physical address as of memtester version 4.1.0. A userspace utility for testing the memory subsystem for faults. It's portable and should compile and work on any 32- or 64-bit Unix-like system. (Yes, even weird, proprietary Unices, and even Mac OS X.) For hardware developers, memtester can be told to test memory starting at a particular physical address as of memtester version 4.1.0.
%prep %prep
%setup -q -n %{name}-%{version}/ %autosetup -n %{name}-%{version} -p1
%patch0 -p1
%patch1 -p1
%build %build
%make_build %make_build
@ -41,6 +38,9 @@ make install DESTDIR="%{buildroot}"
%{_mandir}/* %{_mandir}/*
%changelog %changelog
* Tue Jul 05 2022 YukariChiba <i@0x7f.cc> - 4.5.1-1
- Upgrade version to 4.5.1
* Wed Aug 4 2021 Lu Weitao <luweitao2@huawei.com> * Wed Aug 4 2021 Lu Weitao <luweitao2@huawei.com>
- fix compile failure by upgrade to GCC-10 - fix compile failure by upgrade to GCC-10