Move nbdkit and its dependent packages from Extended to Core (#4163)
The dependent packages being Podman, Containernetworking-plugins, go-rpm-macros, catatonit, slirp4netns and buildah.
This commit is contained in:
Ameya Usgaonkar
GitHub
Родитель
10295e3465
Коммит
21d673ed73
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"nbdkit-1.20.7.tar.gz": "999242d56787f69b79eddcd64e5cb2c3071d4bd8ed98dc7da711a09fca8095ec"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,20 +1,10 @@
|
|||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
%global with_bundled 1
|
||||
|
||||
|
||||
%global with_debug 1
|
||||
|
||||
|
||||
|
||||
|
||||
%if 0%{?with_debug}
|
||||
%global _find_debuginfo_dwz_opts %{nil}
|
||||
%global _dwz_low_mem_die_limit 0
|
||||
%else
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
%global provider github
|
||||
%global provider_tld com
|
||||
%global project containers
|
||||
|
|
@ -22,53 +12,37 @@ Distribution: Mariner
|
|||
# https://github.com/containers/buildah
|
||||
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
|
||||
%global git0 https://%{import_path}
|
||||
|
||||
# Used for comparing with latest upstream tag
|
||||
# to decide whether to autobuild (non-rawhide only)
|
||||
%define built_tag v1.18.0
|
||||
%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
|
||||
%define download_url https://%{import_path}/archive/%{built_tag}.tar.gz
|
||||
|
||||
Name: %{repo}
|
||||
Version: 1.18.0
|
||||
Release: 6%{?dist}
|
||||
Summary: A command line tool used for creating OCI Images
|
||||
License: ASL 2.0
|
||||
URL: https://%{name}.io
|
||||
Source: %{download_url}#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: golang
|
||||
BuildRequires: git
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: glibc-static >= 2.35-3%{?dist}
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: go-rpm-macros
|
||||
BuildRequires: gpgme-devel
|
||||
BuildRequires: libassuan-devel
|
||||
BuildRequires: make
|
||||
Requires: containers-common
|
||||
# No ostree for centos 7
|
||||
|
||||
BuildRequires: ostree-devel
|
||||
|
||||
# No btrfs for centos 8
|
||||
|
||||
BuildRequires: btrfs-progs-devel
|
||||
|
||||
|
||||
Requires: crun >= 0.10-1
|
||||
BuildRequires: libseccomp-static
|
||||
Recommends: container-selinux
|
||||
Requires: libseccomp >= 2.4.1-0
|
||||
Recommends: slirp4netns >= 0.3-0
|
||||
Recommends: fuse-overlayfs
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Summary: A command line tool used for creating OCI Images
|
||||
Name: %{repo}
|
||||
Version: 1.18.0
|
||||
Release: 7%{?dist}
|
||||
License: Apache-2.0
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: https://%{name}.io
|
||||
Source: https://%{import_path}/archive/%{built_tag}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: btrfs-progs-devel
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: git
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: glibc-static >= 2.35-3%{?dist}
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: go-rpm-macros
|
||||
BuildRequires: golang
|
||||
BuildRequires: gpgme-devel
|
||||
BuildRequires: libassuan-devel
|
||||
BuildRequires: libseccomp-static
|
||||
BuildRequires: make
|
||||
BuildRequires: ostree-devel
|
||||
Requires: libcontainers-common
|
||||
Requires: libseccomp >= 2.4.1-0
|
||||
Recommends: container-selinux
|
||||
Recommends: fuse-overlayfs
|
||||
Recommends: slirp4netns >= 0.3-0
|
||||
|
||||
%description
|
||||
The %{name} package provides a command line tool which can be used to
|
||||
|
|
@ -79,23 +53,6 @@ or
|
|||
* save container's root file system layer to create a new image
|
||||
* delete a working container or an image
|
||||
|
||||
%package tests
|
||||
Summary: Tests for %{name}
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: bats
|
||||
Requires: bzip2
|
||||
Requires: podman
|
||||
Requires: golang
|
||||
Requires: jq
|
||||
Requires: httpd-tools
|
||||
Requires: openssl
|
||||
|
||||
%description tests
|
||||
%{summary}
|
||||
|
||||
This package contains system tests for %{name}
|
||||
|
||||
%prep
|
||||
%autosetup -Sgit -n %{name}-%{built_tag_strip}
|
||||
sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
|
||||
|
|
@ -112,25 +69,14 @@ mv vendor src
|
|||
|
||||
export GOPATH=$(pwd)/_build:$(pwd)
|
||||
export BUILDTAGS='seccomp selinux'
|
||||
%if 0%{?centos} >= 8
|
||||
export BUILDTAGS+=' exclude_graphdriver_btrfs'
|
||||
%endif
|
||||
%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
|
||||
%gobuild -o imgtype %{import_path}/tests/imgtype
|
||||
GOMD2MAN=go-md2man %{__make} -C docs
|
||||
GOMD2MAN=go-md2man make -C docs
|
||||
|
||||
%install
|
||||
export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
|
||||
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
|
||||
make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
|
||||
|
||||
install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
|
||||
cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
|
||||
cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
|
||||
|
||||
#define license tag if not already defined
|
||||
%{!?_licensedir:%global license %doc}
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
|
|
@ -140,12 +86,11 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
|
|||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/%{name}
|
||||
|
||||
%files tests
|
||||
%license LICENSE
|
||||
%{_bindir}/%{name}-imgtype
|
||||
%{_datadir}/%{name}/test
|
||||
|
||||
%changelog
|
||||
* Tue Nov 01 2022 Ameya Usgaonkar <ausgaonkar@microsoft.com> - 1.18.0-7
|
||||
- Move to core packages
|
||||
- Remove tests package
|
||||
|
||||
* Tue Nov 01 2022 Olivia Crain <oliviacrain@microsoft.com> - 1.18.0-6
|
||||
- Bump release to rebuild with go 1.18.8
|
||||
|
||||
|
|
@ -1,23 +1,21 @@
|
|||
Summary: A signal-forwarding process manager for containers
|
||||
Name: catatonit
|
||||
Version: 0.1.7
|
||||
Release: 7%{?dist}
|
||||
License: GPLv3+
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
||||
Name: catatonit
|
||||
Version: 0.1.7
|
||||
Release: 6%{?dist}
|
||||
Summary: A signal-forwarding process manager for containers
|
||||
License: GPLv3+
|
||||
URL: https://github.com/openSUSE/catatonit
|
||||
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: file
|
||||
BuildRequires: gcc
|
||||
BuildRequires: git
|
||||
BuildRequires: glibc-static >= 2.35-3%{?dist}
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
|
||||
Provides: podman-%{name} = %{version}-%{release}
|
||||
URL: https://github.com/openSUSE/catatonit
|
||||
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: file
|
||||
BuildRequires: gcc
|
||||
BuildRequires: git
|
||||
BuildRequires: glibc-static >= 2.35-3%{?dist}
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
Provides: podman-%{name} = %{version}-%{release}
|
||||
|
||||
%description
|
||||
Catatonit is a /sbin/init program for use within containers. It
|
||||
|
|
@ -36,7 +34,7 @@ sed -i '$d' configure.ac
|
|||
%build
|
||||
autoreconf -fi
|
||||
%configure
|
||||
%{__make} %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
# Make sure we *always* build a static binary. Otherwise we'll break containers
|
||||
# that don't have the necessary shared libs.
|
||||
|
|
@ -61,6 +59,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
|
|||
%{_libexecdir}/podman/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Nov 01 2022 Ameya Usgaonkar <ausgaonkar@microsoft.com> - 0.1.7-7
|
||||
- Move to core packages
|
||||
|
||||
* Tue Sep 13 2022 Andy Caldwell <andycaldwell@microsoft.com> - 0.1.7-6
|
||||
- Rebuilt for glibc-static 2.35-3
|
||||
|
||||
|
|
@ -1,12 +1,10 @@
|
|||
%global with_debug 1
|
||||
|
||||
%if 0%{?with_debug}
|
||||
%global _find_debuginfo_dwz_opts %{nil}
|
||||
%global _dwz_low_mem_die_limit 0
|
||||
%else
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
%global provider github
|
||||
%global provider_tld com
|
||||
%global project containernetworking
|
||||
|
|
@ -14,63 +12,59 @@
|
|||
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
|
||||
%global import_path %{provider_prefix}
|
||||
%global git0 https://%{import_path}
|
||||
|
||||
# Used for comparing with latest upstream tag
|
||||
# to decide whether to autobuild (non-rawhide only)
|
||||
%define built_tag v1.1.1
|
||||
%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
|
||||
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
|
||||
%define download_url %{git0}/archive/%{built_tag}.tar.gz
|
||||
|
||||
Name: %{project}-%{repo}
|
||||
Version: 1.1.1
|
||||
Release: 3%{?dist}
|
||||
Summary: Libraries for writing CNI plugin
|
||||
License: ASL 2.0 and BSD and MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: %{git0}
|
||||
Source0: %{download_url}#/%{name}-%{version}.tar.gz
|
||||
Summary: Libraries for writing CNI plugin
|
||||
Name: %{project}-%{repo}
|
||||
Version: 1.1.1
|
||||
Release: 4%{?dist}
|
||||
License: Apache-2.0 AND BSD AND MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: %{git0}
|
||||
Source0: %{download_url}#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: git
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: go-rpm-macros
|
||||
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
|
||||
BuildRequires: golang
|
||||
BuildRequires: git
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: go-rpm-macros
|
||||
BuildRequires: systemd-devel
|
||||
Requires: systemd
|
||||
|
||||
|
||||
Obsoletes: %{project}-cni < 0.7.1-2
|
||||
Provides: %{project}-cni = %{version}-%{release}
|
||||
Provides: kubernetes-cni
|
||||
Provides: container-network-stack = 1
|
||||
BuildRequires: golang
|
||||
BuildRequires: systemd-devel
|
||||
Requires: systemd
|
||||
Obsoletes: %{project}-cni < 0.7.1-2
|
||||
Provides: %{project}-cni = %{version}-%{release}
|
||||
Provides: kubernetes-cni
|
||||
Provides: container-network-stack = 1
|
||||
# vendored libraries
|
||||
# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
|
||||
Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.4.17
|
||||
Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.20
|
||||
Provides: bundled(golang(github.com/alexflint/go_filemutex)) = v1.1.0
|
||||
Provides: bundled(golang(github.com/buger/jsonparser)) = v1.1.1
|
||||
Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.1
|
||||
Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1
|
||||
Provides: bundled(golang(github.com/coreos/go_iptables)) = v0.6.0
|
||||
Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2
|
||||
Provides: bundled(golang(github.com/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c
|
||||
Provides: bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0
|
||||
Provides: bundled(golang(github.com/d2g/dhcp4server)) = v0.0.0_20181031114812_7d4a0a7f59a5
|
||||
Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9
|
||||
Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.0.4
|
||||
Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2
|
||||
Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20200121045136_8c9f03a8e57e
|
||||
Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
|
||||
Provides: bundled(golang(github.com/networkplumbing/go_nft)) = v0.2.0
|
||||
Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8
|
||||
Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.4
|
||||
Provides: bundled(golang(github.com/onsi/gomega)) = v1.15.0
|
||||
Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
|
||||
Provides: bundled(golang(github.com/safchain/ethtool)) = v0.0.0_20210803160452_9aa261dae9b1
|
||||
Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
|
||||
Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20210330154013_f5de75959ad5
|
||||
Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
|
||||
Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.4.17
|
||||
Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.20
|
||||
Provides: bundled(golang(github.com/alexflint/go_filemutex)) = v1.1.0
|
||||
Provides: bundled(golang(github.com/buger/jsonparser)) = v1.1.1
|
||||
Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.1
|
||||
Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1
|
||||
Provides: bundled(golang(github.com/coreos/go_iptables)) = v0.6.0
|
||||
Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2
|
||||
Provides: bundled(golang(github.com/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c
|
||||
Provides: bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0
|
||||
Provides: bundled(golang(github.com/d2g/dhcp4server)) = v0.0.0_20181031114812_7d4a0a7f59a5
|
||||
Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9
|
||||
Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.0.4
|
||||
Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2
|
||||
Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20200121045136_8c9f03a8e57e
|
||||
Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
|
||||
Provides: bundled(golang(github.com/networkplumbing/go_nft)) = v0.2.0
|
||||
Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8
|
||||
Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.4
|
||||
Provides: bundled(golang(github.com/onsi/gomega)) = v1.15.0
|
||||
Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
|
||||
Provides: bundled(golang(github.com/safchain/ethtool)) = v0.0.0_20210803160452_9aa261dae9b1
|
||||
Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
|
||||
Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20210330154013_f5de75959ad5
|
||||
Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
|
||||
|
||||
%description
|
||||
The CNI (Container Network Interface) project consists of a specification
|
||||
|
|
@ -79,7 +73,6 @@ containers, along with a number of supported plugins. CNI concerns itself
|
|||
only with network connectivity of containers and removing allocated resources
|
||||
when the container is deleted.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -Sgit -n %{repo}-%{built_tag_strip}
|
||||
rm -rf plugins/main/windows
|
||||
|
|
@ -117,9 +110,6 @@ install -dp %{buildroot}%{_unitdir}
|
|||
install -p plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir}
|
||||
install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
|
||||
|
||||
#define license tag if not already defined
|
||||
%{!?_licensedir:%global license %doc}
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc *.md
|
||||
|
|
@ -129,6 +119,9 @@ install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
|
|||
%{_unitdir}/cni-dhcp.socket
|
||||
|
||||
%changelog
|
||||
* Tue Nov 01 2022 Ameya Usgaonkar <ausgaonkar@microsoft.com> - 1.1.1-4
|
||||
- Move to core packages
|
||||
|
||||
* Tue Nov 01 2022 Olivia Crain <oliviacrain@microsoft.com> - 1.1.1-3
|
||||
- Bump release to rebuild with go 1.18.8
|
||||
|
||||
|
|
@ -1,11 +1,7 @@
|
|||
%global rcluadir %{_rpmconfigdir}/lua/mariner
|
||||
%global rpmmacrodir %{_rpmconfigdir}/macros.d
|
||||
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
%global forgeurl https://pagure.io/go-rpm-macros
|
||||
Version: 3.0.9
|
||||
%forgemeta
|
||||
|
||||
#https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51
|
||||
%global _spectemplatedir %{_datadir}/rpmdevtools/mariner
|
||||
|
|
@ -19,33 +15,34 @@ Version: 3.0.9
|
|||
# make Go devel packages archful
|
||||
%global gopath %{_datadir}/gocode
|
||||
|
||||
Summary: Build-stage rpm automation for Go packages
|
||||
Name: go-rpm-macros
|
||||
Version: 3.0.9
|
||||
Release: 4%{?dist}
|
||||
License: GPLv3+
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
%forgemeta
|
||||
URL: %{forgeurl}
|
||||
Source: %{forgesource}
|
||||
Patch0: fixing_ldflags_for_mariner.patch
|
||||
|
||||
Requires: go-srpm-macros = %{version}-%{release}
|
||||
Requires: go-filesystem = %{version}-%{release}
|
||||
ExclusiveArch: %{golang_arches} %{gccgo_arches}
|
||||
|
||||
Name: go-rpm-macros
|
||||
Release: 3%{?dist}
|
||||
Summary: Build-stage rpm automation for Go packages
|
||||
|
||||
License: GPLv3+
|
||||
URL: %{forgeurl}
|
||||
# Source: https://pagure.io/go-rpm-macros/archive/3.0.9/go-rpm-macros-3.0.9.tar.gz
|
||||
Source: %{forgesource}
|
||||
Patch0: fixing_ldflags_for_mariner.patch
|
||||
|
||||
Requires: go-srpm-macros = %{version}-%{release}
|
||||
Requires: go-filesystem = %{version}-%{release}
|
||||
|
||||
%ifarch %{golang_arches}
|
||||
Requires: golang
|
||||
Provides: compiler(golang)
|
||||
Provides: compiler(go-compiler) = 2
|
||||
Obsoletes: go-compilers-golang-compiler < %{version}-%{release}
|
||||
Requires: golang
|
||||
Provides: compiler(golang)
|
||||
Provides: compiler(go-compiler) = 2
|
||||
Obsoletes: go-compilers-golang-compiler < %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%ifarch %{gccgo_arches}
|
||||
Requires: gcc-go
|
||||
Provides: compiler(gcc-go)
|
||||
Provides: compiler(go-compiler) = 1
|
||||
Obsoletes: go-compilers-gcc-go-compiler < %{version}-%{release}
|
||||
Requires: gcc-go
|
||||
Provides: compiler(gcc-go)
|
||||
Provides: compiler(go-compiler) = 1
|
||||
Obsoletes: go-compilers-gcc-go-compiler < %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
|
@ -58,7 +55,7 @@ pull it in for Go packages only.
|
|||
%package -n go-srpm-macros
|
||||
Summary: Source-stage rpm automation for Go packages
|
||||
BuildArch: noarch
|
||||
Requires: redhat-rpm-config
|
||||
Requires: mariner-rpm-macros
|
||||
|
||||
%description -n go-srpm-macros
|
||||
This package provides SRPM-stage rpm automation to simplify the creation of Go
|
||||
|
|
@ -170,6 +167,9 @@ install -m 0644 -vp rpm/macros.d/macros.go-compilers-gcc \
|
|||
%{_spectemplatedir}/*.spec
|
||||
|
||||
%changelog
|
||||
* Tue Nov 01 2022 Ameya Usgaonkar <ausgaonkar@microsoft.com> - 3.0.9-4
|
||||
- Move to core package
|
||||
|
||||
* Tue Mar 01 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.0.9-3
|
||||
- Fixing Go's linker flags.
|
||||
- License verified.
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
#!/bin/bash -
|
||||
|
||||
# Generate RPM provides automatically for nbdkit packages and filters.
|
||||
# Copyright (C) 2009-2022 Red Hat Inc.
|
||||
|
||||
# To test:
|
||||
# find /usr/lib64/nbdkit/plugins | ./nbdkit-find-provides VER REL
|
||||
# find /usr/lib64/nbdkit/filters | ./nbdkit-find-provides VER REL
|
||||
|
||||
ver="$1"
|
||||
rel="$2"
|
||||
|
||||
function process_file
|
||||
{
|
||||
if [[ $1 =~ /plugins/nbdkit-.*-plugin ]] ||
|
||||
[[ $1 =~ /filters/nbdkit-.*-filter ]]; then
|
||||
echo "Provides:" "$(basename $1 .so)" "=" "$ver-$rel"
|
||||
fi
|
||||
}
|
||||
|
||||
while read line; do
|
||||
process_file "$line"
|
||||
done
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
%__nbdkit_provides %{_rpmconfigdir}/nbdkit-find-provides %{version} %{release}
|
||||
%__nbdkit_path %{_libdir}/nbdkit/(plugins|filters)/nbdkit-.*-(plugin|filter)(\.so)?$
|
||||
%__nbdkit_flags exeonly
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"nbdkit-1.30.10.tar.gz": "9c7047827e568c15a372a489869eecc374d272177fb6752859c4472dfcf68ef4"
|
||||
}
|
||||
}
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -1,13 +1,5 @@
|
|||
%global with_check 0
|
||||
%global with_debug 1
|
||||
|
||||
%if 0%{?with_debug}
|
||||
%global _find_debuginfo_dwz_opts %{nil}
|
||||
%global _dwz_low_mem_die_limit 0
|
||||
%else
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
%global provider github
|
||||
%global provider_tld com
|
||||
%global project containers
|
||||
|
|
@ -15,7 +7,6 @@
|
|||
# https://github.com/containers/%%{name}
|
||||
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
|
||||
%global git0 https://%{import_path}
|
||||
|
||||
# dnsname
|
||||
%global repo_plugins dnsname
|
||||
# https://github.com/containers/dnsname
|
||||
|
|
@ -23,7 +14,6 @@
|
|||
%global git_plugins https://%{import_path_plugins}
|
||||
%global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84
|
||||
%global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7})
|
||||
|
||||
# gvproxy
|
||||
%global repo_gvproxy gvisor-tap-vsock
|
||||
# https://github.com/containers/gvisor-tap-vsock
|
||||
|
|
@ -31,52 +21,49 @@
|
|||
%global git_gvproxy https://%{import_path_gvproxy}
|
||||
%global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07
|
||||
%global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7})
|
||||
|
||||
%global built_tag v4.1.1
|
||||
|
||||
Summary: Manage Pods, Containers and Container Images
|
||||
Name: podman
|
||||
Version: 4.1.1
|
||||
Release: 4%{?dist}
|
||||
License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0
|
||||
Summary: Manage Pods, Containers and Container Images
|
||||
Release: 5%{?dist}
|
||||
License: Apache-2.0 AND BSD AND ISC AND MIT AND MPLv2.0
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: https://%{name}.io/
|
||||
Source0: %{git0}/archive/%{built_tag}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz#/%{repo_plugins}-%{shortcommit_plugins}.tar.gz
|
||||
Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz#/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz
|
||||
Provides: %{name}-manpages = %{version}-%{release}
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: golang
|
||||
BuildRequires: gcc
|
||||
BuildRequires: git
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: glibc-static >= 2.35-3%{?dist}
|
||||
BuildRequires: git
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: go-rpm-macros
|
||||
BuildRequires: golang
|
||||
BuildRequires: gpgme-devel
|
||||
BuildRequires: libassuan-devel
|
||||
BuildRequires: libcontainers-common
|
||||
BuildRequires: libgpg-error-devel
|
||||
BuildRequires: libseccomp-devel
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: shadow-utils
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: make
|
||||
BuildRequires: ostree-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: shadow-utils
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: libcontainers-common
|
||||
Requires: catatonit
|
||||
Requires: iptables
|
||||
Requires: nftables
|
||||
Requires: conmon >= 2.0.30
|
||||
Requires: libcontainers-common
|
||||
Requires: netavark >= 1.0.3
|
||||
Requires: shadow-utils-subid
|
||||
Requires: moby-runc
|
||||
Requires: slirp4netns
|
||||
Requires: containernetworking-plugins >= 0.9.1
|
||||
Requires: iptables
|
||||
Requires: libcontainers-common
|
||||
Requires: moby-runc
|
||||
Requires: netavark >= 1.0.3
|
||||
Requires: nftables
|
||||
Requires: shadow-utils-subid
|
||||
Requires: slirp4netns
|
||||
Suggests: qemu-user-static
|
||||
|
||||
Provides: %{name}-manpages = %{version}-%{release}
|
||||
# vendored libraries
|
||||
# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
|
||||
Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.1.0
|
||||
|
|
@ -156,41 +143,22 @@ manipulate images (but not containers) created by the other.
|
|||
%{repo} Simple management tool for pods, containers and images
|
||||
|
||||
%package docker
|
||||
Summary: Emulate Docker CLI using %{name}
|
||||
BuildArch: noarch
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Conflicts: docker
|
||||
Conflicts: docker-latest
|
||||
Conflicts: docker-ce
|
||||
Conflicts: docker-ee
|
||||
Conflicts: moby-engine
|
||||
Summary: Emulate Docker CLI using %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Conflicts: docker
|
||||
Conflicts: docker-ce
|
||||
Conflicts: docker-ee
|
||||
Conflicts: docker-latest
|
||||
Conflicts: moby-engine
|
||||
BuildArch: noarch
|
||||
|
||||
%description docker
|
||||
This package installs a script named docker that emulates the Docker CLI by
|
||||
executes %{name} commands, it also creates links between all Docker CLI man
|
||||
pages and %{name}.
|
||||
|
||||
%package tests
|
||||
Summary: Tests for %{name}
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: bats
|
||||
Requires: jq
|
||||
Requires: skopeo
|
||||
Requires: nmap-ncat
|
||||
Requires: httpd-tools
|
||||
Requires: openssl
|
||||
Requires: socat
|
||||
Requires: buildah
|
||||
Requires: gnupg
|
||||
|
||||
%description tests
|
||||
%{summary}
|
||||
|
||||
This package contains system tests for %{name}
|
||||
|
||||
%package remote
|
||||
Summary: (Experimental) Remote client for managing %{name} containers
|
||||
Summary: (Experimental) Remote client for managing %{name} containers
|
||||
|
||||
%description remote
|
||||
Remote client for managing %{name} containers.
|
||||
|
|
@ -203,9 +171,9 @@ manage pods, containers and container images. %{name}-remote supports ssh
|
|||
connections as well.
|
||||
|
||||
%package plugins
|
||||
Summary: Plugins for %{name}
|
||||
Requires: dnsmasq
|
||||
Recommends: %{name}-gvproxy = %{version}-%{release}
|
||||
Summary: Plugins for %{name}
|
||||
Requires: dnsmasq
|
||||
Recommends: %{name}-gvproxy = %{version}-%{release}
|
||||
|
||||
%description plugins
|
||||
This plugin sets up the use of dnsmasq on a given CNI network so
|
||||
|
|
@ -216,7 +184,7 @@ is removed from the network, it will remove the entry from the hosts
|
|||
file. Each CNI network will have its own dnsmasq instance.
|
||||
|
||||
%package gvproxy
|
||||
Summary: Go replacement for libslirp and VPNKit
|
||||
Summary: Go replacement for libslirp and VPNKit
|
||||
|
||||
%description gvproxy
|
||||
A replacement for libslirp and VPNKit, written in pure Go.
|
||||
|
|
@ -235,7 +203,6 @@ tar zxf %{SOURCE1}
|
|||
tar zxf %{SOURCE2}
|
||||
|
||||
%build
|
||||
%if "%{_vendor}" != "debbuild"
|
||||
%set_build_flags
|
||||
export CGO_CFLAGS=$CFLAGS
|
||||
# These extra flags present in $CFLAGS have been skipped for now as they break the build
|
||||
|
|
@ -246,7 +213,6 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an
|
|||
%ifarch x86_64
|
||||
export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
export GO111MODULE=off
|
||||
export GOPATH=$(pwd)/_build:$(pwd)
|
||||
|
|
@ -295,7 +261,7 @@ export GOPATH=$(pwd)/_build:$(pwd)
|
|||
%gobuild -o bin/gvproxy %{import_path_gvproxy}/cmd/gvproxy
|
||||
cd ..
|
||||
|
||||
%{__make} docs docker-docs
|
||||
make docs docker-docs
|
||||
|
||||
%install
|
||||
install -dp %{buildroot}%{_unitdir}
|
||||
|
|
@ -329,11 +295,6 @@ done
|
|||
|
||||
rm -f %{buildroot}%{_mandir}/man5/docker*.5
|
||||
|
||||
install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
|
||||
cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
|
||||
|
||||
#define license tag if not already defined
|
||||
%{!?_licensedir:%global license %doc}
|
||||
|
||||
%files -f %{name}.file-list
|
||||
%license LICENSE
|
||||
|
|
@ -367,10 +328,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
|
|||
%dir %{_datadir}/zsh/site-functions
|
||||
%{_datadir}/zsh/site-functions/_%{name}-remote
|
||||
|
||||
%files tests
|
||||
%license LICENSE
|
||||
%{_datadir}/%{name}/test
|
||||
|
||||
%files plugins
|
||||
%license %{repo_plugins}-%{commit_plugins}/LICENSE
|
||||
%doc %{repo_plugins}-%{commit_plugins}/{README.md,README_PODMAN.md}
|
||||
|
|
@ -383,9 +340,12 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
|
|||
%dir %{_libexecdir}/%{name}
|
||||
%{_libexecdir}/%{name}/gvproxy
|
||||
|
||||
|
||||
# rhcontainerbot account currently managed by lsm5
|
||||
%changelog
|
||||
* Tue Nov 01 2022 Ameya Usgaonkar <ausgaonkar@microsoft.com> - 4.1.1-5
|
||||
- Move to core package
|
||||
- Removed tests package
|
||||
|
||||
* Tue Nov 01 2022 Olivia Crain <oliviacrain@microsoft.com> - 4.1.1-4
|
||||
- Bump release to rebuild with go 1.18.8
|
||||
|
||||
|
|
@ -2482,6 +2442,7 @@ succeed
|
|||
- autobuilt 623fcfa
|
||||
|
||||
* Tue Feb 26 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.0.1-39.dev.gitcf52144
|
||||
|
||||
* Tue Feb 26 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.0.1-38.dev.gitcf52144
|
||||
- autobuilt cf52144
|
||||
|
||||
|
|
@ -2736,7 +2697,6 @@ succeed
|
|||
* Sat Nov 10 2018 Dan Walsh <dwalsh@redhat.com> - 1:0.11.20.11.2-2.dev.git78e6d8e1
|
||||
- Remove dirty flag from podman version
|
||||
|
||||
|
||||
* Sat Nov 10 2018 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 1:0.11.20.11.2-1.dev.git7965716.dev.git78e6d8e1
|
||||
- bump to 0.11.2
|
||||
- autobuilt 78e6d8e
|
||||
|
|
@ -1,41 +1,39 @@
|
|||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
%global git0 https://github.com/rootless-containers/%{name}
|
||||
%global commit0 4367de7c3361c344155220a4e999ffd7432dad81
|
||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
|
||||
# Used for comparing with latest upstream tag
|
||||
# to decide whether to autobuild (non-rawhide only)
|
||||
%define built_tag v1.1.8
|
||||
%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
|
||||
%define download_url %{git0}/archive/%{built_tag}.tar.gz
|
||||
|
||||
Name: slirp4netns
|
||||
Version: 1.1.8
|
||||
Release: 2%{?dist}
|
||||
Summary: slirp for network namespaces
|
||||
Name: slirp4netns
|
||||
Version: 1.1.8
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2 AND MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: %{git0}
|
||||
Source0: %{download_url}#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gcc
|
||||
BuildRequires: git
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libseccomp-devel
|
||||
BuildRequires: libslirp-devel
|
||||
BuildRequires: make
|
||||
# no go-md2man in ppc64
|
||||
ExcludeArch: ppc64
|
||||
Summary: slirp for network namespaces
|
||||
License: GPLv2
|
||||
URL: %{git0}
|
||||
Source0: %{download_url}#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gcc
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: git
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libseccomp-devel
|
||||
BuildRequires: libslirp-devel
|
||||
BuildRequires: make
|
||||
ExcludeArch: ppc64
|
||||
|
||||
%description
|
||||
slirp for network namespaces, without copying buffers across the namespaces.
|
||||
|
||||
%package devel
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
|
||||
%description devel
|
||||
%{summary}
|
||||
|
|
@ -50,16 +48,13 @@ building other packages which use import path with
|
|||
%build
|
||||
./autogen.sh
|
||||
./configure --prefix=%{_usr} --libdir=%{_libdir}
|
||||
%{__make} generate-man
|
||||
make generate-man
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install install-man
|
||||
|
||||
%check
|
||||
|
||||
#define license tag if not already defined
|
||||
%{!?_licensedir:%global license %doc}
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc README.md
|
||||
|
|
@ -67,6 +62,10 @@ make DESTDIR=%{buildroot} install install-man
|
|||
%{_mandir}/man1/%{name}.1.gz
|
||||
|
||||
%changelog
|
||||
* Tue Nov 01 2022 Ameya Usgaonkar <ausgaonkar@microsoft.com> - 1.1.8-3
|
||||
- Move from extended to core
|
||||
- License verified
|
||||
|
||||
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.8-2
|
||||
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
|
||||
|
||||
|
|
@ -12673,8 +12673,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "nbdkit",
|
||||
"version": "1.20.7",
|
||||
"downloadUrl": "http://libguestfs.org/download/nbdkit/1.20-stable/nbdkit-1.20.7.tar.gz"
|
||||
"version": "1.30.10",
|
||||
"downloadUrl": "http://libguestfs.org/download/nbdkit/1.30-stable/nbdkit-1.30.10.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче