Merge pull request #180 from ginglis13/epoch-1

packages: set Epoch of 1 if package version less than Bottlerocket release version
bottlerocket-os · Oct 11, 2024 · 058f006 · 058f006
2 parents 5778c36 + bbcd422
commit 058f006
Show file tree

Hide file tree

Showing 67 changed files with 73 additions and 8 deletions.
diff --git a/packages/acpid/acpid.spec b/packages/acpid/acpid.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}acpid
 Version: 2.0.34
 Release: 1%{?dist}
+Epoch: 1
 Summary: ACPI event daemon
 License: GPL-2.0-or-later
 URL: http://sourceforge.net/projects/acpid2/

diff --git a/packages/conntrack-tools/conntrack-tools.spec b/packages/conntrack-tools/conntrack-tools.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}conntrack-tools
 Version: 1.4.8
 Release: 1%{?dist}
+Epoch: 1
 Summary: Tools for managing Linux kernel connection tracking
 # src/utils.c contains GPLv2-only code from linux
 License: GPL-2.0-or-later AND GPL-2.0-only

diff --git a/packages/containerd/containerd.spec b/packages/containerd/containerd.spec
@@ -11,6 +11,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: An industry-standard container runtime
 License: Apache-2.0
 URL: https://%{goimport}

diff --git a/packages/e2fsprogs/e2fsprogs.spec b/packages/e2fsprogs/e2fsprogs.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}e2fsprogs
 Version: 1.47.1
 Release: 1%{?dist}
+Epoch: 1
 Summary: Tools for managing ext2, ext3, and ext4 file systems
 License: GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND BSD-3-Clause
 URL: http://e2fsprogs.sourceforge.net/

diff --git a/packages/early-boot-config/early-boot-config.spec b/packages/early-boot-config/early-boot-config.spec
@@ -3,7 +3,8 @@
 
 Name: %{_cross_os}early-boot-config
 Version: 0.1
-Release: 0%{?dist}
+Release: 1%{?dist}
+Epoch: 1
 Summary: early-boot-config
 License: Apache-2.0 OR MIT
 URL: https://github.com/bottlerocket-os/bottlerocket

diff --git a/packages/ecs-gpu-init/ecs-gpu-init.spec b/packages/ecs-gpu-init/ecs-gpu-init.spec
@@ -3,7 +3,7 @@
 
 Name: %{_cross_os}%{workspace_name}
 Version: 0.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 Summary: Tool to generate the ECS agent's GPU configuration
 License: Apache-2.0 OR MIT
 Source1: ecs-gpu-init.service

diff --git a/packages/filesystem/filesystem.spec b/packages/filesystem/filesystem.spec
@@ -4,6 +4,7 @@
 Name: %{_cross_os}filesystem
 Version: 1.0
 Release: 1%{?dist}
+Epoch: 1
 Summary: The basic directory layout
 License: Apache-2.0 OR MIT
 URL: https://github.com/bottlerocket-os/bottlerocket

diff --git a/packages/glibc/glibc.spec b/packages/glibc/glibc.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}glibc
 Version: 2.38
 Release: 1%{?dist}
+Epoch: 1
 Summary: The GNU libc libraries
 License: LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH GCC-exception-2.0) AND GPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND ISC
 URL: http://www.gnu.org/software/glibc/

diff --git a/packages/grep/grep.spec b/packages/grep/grep.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}grep
 Version: 3.11
 Release: 1%{?dist}
+Epoch: 1
 Summary: GNU grep utility
 URL: https://www.gnu.org/software/grep/
 License: GPL-3.0-or-later

diff --git a/packages/grub/grub.spec b/packages/grub/grub.spec
@@ -12,6 +12,7 @@
 Name: %{_cross_os}grub
 Version: 2.06
 Release: 1%{?dist}
+Epoch: 1
 Summary: Bootloader with support for Linux and more
 License: GPL-3.0-or-later AND Unicode-DFS-2015
 URL: https://www.gnu.org/software/grub/

diff --git a/packages/host-ctr/host-ctr.spec b/packages/host-ctr/host-ctr.spec
@@ -3,7 +3,8 @@
 
 Name: %{_cross_os}%{workspace_name}
 Version: 0.0
-Release: 0%{?dist}
+Release: 1%{?dist}
+Epoch: 1
 Summary: Bottlerocket host container runner
 License: Apache-2.0 OR MIT
 URL: https://github.com/bottlerocket-os/bottlerocket

diff --git a/packages/iptables/iptables.spec b/packages/iptables/iptables.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}iptables
 Version: 1.8.10
 Release: 1%{?dist}
+Epoch: 1
 Summary: Tools for managing Linux kernel packet filtering capabilities
 License: GPL-2.0-or-later AND GPL-2.0-only
 URL: http://www.netfilter.org/

diff --git a/packages/kexec-tools/kexec-tools.spec b/packages/kexec-tools/kexec-tools.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}kexec-tools
 Version: 2.0.29
 Release: 1%{?dist}
+Epoch: 1
 Summary: Linux tool to load kernels from the running system
 License: GPL-2.0-or-later AND GPL-2.0-only
 URL: https://www.kernel.org/doc/html/latest/admin-guide/kdump/kdump.html

diff --git a/packages/keyutils/keyutils.spec b/packages/keyutils/keyutils.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}keyutils
 Version: 1.6.1
 Release: 1%{?dist}
+Epoch: 1
 Summary: Linux key management utilities
 License: GPL-2.0-or-later AND GPL-2.1-or-later
 Url: http://people.redhat.com/~dhowells/keyutils/

diff --git a/packages/kubernetes-1.23/kubernetes-1.23.spec b/packages/kubernetes-1.23/kubernetes-1.23.spec
@@ -25,6 +25,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/kubernetes-1.24/kubernetes-1.24.spec b/packages/kubernetes-1.24/kubernetes-1.24.spec
@@ -33,6 +33,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/kubernetes-1.25/kubernetes-1.25.spec b/packages/kubernetes-1.25/kubernetes-1.25.spec
@@ -33,6 +33,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/kubernetes-1.26/kubernetes-1.26.spec b/packages/kubernetes-1.26/kubernetes-1.26.spec
@@ -33,6 +33,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/kubernetes-1.27/kubernetes-1.27.spec b/packages/kubernetes-1.27/kubernetes-1.27.spec
@@ -33,6 +33,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/kubernetes-1.28/kubernetes-1.28.spec b/packages/kubernetes-1.28/kubernetes-1.28.spec
@@ -33,6 +33,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/kubernetes-1.29/kubernetes-1.29.spec b/packages/kubernetes-1.29/kubernetes-1.29.spec
@@ -33,6 +33,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/kubernetes-1.30/kubernetes-1.30.spec b/packages/kubernetes-1.30/kubernetes-1.30.spec
@@ -33,6 +33,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/kubernetes-1.31/kubernetes-1.31.spec b/packages/kubernetes-1.31/kubernetes-1.31.spec
@@ -33,6 +33,7 @@
 Name: %{_cross_os}%{gorepo}
 Version: %{rpmver}
 Release: 1%{?dist}
+Epoch: 1
 Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause

diff --git a/packages/libacl/libacl.spec b/packages/libacl/libacl.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libacl
 Version: 2.3.2
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for access control list support
 License: LGPL-2.1-or-later
 URL: https://savannah.nongnu.org/projects/acl

diff --git a/packages/libattr/libattr.spec b/packages/libattr/libattr.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libattr
 Version: 2.5.2
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for extended attribute support
 License: LGPL-2.1-or-later
 URL: https://savannah.nongnu.org/projects/attr

diff --git a/packages/libaudit/libaudit.spec b/packages/libaudit/libaudit.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libaudit
 Version: 3.1.4
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for the audit subsystem
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 URL: https://github.com/linux-audit/audit-userspace/

diff --git a/packages/libcap/libcap.spec b/packages/libcap/libcap.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libcap
 Version: 2.70
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for getting and setting POSIX.1e capabilities
 License: GPL-2.0-only OR BSD-3-Clause
 URL: https://sites.google.com/site/fullycapable/

diff --git a/packages/libelf/libelf.spec b/packages/libelf/libelf.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libelf
 Version: 0.191
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for ELF files
 License: GPL-2.0-or-later OR LGPL-3.0-or-later
 URL: https://sourceware.org/elfutils/

diff --git a/packages/libexpat/libexpat.spec b/packages/libexpat/libexpat.spec
@@ -3,6 +3,7 @@
 Name: %{_cross_os}libexpat
 Version: %(echo %{unversion} | sed 's/_/./g')
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for XML parsing
 License: MIT
 URL: https://libexpat.github.io/

diff --git a/packages/libffi/libffi.spec b/packages/libffi/libffi.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libffi
 Version: 3.4.6
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for FFI
 License: MIT
 URL: https://sourceware.org/libffi/

diff --git a/packages/libgcc/libgcc.spec b/packages/libgcc/libgcc.spec
@@ -6,6 +6,7 @@
 Name: %{_cross_os}libgcc
 Version: 0.0
 Release: 1%{?dist}
+Epoch: 1
 Summary: GCC runtime library
 License: GPL-3.0-or-later WITH GCC-exception-3.1
 URL: https://gcc.gnu.org/

diff --git a/packages/libglib/libglib.spec b/packages/libglib/libglib.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libglib
 Version: 2.78.4
 Release: 1%{?dist}
+Epoch: 1
 Summary: The GLib libraries
 # glib2 is LGPL-2.1-only
 License: LGPL-2.1-only

diff --git a/packages/libmnl/libmnl.spec b/packages/libmnl/libmnl.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libmnl
 Version: 1.0.5
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for netlink
 License: LGPL-2.1-or-later
 URL: http://netfilter.org/projects/libmnl

diff --git a/packages/libnetfilter_conntrack/libnetfilter_conntrack.spec b/packages/libnetfilter_conntrack/libnetfilter_conntrack.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libnetfilter_conntrack
 Version: 1.0.9
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for netfilter conntrack
 License: GPL-2.0-or-later
 URL: http://netfilter.org

diff --git a/packages/libnetfilter_cthelper/libnetfilter_cthelper.spec b/packages/libnetfilter_cthelper/libnetfilter_cthelper.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libnetfilter_cthelper
 Version: 1.0.1
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for netfilter cthelper
 License: GPL-2.0-or-later
 URL: http://netfilter.org

diff --git a/packages/libnetfilter_cttimeout/libnetfilter_cttimeout.spec b/packages/libnetfilter_cttimeout/libnetfilter_cttimeout.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libnetfilter_cttimeout
 Version: 1.0.1
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for netfilter cttimeout
 License: GPL-2.0-or-later
 URL: http://netfilter.org

diff --git a/packages/libnetfilter_queue/libnetfilter_queue.spec b/packages/libnetfilter_queue/libnetfilter_queue.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libnetfilter_queue
 Version: 1.0.5
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for netfilter queue
 License: GPL-2.0-or-later
 URL: http://netfilter.org

diff --git a/packages/libnfnetlink/libnfnetlink.spec b/packages/libnfnetlink/libnfnetlink.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libnfnetlink
 Version: 1.0.2
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for netfilter netlink
 License: GPL-2.0-only
 URL: http://netfilter.org

diff --git a/packages/libnftnl/libnftnl.spec b/packages/libnftnl/libnftnl.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libnftnl
 Version: 1.2.7
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for nftables netlink
 License: GPL-2.0-or-later AND GPL-2.0-only
 URL: http://netfilter.org/projects/libnftnl/

diff --git a/packages/libnvme/libnvme.spec b/packages/libnvme/libnvme.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libnvme
 Version: 1.10
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for NVM Express
 License: LGPL-2.1-only AND CC0-1.0 AND MIT
 URL: https://github.com/linux-nvme/libnvme

diff --git a/packages/libseccomp/libseccomp.spec b/packages/libseccomp/libseccomp.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libseccomp
 Version: 2.5.5
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for enhanced seccomp
 License: LGPL-2.1-only
 URL: https://github.com/seccomp/libseccomp

diff --git a/packages/libselinux/libselinux.spec b/packages/libselinux/libselinux.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libselinux
 Version: 3.6
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for SELinux
 License: LicenseRef-SELinux-PD
 URL: https://github.com/SELinuxProject/

diff --git a/packages/libsemanage/libsemanage.spec b/packages/libsemanage/libsemanage.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libsemanage
 Version: 3.6
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for SELinux binary policy manipulation
 License: LGPL-2.1-or-later
 URL: https://github.com/SELinuxProject/

diff --git a/packages/libsepol/libsepol.spec b/packages/libsepol/libsepol.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libsepol
 Version: 3.6
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for SELinux policy manipulation
 License: LGPL-2.1-or-later
 URL: https://github.com/SELinuxProject/

diff --git a/packages/libstd-rust/libstd-rust.spec b/packages/libstd-rust/libstd-rust.spec
@@ -6,6 +6,7 @@
 Name: %{_cross_os}libstd-rust
 Version: 0.0
 Release: 1%{?dist}
+Epoch: 1
 Summary: Rust standard library
 License: Apache-2.0 OR MIT
 URL: https://www.rust-lang.org/

diff --git a/packages/libtirpc/libtirpc.spec b/packages/libtirpc/libtirpc.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libtirpc
 Version: 1.3.5
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for RPC
 License: BSD-3-Clause
 URL: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=summary

diff --git a/packages/liburcu/liburcu.spec b/packages/liburcu/liburcu.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}liburcu
 Version: 0.14.0
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for userspace RCU
 License: LGPL-2.1-only AND GPL-2.0-or-later AND MIT
 URL: http://liburcu.org

diff --git a/packages/libz/libz.spec b/packages/libz/libz.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libz
 Version: 1.3.1
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for zlib compression
 URL: https://www.zlib.net/
 License: Zlib

diff --git a/packages/libzstd/libzstd.spec b/packages/libzstd/libzstd.spec
@@ -1,6 +1,7 @@
 Name: %{_cross_os}libzstd
 Version: 1.5.6
 Release: 1%{?dist}
+Epoch: 1
 Summary: Library for Zstandard compression
 License: BSD-3-Clause AND GPL-2.0-only
 URL: https://github.com/facebook/zstd/