diff mbox series

[1/1] package/mcelog: bump to version 187

Message ID 20220808200548.3622105-1-vfazio@xes-inc.com
State Accepted
Headers show
Series [1/1] package/mcelog: bump to version 187 | expand

Commit Message

Vincent Fazio Aug. 8, 2022, 8:05 p.m. UTC 
Drop the patch now that it has been upstreamed.

Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
---
 ...01-Makefile-add-install-nodoc-target.patch | 65 -------------------
 package/mcelog/mcelog.hash                    |  2 +-
 package/mcelog/mcelog.mk                      |  2 +-
 3 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 package/mcelog/0001-Makefile-add-install-nodoc-target.patch

Comments

Thomas Petazzoni Aug. 8, 2022, 9:08 p.m. UTC | #1 
On Mon,  8 Aug 2022 15:05:48 -0500
Vincent Fazio <vfazio@xes-inc.com> wrote:

> Drop the patch now that it has been upstreamed.
> 
> Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
> ---
>  ...01-Makefile-add-install-nodoc-target.patch | 65 -------------------
>  package/mcelog/mcelog.hash                    |  2 +-
>  package/mcelog/mcelog.mk                      |  2 +-
>  3 files changed, 2 insertions(+), 67 deletions(-)
>  delete mode 100644 package/mcelog/0001-Makefile-add-install-nodoc-target.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/mcelog/0001-Makefile-add-install-nodoc-target.patch b/package/mcelog/0001-Makefile-add-install-nodoc-target.patch
deleted file mode 100644
index a36a54c73c..0000000000
--- a/package/mcelog/0001-Makefile-add-install-nodoc-target.patch
+++ /dev/null
@@ -1,65 +0,0 @@ 
-From c224ad8bafe859d640dfaf67d396c38c73880409 Mon Sep 17 00:00:00 2001
-From: Vincent Fazio <vfazio@xes-inc.com>
-Date: Wed, 27 Jul 2022 07:18:37 -0500
-Subject: [PATCH] Makefile: add install-nodoc target
-
-This target is useful for "essentials only" installs for embedded
-environments with the added benefit of not requiring a python
-interpreter for installing the package.
-
-Suggested-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
----
- Makefile | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 339b8dd..50a322b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@ TRIGGERS=cache-error-trigger dimm-error-trigger page-error-trigger \
- 
- all: mcelog
- 
--.PHONY: install clean depend FORCE
-+.PHONY: install install-nodoc clean depend FORCE
- 
- OBJ := p4.o k8.o mcelog.o dmi.o tsc.o core2.o bitfield.o intel.o \
-        nehalem.o dunnington.o tulsa.o config.o memutil.o msg.o   \
-@@ -50,16 +50,11 @@ SRC := $(OBJ:.o=.c)
- mcelog: ${OBJ} version.o
- 
- # dbquery intentionally not installed by default
--install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5
--	mkdir -p $(DESTDIR)${etcprefix}/etc/mcelog $(DESTDIR)${prefix}/sbin $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
--	install -m 755 -p mcelog $(DESTDIR)${prefix}/sbin/mcelog
-+install: install-nodoc mcelog.conf.5 mcelog.triggers.5
-+	mkdir -p $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
- 	install -m 644 -p mcelog.8 $(DESTDIR)$(MANDIR)/man8
- 	install -m 644 -p mcelog.conf.5 $(DESTDIR)$(MANDIR)/man5
- 	install -m 644 -p mcelog.triggers.5 $(DESTDIR)$(MANDIR)/man5
--	install -m 644 -p -b mcelog.conf $(DESTDIR)${etcprefix}/etc/mcelog/mcelog.conf
--	for i in ${TRIGGERS} ; do 						\
--		install -m 755 -p -b triggers/$$i $(DESTDIR)${etcprefix}/etc/mcelog ; 	\
--	done
- ifdef DOCDIR
- 	install -d 755 $(DESTDIR)${DOCDIR}
- 	install -m 644 -p ${DOC} $(DESTDIR)${DOCDIR}
-@@ -68,6 +63,14 @@ else
- 	echo "Consider defining DOCDIR to install additional documentation"
- endif
- 
-+install-nodoc: mcelog mcelog.conf
-+	mkdir -p $(DESTDIR)${etcprefix}/etc/mcelog $(DESTDIR)${prefix}/sbin
-+	install -m 755 -p mcelog $(DESTDIR)${prefix}/sbin/mcelog
-+	install -m 644 -p -b mcelog.conf $(DESTDIR)${etcprefix}/etc/mcelog/mcelog.conf
-+	for i in ${TRIGGERS} ; do 						\
-+		install -m 755 -p -b triggers/$$i $(DESTDIR)${etcprefix}/etc/mcelog ; 	\
-+	done
-+
- mcelog.conf.5: mcelog.conf config-intro.man
- 	./genconfig.py mcelog.conf config-intro.man > mcelog.conf.5
- 
--- 
-2.25.1
-
diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash
index 94b5f2cc37..c64e652453 100644
--- a/package/mcelog/mcelog.hash
+++ b/package/mcelog/mcelog.hash
@@ -1,3 +1,3 @@ 
 # Locally computed
-sha256  067d52006f0aa42045acc6d9c04d590362448bacd8ef415d42729e6f35825028  mcelog-184.tar.gz
+sha256  02eb3f4cb0976048f191d124fb45a1720caf082cd246d858acb0a39a9d026641  mcelog-187.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE
diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk
index 24aeb5b519..de1b76cfd3 100644
--- a/package/mcelog/mcelog.mk
+++ b/package/mcelog/mcelog.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-MCELOG_VERSION = 184
+MCELOG_VERSION = 187
 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION))
 MCELOG_LICENSE = GPL-2.0
 MCELOG_LICENSE_FILES = LICENSE