diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 2fa88a7..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,32 +0,0 @@ -upstream_tag_template: v{version} - -jobs: - - job: propose_downstream - trigger: release - dist_git_branches: - - fedora-all - - epel-9 - - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-all - - epel-9 - - - job: koji_build - trigger: commit - dist_git_branches: - - fedora-all - - epel-9 - allowed_pr_authors: - - packit - - mhayden - allowed_committers: - - packit - - mhayden - - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-branched - - epel-9 diff --git a/amazon-ec2-utils.spec b/amazon-ec2-utils.spec index 1b839ce..a778cbf 100644 --- a/amazon-ec2-utils.spec +++ b/amazon-ec2-utils.spec @@ -1,15 +1,11 @@ Name: amazon-ec2-utils Version: 2.2.0 -Release: %autorelease +Release: 1%{?dist} Summary: Utilities and settings for Amazon EC2 License: MIT AND CC-BY-SA-4.0 URL: https://github.com/amazonlinux/%{name}/ Source0: %{url}/archive/refs/tags/v%{version}.tar.gz -# Skip the EBS udev rules as they create invalid symlinks. -# See RHBZ#2284397 for more details. -Patch0: remove-EBS-udev-rules.patch - BuildArch: noarch Requires: curl @@ -80,4 +76,5 @@ install -p -m 0644 doc/ec2-metadata.8 %{buildroot}%{_mandir}/man8/ %changelog -%autochangelog +* Wed Jun 26 2024 Major Hayden - 2.2.0-1 +- First release for EPEL 8 \ No newline at end of file diff --git a/remove-EBS-udev-rules.patch b/remove-EBS-udev-rules.patch deleted file mode 100644 index 43175a2..0000000 --- a/remove-EBS-udev-rules.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87d578a723f270b4a2bba120f3a143bc7c8b1b19 Mon Sep 17 00:00:00 2001 -From: Major Hayden -Date: Mon, 23 Sep 2024 10:47:15 -0500 -Subject: [PATCH] Remove EBS udev rules - -These rules create invalid symlinks. - -See RHBZ 2284397. - -Signed-off-by: Major Hayden ---- - 70-ec2-nvme-devices.rules | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/70-ec2-nvme-devices.rules b/70-ec2-nvme-devices.rules -index 6fae458..8f415a7 100644 ---- a/70-ec2-nvme-devices.rules -+++ b/70-ec2-nvme-devices.rules -@@ -13,10 +13,6 @@ KERNEL=="nvme[0-9]*n[0-9]*", ENV{DEVTYPE}=="disk", ATTRS{serial}=="?*", ATTRS{mo - KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{serial}=="?*", ATTRS{model}=="?*", IMPORT{program}="/usr/sbin/ec2nvme-nsid %k" - KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{serial}=="?*", ATTRS{model}=="?*", ENV{_NS_ID}=="?*", SYMLINK+="disk/by-id/nvme-$attr{model}_$attr{serial}-ns-$env{_NS_ID}-part%n", OPTIONS+="string_escape=replace" - --# ebs nvme devices --KERNEL=="nvme[0-9]*n[0-9]*", ENV{DEVTYPE}=="disk", ATTRS{model}=="Amazon Elastic Block Store", PROGRAM="/usr/sbin/ebsnvme-id -u /dev/%k", SYMLINK+="%c" --KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Amazon Elastic Block Store", PROGRAM="/usr/sbin/ebsnvme-id -u /dev/%k", SYMLINK+="%c%n" -- - # Do not timeout I/O operations on EBS volumes. - KERNEL=="nvme[0-9]*n[0-9]*", ENV{DEVTYPE}=="disk", ATTRS{model}=="Amazon Elastic Block Store", ATTR{queue/io_timeout}="4294967295" - --- -2.46.1 -