From patchwork Sat Apr 23 14:59:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5538 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KlvYw32Lsz3xG6 for ; Sat, 23 Apr 2022 14:59:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KlvYv1DbNz2gW; Sat, 23 Apr 2022 14:59:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KlvYv0B3cz2yjZ; Sat, 23 Apr 2022 14:59:15 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KlvYs6518z2xMX for ; Sat, 23 Apr 2022 14:59:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KlvYr1KH7z1D7 for ; Sat, 23 Apr 2022 14:59:11 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1650725952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zkEtGgoDUE541Z6Gp5+Rgi4LSbtWJUQdxRGnD5p1+Q=; b=obWUyCnNtyCQcBfA2sOAsZLtK4PmeWtbbbdPCSHgFFg3EKu1KrVv9g5jptxoaJmGozkQiA SGVcTOplZO2GDxBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1650725952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zkEtGgoDUE541Z6Gp5+Rgi4LSbtWJUQdxRGnD5p1+Q=; b=LDP7rv8VMk2u+5aDzvYfljonrWWSyQ6Z51nK1tPR5UqHvWBFiZ6biLA/QEpoUcftze9Apr mOJ3eV/iXgkUGz8dOzbz++7sJRoQCddQCIeRoE6L0UwoDCOgKcwKp74yIunadtU8GD00IW aXwKY5BuIXz7wZOOn+J+kMsHr31XS3GIH7jsUJ5Q7GreIwEY7BrD4eLW3Bk8bLOTbTQgRr +/8BMUfvucjd7MoL3ghfnpzf1hPdH3CsVE9ndfSaK17U6Odk4iQk9O+JXlzNzmVBCdpW02 NycrGWwx/nuzzZ7Xg4yP5GDeHrBiyV8N6Jy9ipOarDeBfgXSabHzCDyTr5gbcw== Message-ID: <687701db-4ca1-1b07-eb1f-a80842e1ac28@ipfire.org> Date: Sat, 23 Apr 2022 14:59:09 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] mcelog: Update to 181 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" No changelog or release notes are provided. Please refer to https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/log/ for the source code history since the 175 release of mcelog. Signed-off-by: Peter Müller --- lfs/mcelog | 11 +++++++---- src/patches/mcelog-181-fix-Python-call.patch | 8 ++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 src/patches/mcelog-181-fix-Python-call.patch diff --git a/lfs/mcelog b/lfs/mcelog index 8b75feecf..0f4694f2b 100644 --- a/lfs/mcelog +++ b/lfs/mcelog @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2022 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 = 175 +VER = 181 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 = 2 +PAK_VER = 3 SUP_ARCH = x86_64 DEPS = @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64 +$(DL_FILE)_BLAKE2 = 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff2199ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de install : $(TARGET) @@ -83,6 +83,9 @@ $(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 new file mode 100644 index 000000000..b0781f828 --- /dev/null +++ b/src/patches/mcelog-181-fix-Python-call.patch @@ -0,0 +1,8 @@ +--- 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