From e979680572c5349b38200131ffba5022d5372023 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Sat, 11 Nov 2023 11:58:45 +0100 Subject: [PATCH] mcelog: Update to version 196 - Update from version 181 to 196 - Update of rootfile not required - Fix python call patch removed as correct python call now in the source tarball - Changelog file is no longer used. Review of changes has to be done via the git repo. https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/log/ Signed-off-by: Adolf Belka --- lfs/mcelog | 12 ++++-------- src/patches/mcelog-181-fix-Python-call.patch | 8 -------- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 src/patches/mcelog-181-fix-Python-call.patch diff --git a/lfs/mcelog b/lfs/mcelog index 0f4694f2be..619cf025af 100644 --- a/lfs/mcelog +++ b/lfs/mcelog @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ include Config SUMMARY = Log Machine Check Events -VER = 181 +VER = 196 THISAPP = mcelog-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mcelog -PAK_VER = 3 +PAK_VER = 4 SUP_ARCH = x86_64 DEPS = @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff2199ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de +$(DL_FILE)_BLAKE2 = 50871cd7a3c4dd6f4c4d613c7db4528d972ca37ba17b0a5aa4876d8fc92d4478c2247ea65748310ad6d4b950d1abc9bd0ea40193e72b36d38334547382477849 install : $(TARGET) @@ -82,10 +82,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Fix Python interpreter call in genconfig.py script - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mcelog-181-fix-Python-call.patch - cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/mcelog-181-fix-Python-call.patch b/src/patches/mcelog-181-fix-Python-call.patch deleted file mode 100644 index b0781f828e..0000000000 --- a/src/patches/mcelog-181-fix-Python-call.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- mcelog-181.orig/genconfig.py 2022-04-23 14:54:26.721031777 +0000 -+++ mcelog-181/genconfig.py 2022-04-23 14:54:35.577658935 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # generate man config documentation from mcelog.conf example - # genconfig.py mcelog.conf intro.html - from __future__ import print_function -- 2.39.5