Update to 1.11.0 upstream release
Upstream tag: v1.11.0 Upstream commit: ab4f101a Commit authored by Packit automation (https://packit.dev/)
This commit is contained in:
parent
102d852fb7
commit
509abee1d2
2
.gitignore
vendored
2
.gitignore
vendored
@ -33,3 +33,5 @@
|
||||
/netavark-v1.10.2-vendor.tar.gz
|
||||
/v1.10.3.tar.gz
|
||||
/netavark-v1.10.3-vendor.tar.gz
|
||||
/v1.11.0.tar.gz
|
||||
/netavark-v1.11.0-vendor.tar.gz
|
||||
|
62
.packit.yaml
62
.packit.yaml
@ -2,9 +2,19 @@
|
||||
# See the documentation for more information:
|
||||
# https://packit.dev/docs/configuration/
|
||||
|
||||
specfile_path: rpm/netavark.spec
|
||||
downstream_package_name: netavark
|
||||
upstream_tag_template: v{version}
|
||||
|
||||
packages:
|
||||
netavark-fedora:
|
||||
pkg_tool: fedpkg
|
||||
specfile_path: rpm/netavark.spec
|
||||
netavark-centos:
|
||||
pkg_tool: centpkg
|
||||
specfile_path: rpm/netavark.spec
|
||||
netavark-rhel:
|
||||
specfile_path: rpm/netavark.spec
|
||||
|
||||
srpm_build_deps:
|
||||
- cargo
|
||||
- make
|
||||
@ -13,23 +23,45 @@ srpm_build_deps:
|
||||
jobs:
|
||||
- job: copr_build
|
||||
trigger: pull_request
|
||||
notifications:
|
||||
packages: [netavark-fedora]
|
||||
notifications: &copr_build_failure_notification
|
||||
failure_comment:
|
||||
message: "Ephemeral COPR build failed. @containers/packit-build please check."
|
||||
enable_net: true
|
||||
targets:
|
||||
- fedora-all-x86_64
|
||||
- fedora-all-aarch64
|
||||
- centos-stream+epel-next-8-x86_64
|
||||
- centos-stream+epel-next-8-aarch64
|
||||
- centos-stream+epel-next-9-x86_64
|
||||
- centos-stream+epel-next-9-aarch64
|
||||
fedora-all-x86_64: {}
|
||||
fedora-all-aarch64: {}
|
||||
fedora-eln-x86_64:
|
||||
additional_repos:
|
||||
- "copr://rhcontainerbot/podman-next"
|
||||
- "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
|
||||
fedora-eln-aarch64:
|
||||
additional_repos:
|
||||
- "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
|
||||
enable_net: true
|
||||
|
||||
- job: copr_build
|
||||
trigger: pull_request
|
||||
packages: [netavark-centos]
|
||||
notifications: *copr_build_failure_notification
|
||||
targets:
|
||||
- centos-stream-9-x86_64
|
||||
- centos-stream-9-aarch64
|
||||
- centos-stream-10-x86_64
|
||||
- centos-stream-10-aarch64
|
||||
enable_net: true
|
||||
|
||||
- job: copr_build
|
||||
trigger: pull_request
|
||||
packages: [netavark-rhel]
|
||||
notifications: *copr_build_failure_notification
|
||||
targets:
|
||||
- epel-9-x86_64
|
||||
- epel-9-aarch64
|
||||
enable_net: true
|
||||
|
||||
# Run on commit to main branch
|
||||
- job: copr_build
|
||||
trigger: commit
|
||||
packages: [netavark-fedora]
|
||||
notifications:
|
||||
failure_comment:
|
||||
message: "podman-next COPR build failed. @containers/packit-build please check."
|
||||
@ -38,12 +70,22 @@ jobs:
|
||||
project: podman-next
|
||||
enable_net: true
|
||||
|
||||
# Sync to Fedora
|
||||
- job: propose_downstream
|
||||
trigger: release
|
||||
packages: [netavark-fedora]
|
||||
update_release: false
|
||||
dist_git_branches:
|
||||
- fedora-all
|
||||
|
||||
# Sync to CentOS Stream
|
||||
- job: propose_downstream
|
||||
trigger: release
|
||||
packages: [netavark-centos]
|
||||
update_release: false
|
||||
dist_git_branches:
|
||||
- c10s
|
||||
|
||||
- job: koji_build
|
||||
trigger: commit
|
||||
dist_git_branches:
|
||||
|
@ -1,3 +1,3 @@
|
||||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 0.90.0.post1.dev9+g1f0325d1.
|
||||
The file was generated using packit 0.97.1.
|
||||
|
@ -2,14 +2,6 @@
|
||||
# Latest upstream rtnetlink frequently required
|
||||
# sha2, zbus, zvariant are currently out of date
|
||||
|
||||
# RHEL doesn't include the package rust-packaging which provides %%__cargo macro, but EPEL
|
||||
# does. So we set it separately here and skip rust-packaging dependency for RHEL.
|
||||
# Buildability without EPEL is essential for packit builds.
|
||||
# ELN doesn't need this.
|
||||
%if %{defined rhel} && 0%{?rhel} < 10
|
||||
%define __cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Clink-arg=-Wl,-z,relro -Clink-arg=-Wl,-z,now --cap-lints=warn' %{_bindir}/cargo
|
||||
%endif
|
||||
|
||||
%global with_debug 1
|
||||
|
||||
%if 0%{?with_debug}
|
||||
@ -22,14 +14,23 @@
|
||||
# Minimum X.Y dep for aardvark-dns
|
||||
%define major_minor %((v=%{version}; echo ${v%.*}))
|
||||
|
||||
# Set default firewall to nftables on CentOS Stream 10+, RHEL 10+
|
||||
# and default to iptables on all other environments
|
||||
# The `rhel` macro is defined on CentOS Stream, RHEL as well as Fedora ELN.
|
||||
%if %{defined rhel} && 0%{?rhel} >= 10
|
||||
%define default_fw nftables
|
||||
%else
|
||||
%define default_fw iptables
|
||||
%endif
|
||||
|
||||
Name: netavark
|
||||
# Set a different Epoch for copr builds
|
||||
%if %{defined copr_username}
|
||||
Epoch: 102
|
||||
%else
|
||||
Epoch: 2
|
||||
Epoch: 0
|
||||
%endif
|
||||
Version: 1.10.3
|
||||
Version: 1.11.0
|
||||
Release: %autorelease
|
||||
# The `AND` needs to be uppercase in the License for SPDX compatibility
|
||||
License: Apache-2.0 AND BSD-3-Clause AND MIT
|
||||
@ -46,8 +47,7 @@ Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
|
||||
BuildRequires: cargo
|
||||
BuildRequires: %{_bindir}/go-md2man
|
||||
# aardvark-dns and %%{name} are usually released in sync
|
||||
Recommends: aardvark-dns >= %{epoch}:%{major_minor}
|
||||
Requires: (aardvark-dns >= %{epoch}:%{major_minor} if fedora-release-identity-server)
|
||||
Requires: aardvark-dns >= %{epoch}:%{major_minor}
|
||||
Provides: container-network-stack = 2
|
||||
BuildRequires: make
|
||||
BuildRequires: protobuf-c
|
||||
@ -102,7 +102,7 @@ EOF
|
||||
%endif
|
||||
|
||||
%build
|
||||
%{__make} CARGO="%{__cargo}" build
|
||||
NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" build
|
||||
|
||||
cd docs
|
||||
%{__make}
|
||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (v1.10.3.tar.gz) = fd8a435e6f151bcae3fb7666d1efbed56b9a7baa2586a0b2687abf030fd0a706bb374679c74d637135b2593597cb810f0562a78588af7f6ea437ee59c0fde600
|
||||
SHA512 (netavark-v1.10.3-vendor.tar.gz) = b8a99f45ba4ebb20414fe052ff08b1e7a7a86994c7dfa2f36d0500d52bcbd2d279aeff19fb0844a65e2375e86da33af735851f038f598771d2dac96ff7e032a5
|
||||
SHA512 (v1.11.0.tar.gz) = d10f0c70655c4ff38f68c0bb1037d9bd193ae56739d80afb3bd8791943b3c47bdba26bd6c102360f8e98e519105effb43cb84439fa44358d640f40e99fe3827f
|
||||
SHA512 (netavark-v1.11.0-vendor.tar.gz) = d858bddaaf41b284af9ede84a4d3aab5b5935ea83df5261dfa58e2b7d14962dd55983b1a95b2692e323ea40fc2dc4d9b1bdf2aed90644739e6333c794a7915cb
|
||||
|
Loading…
Reference in New Issue
Block a user