summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2022-05-23 18:17:54 +0200
committerFlorian Franzmann2022-05-23 19:25:10 +0200
commit2d519732de78b2a21ff7d00d16a5fc6160e7b456 (patch)
tree05063d6b14b35c3285a44bed7837c939a80a5ef9
parentf06432ec0e25c525432660ff06358da358409d2e (diff)
utils/cpuid: version 20220224
-rw-r--r--utils/cpuid/0001-install-to-PREFIX-instead-of-BUILDROOT.patch45
-rwxr-xr-xutils/cpuid/DETAILS4
-rw-r--r--utils/cpuid/HISTORY4
-rwxr-xr-xutils/cpuid/PRE_BUILD5
4 files changed, 6 insertions, 52 deletions
diff --git a/utils/cpuid/0001-install-to-PREFIX-instead-of-BUILDROOT.patch b/utils/cpuid/0001-install-to-PREFIX-instead-of-BUILDROOT.patch
deleted file mode 100644
index 997ce6fb41..0000000000
--- a/utils/cpuid/0001-install-to-PREFIX-instead-of-BUILDROOT.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d11d0307aa14f601487e588cba218b777ad22bcb Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <Florian.Franzmann@fau.de>
-Date: Wed, 4 Apr 2018 16:28:21 +0200
-Subject: [PATCH] install to PREFIX instead of BUILDROOT
-
----
- Makefile | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 933899b..7c402af 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,3 @@
--CFLAGS+=-g
- CPPFLAGS?=
- LDFLAGS?=
- ifneq (,$(findstring arch=i386,$(CFLAGS)))
-@@ -34,8 +33,6 @@ OTHER_BINS=$(PROG).man cpuinfo2cpuid.man
- REL_DIR=../$(shell date +%Y-%m-%d)
- WEB_DIR=/toad2/apps.mine/www/www/$(PROG)
-
--BUILDROOT=
--
- default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-
- $(PROG): cpuid.c Makefile
-@@ -51,10 +48,10 @@ cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man
- gzip < $< > $@
-
- install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-- install -D -s -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
-- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-- install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid
-- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-+ install -D -s -m 755 $(PROG) $(PREFIX)/usr/bin/$(PROG)
-+ install -D -m 444 $(PROG).man.gz $(PREFIX)/usr/share/man/man1/$(PROG).1.gz
-+ install -D -m 755 cpuinfo2cpuid $(PREFIX)/usr/bin/cpuinfo2cpuid
-+ install -D -m 444 cpuinfo2cpuid.man.gz $(PREFIX)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-
- clean:
- rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
---
-2.17.0
-
diff --git a/utils/cpuid/DETAILS b/utils/cpuid/DETAILS
index ed3f2c7831..076fd0ea96 100755
--- a/utils/cpuid/DETAILS
+++ b/utils/cpuid/DETAILS
@@ -1,8 +1,8 @@
SPELL=cpuid
- VERSION=20170122
+ VERSION=20220224
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.etallen.com/${SPELL}/${SPELL}-${VERSION}.src.tar.gz
- SOURCE_HASH=sha512:0e057980c71a0e078254e6b7535747bdf368278932c39943cf7dfafe08443af07297a2b41518499937a710fe6950ba89377cabaada5f6332932650d4d17c1430
+ SOURCE_HASH=sha512:7cf41d2429d442b4dfd5d369e394c11916352e16fc56852ea4af71945192903482bc45c38367ff5ae3f8d386ffc65cc61a9b0bec4594589a057557daf54d8562
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.etallen.com/cpuid.html"
LICENSE[0]=GPL
diff --git a/utils/cpuid/HISTORY b/utils/cpuid/HISTORY
index a1c64d12ea..8c2e95ff8a 100644
--- a/utils/cpuid/HISTORY
+++ b/utils/cpuid/HISTORY
@@ -1,3 +1,7 @@
+2022-05-23 Florian Franzmann <bwlf@bandrate.org>
+ * DETAILS: version 20220224
+ * PRE_BUILD, 0001-install-to-PREFIX-instead-of-BUILDROOT.patch: removed
+
2018-04-04 Florian Franzmann <bwlf@bandrate.org>
* 0001-install-to-PREFIX-instead-of-BUILDROOT.patch, BUILD, DETAILS,
INSTALL, PRE_BUILD: spell created
diff --git a/utils/cpuid/PRE_BUILD b/utils/cpuid/PRE_BUILD
deleted file mode 100755
index 44526e7998..0000000000
--- a/utils/cpuid/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/0001-install-to-PREFIX-instead-of-BUILDROOT.patch"
-