Merge pull request #2252 from flatcar/chewi/azure-nvme-utils

azure-nvme-utils: Migrate coreos-overlay to portage-stable, 0.2.0 bump
flatcar · Aug 27, 2024 · 35aa63d · 35aa63d
2 parents 00606cb + 99543e3
commit 35aa63d
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 30 deletions.
diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list
@@ -546,6 +546,7 @@ sec-policy/selinux-unconfined
 
 sys-apps/acl
 sys-apps/attr
+sys-apps/azure-nvme-utils
 sys-apps/bubblewrap
 sys-apps/checkpolicy
 sys-apps/config-site

diff --git a/changelog/updates/2024-08-23-azure-nvme-utils-update.md b/changelog/updates/2024-08-23-azure-nvme-utils-update.md
@@ -0,0 +1 @@
+- azure-nmve-utils ([0.2.0](https://github.com/Azure/azure-nvme-utils/releases/tag/v0.2.0))
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/Manifest b/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/Manifest
diff --git a/...rc/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild b/...rc/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild
diff --git a/...reos-base/coreos/coreos-0.0.1-r313.ebuild → ...reos-base/coreos/coreos-0.0.1-r314.ebuild b/...reos-base/coreos/coreos-0.0.1-r313.ebuild → ...reos-base/coreos/coreos-0.0.1-r314.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -81,7 +81,6 @@ RDEPEND="${RDEPEND}
 
 # sys-devel/gettext: it embeds 'envsubst' binary which is useful for simple file templating.
 RDEPEND="${RDEPEND}
-	app-admin/azure-nvme-utils
 	app-admin/etcd-wrapper
 	app-admin/flannel-wrapper
 	app-admin/locksmith
@@ -154,6 +153,7 @@ RDEPEND="${RDEPEND}
 	sec-policy/selinux-unconfined
 	sys-apps/acl
 	sys-apps/attr
+	sys-apps/azure-nvme-utils
 	sys-apps/coreutils
 	sys-apps/checkpolicy
 	sys-apps/dbus

diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -96,6 +96,9 @@ dev-util/catalyst ~amd64 ~arm64
 # Needed to address CVE-2024-6197, CVE-2024-6874 and CVE-2024-7264.
 =net-misc/curl-8.9.1-r1 ~amd64 ~arm64
 
+# Package has not been stabilised yet.
+=sys-apps/azure-nvme-utils-0.2.0 ~amd64 ~arm64
+
 # Keep versions on both arches in sync.
 =sys-apps/kexec-tools-2.0.28 ~arm64
 =sys-apps/zram-generator-1.1.2 ~arm64

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/Manifest
@@ -0,0 +1 @@
+DIST azure-nvme-utils-0.2.0.tar.gz 13177 BLAKE2B 5c486d035422ea6547e2886324e0b6e2537d11089bc0b3dfd550130e82ab8de8cc9a5be8e3bfd0722cb71c17a66c261f0cfd021e4a48e5568de01dd0c052fbbc SHA512 4ef2de641839bfbcc2e1a084cec218d1105550366770d731bb7a3e5d4b4e45a47b21ccf9a3a8069f469389e1d27e485bfed235a55d398930bddc8829eebc2708
diff --git a/...er/src/third_party/portage-stable/sys-apps/azure-nvme-utils/azure-nvme-utils-0.2.0.ebuild b/...er/src/third_party/portage-stable/sys-apps/azure-nvme-utils/azure-nvme-utils-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev
+
+DESCRIPTION="Utility to help identify Azure NVMe devices"
+HOMEPAGE="https://github.com/Azure/azure-nvme-utils"
+SRC_URI="https://github.com/Azure/${PN}/archive/refs/tags/v${PV}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+lun-fallback"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAZURE_LUN_CALCULATION_BY_NSID_ENABLED=$(usex lun-fallback)
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Azure/azure-nvme-utils</remote-id>
+	</upstream>
+	<use>
+		<flag name="lun-fallback">Enable fallback LUN calculation via NSID</flag>
+	</use>
+</pkgmetadata>