From 0fd0ea6dc2ebb1d972771d49484c58a3971799b1 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 23 Aug 2024 15:23:24 +0100 Subject: [PATCH 1/2] azure-nvme-utils: Migrate coreos-overlay to portage-stable, 0.2.0 bump The coreos-overlay package under app-admin was written by Jeremi around the same time I added it to Gentoo under sys-apps. It has had a new release since. Signed-off-by: James Le Cuirot --- .../workflows/portage-stable-packages-list | 1 + .../2024-08-23-azure-nvme-utils-update.md | 1 + .../app-admin/azure-nvme-utils/Manifest | 1 - .../azure-nvme-utils-0.0.0-r1.ebuild | 28 ----------------- ...1-r313.ebuild => coreos-0.0.1-r314.ebuild} | 0 .../coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- .../coreos/base/package.accept_keywords | 3 ++ .../sys-apps/azure-nvme-utils/Manifest | 1 + .../azure-nvme-utils-0.2.0.ebuild | 30 +++++++++++++++++++ .../sys-apps/azure-nvme-utils/metadata.xml | 14 +++++++++ 10 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 changelog/updates/2024-08-23-azure-nvme-utils-update.md delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r313.ebuild => coreos-0.0.1-r314.ebuild} (100%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/azure-nvme-utils-0.2.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index bdb12452d6..234ed79873 100644 --- 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-util 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 new file mode 100644 index 0000000000..934e90eada --- /dev/null +++ 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 deleted file mode 100644 index 73a85d9db0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST azure-nvme-utils-0.0.0-1a1167d1d7780068d0af5afc3ad18a2601e951fe.zip 15473 BLAKE2B c57bc01b53bb52b0d958e6eac0d7df5b08023024dbf197f236229174fed2e8d295a4d66f123a2914f8ff11a70df83db7e7cafa56242a80c925bff53032b38b4e SHA512 48739a5da9e7fdba9c26df803354925ff508f4bb872f9dfde7461b6fec70648e1daaa7c1468960467d19243c6b3c871dd4bf060fa85e22f5576083d2a19385ed diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild deleted file mode 100644 index 4760df90c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/azure-nvme-utils/azure-nvme-utils-0.0.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2024 Flatcar Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -GIT_COMMIT="1a1167d1d7780068d0af5afc3ad18a2601e951fe" -DESCRIPTION="Azure NVMe utilities" -HOMEPAGE="https://github.com/Azure/azure-nvme-utils" -SRC_URI="https://github.com/Azure/azure-nvme-utils/archive/${GIT_COMMIT}.zip -> ${P}-${GIT_COMMIT}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm64" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - -S="${WORKDIR}/${PN}-${GIT_COMMIT}" - -src_configure() { - local mycmakeargs=( - -DVERSION="${PVR}-${GIT_COMMIT}" - ) - cmake_src_configure -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r313.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r314.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r313.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-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 index 1dc5bd486b..9e1f7edc50 100644 --- 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 index 829d349f58..5ed414d689 100644 --- 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 new file mode 100644 index 0000000000..b22e463a9e --- /dev/null +++ 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/sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/azure-nvme-utils-0.2.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/azure-nvme-utils-0.2.0.ebuild new file mode 100644 index 0000000000..5d34219055 --- /dev/null +++ b/sdk_container/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 new file mode 100644 index 0000000000..f6dc521501 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/azure-nvme-utils/metadata.xml @@ -0,0 +1,14 @@ + + + + + chewi@gentoo.org + James Le Cuirot + + + Azure/azure-nvme-utils + + + Enable fallback LUN calculation via NSID + + From 99543e30c6dc6793690e184c519e71f709d52ab8 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 26 Aug 2024 10:41:54 +0100 Subject: [PATCH 2/2] Update .github/workflows/portage-stable-packages-list Co-authored-by: Jeremi Piotrowski --- .github/workflows/portage-stable-packages-list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 234ed79873..dbbe4d69da 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -546,7 +546,7 @@ sec-policy/selinux-unconfined sys-apps/acl sys-apps/attr -sys-apps/azure-nvme-util +sys-apps/azure-nvme-utils sys-apps/bubblewrap sys-apps/checkpolicy sys-apps/config-site