From 465aad46fe1c07749caac508a8935d9f47e186ef Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 31 Mar 2022 12:07:26 +0200 Subject: [PATCH] sys-fs/mdadm: update keywords amd64 and arm64 for mdadm 4.2-r1 Update keywords for amd64 and arm64 to be able to build mdadm 4.2-r1. Update description in README as well. --- .../src/third_party/coreos-overlay/sys-fs/mdadm/README.md | 5 ++--- .../coreos-overlay/sys-fs/mdadm/mdadm-4.2-r1.ebuild | 7 +++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/README.md b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/README.md index 2ea8c2882c..0374e15666 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/README.md +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/README.md @@ -1,7 +1,6 @@ This is a fork of Gentoo's sys-fs/mdadm package. The main reason of -having this fork is to carry two patches that are already a part of -upstream, but the release didn't yet happen, and Gentoo does not carry -them either. +having this fork is to carry Flatcar-specific patches for using +systemd.timer instead of cron.weekly. There is also a minor change to build this package by default for arm64 without needing an entry in accept_keywords file. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/mdadm-4.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/mdadm-4.2-r1.ebuild index aff2ca081c..5709e2a00b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/mdadm-4.2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/mdadm-4.2-r1.ebuild @@ -1,6 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Flatcar: Based on mdadm-4.2-r1.ebuild from commit +# 81a13f851b7502d547ff8c0434bf64a443877fb1 in Gentoo repo (see +# https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/mdadm/mdadm-4.2-r1.ebuild?id=81a13f851b7502d547ff8c0434bf64a443877fb1). EAPI=7 inherit flag-o-matic systemd toolchain-funcs udev @@ -13,8 +16,8 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz LICENSE="GPL-2" SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +# Flatcar: Build for amd64 and arm64 +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="static systemd +udev" # Only sys-fs/eudev provides static-libs right now, so if you have systemd,