gentoo resync : 02.02.2022

3 files changed, 32 insertions, 2 deletions

diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest
index 71ece2aca394..31c7c22a744d 100644
--- a/sys-apps/edac-utils/Manifest
+++ b/sys-apps/edac-utils/Manifest
@@ -1,5 +1,6 @@
+AUX edac-utils-0.18-mitac-hawk.patch 773 BLAKE2B 416b8a19951ddea915986b1771c742808e9d32b75a901c35f6f499e986a576eeb3aec162c0de26d6c4e2c1dfd91eade383a5cd12748002c1e54a7505f7999636 SHA512 5ef37ad2cf1064c557177425fb9d9e4f015d3ca59c8258c21e27ea06ef7286362df89cb421f0dff08f0d7acf225f333eae15a8139ab1073358d237c3ca6e02ba
 AUX edac.init 336 BLAKE2B 7ebffaf4d4431977d607448f43beb5f17903e28a1aef3a8445e0c83a267a221e7fdaa6f0aa1860123da44dfbef00c1861f8eaf93d9968bbfc0896ad9de39ea5e SHA512 51936a92d46f324964d8149d69c9e9260428030e3bf23e4a46aabc716d04ddb06acf05c55a63747436e0a3b3a2775f3725a8adae594af2b1a6ae234143338f85
 AUX edac.service 230 BLAKE2B a38c84a994bcaf884ed1a23c406971c57c4353a226029d5c08cd71481ca888dae91c5a6c6422a20181319c3199d2e97fb1985a05415ffc9f1cdad318281f50d6 SHA512 de8838c5f2227e4c81c8b571dd117ac90aeabeb082b767e84bd208a80c24496f3bd5105fb15fab890ea3224616646a882d12dc7c37af6d0e554f95cd8d081b7d
 DIST edac-utils-0.18.tar.gz 285909 BLAKE2B 7d2662daf94c4ff796760b4863837861015397016bb79202baaa194608b61450d6749981cec621571267ac818a09af758167d2d768513e7d5bf7e763aed7ee51 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa
-EBUILD edac-utils-0.18-r1.ebuild 1198 BLAKE2B 276719d66ef2a654537f0ecae6c5915e5e14b98dbf047c1dea3771472785950a1ffb0545aca2c61c04182c0e23c9c91decd3579bcfeef5405e1413e1afb03ec0 SHA512 f64b23c7f30beb4e15d39c4b266773963da87e5db07c8381df1778a75e271b2a1a4f336d76e015656228ee0f3ee93588259aa0ca6de5fdf5c82df88ccb15ddfd
+EBUILD edac-utils-0.18-r1.ebuild 1248 BLAKE2B 783ef2c3610b4ba9c90cb02e78a041310646f95bb43bef911b05f0cc5799156bf871e191f2a70a5a0552bbca9d648112b1e7ff8ca6f91bd26f0b09760954a2db SHA512 eb431b56f4bb70f9ee1265d45350f07791f4adda0554e3f33a3d6ba91328e86e9a77fd7cf6e0ad48a55d3a462883a915496a070ea8c5d756d2248ee9fe52d928
 MISC metadata.xml 322 BLAKE2B c1061e042359164cc6c5b8e415531fd42abda781fa2590cb3efe97e72e3d38c11af9bb5eb2594a2c4f8ef5f72115e3036caa188f6231211b5bebc401bb7baf1c SHA512 83d32053df33f00dee91b75e4e7a626871cb8e96ed002623f9df67cb2065a8f8a4c8264598d3e9e908b477d9c7878231661904f2c822a22c109aaaccc285f04d
diff --git a/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild b/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild
index a8f2910a9cbd..b1b73a2138c8 100644
--- a/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild
+++ b/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,10 @@ DEPEND="sys-fs/sysfsutils"
 RDEPEND="${DEPEND}
 	sys-apps/dmidecode"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-mitac-hawk.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/edac-utils/files/edac-utils-0.18-mitac-hawk.patch b/sys-apps/edac-utils/files/edac-utils-0.18-mitac-hawk.patch
new file mode 100644
index 000000000000..4472bad2ae43
--- /dev/null
+++ b/sys-apps/edac-utils/files/edac-utils-0.18-mitac-hawk.patch
@@ -0,0 +1,25 @@
+From 1c57818ecee186aa47af0342149577df5302c022 Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Sun, 30 Jan 2022 14:49:58 +0100
+Subject: [PATCH] etc/labels.db: add MiTAC HAWK layout
+
+This is for an Ampere eMag Hawk 32-core ARMv8 board, which features 8
+banks of DDR4 RDIMMs (1DPC).
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+---
+ src/etc/labels.db | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/etc/labels.db b/src/etc/labels.db
+index f915666..63baf43 100644
+--- a/src/etc/labels.db
++++ b/src/etc/labels.db
+@@ -187,0 +187,7 @@ Vendor: Intel Corporation
++
++Vendor: MiTAC
++  Model: HAWK
++    DIMM 1: 0.0.0; DIMM 8: 0.7.0;
++    DIMM 2: 0.1.0; DIMM 7: 0.6.0;
++    DIMM 3: 0.2.0; DIMM 6: 0.5.0;
++    DIMM 4: 0.3.0; DIMM 5: 0.4.0;