[libvirt PATCH 0/2] add systemd-rpm-macros build dependency
Pavel Hrdina (2): spec: add systemd-rpm-macros build dependency ci: refresh generated files ci/containers/almalinux-8.Dockerfile | 1 + ci/containers/centos-stream-8.Dockerfile | 1 + ci/containers/centos-stream-9.Dockerfile | 1 + ci/containers/fedora-35.Dockerfile | 1 + ci/containers/fedora-36-cross-mingw32.Dockerfile | 3 ++- ci/containers/fedora-36-cross-mingw64.Dockerfile | 3 ++- ci/containers/fedora-36.Dockerfile | 1 + ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 ++- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 ++- ci/containers/fedora-rawhide.Dockerfile | 1 + ci/containers/opensuse-leap-153.Dockerfile | 1 + ci/containers/opensuse-tumbleweed.Dockerfile | 1 + libvirt.spec.in | 1 + 13 files changed, 17 insertions(+), 4 deletions(-) -- 2.37.3
We should explicitly depend on this package as we use some macros defined by files that are installed from systemd-rpm-macros. Currently the build works only because some of our other build dependencies pull in systemd which will install systemd-rpm-macros if rpm-build is installed as well. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 654057bf57..0cc0f61630 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -293,6 +293,7 @@ BuildRequires: libblkid-devel >= 2.17 # for augparse, optionally used in testing BuildRequires: augeas BuildRequires: systemd-devel >= 185 +BuildRequires: systemd-rpm-macros BuildRequires: libpciaccess-devel >= 0.10.9 BuildRequires: yajl-devel %if %{with_sanlock} -- 2.37.3
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- ci/containers/almalinux-8.Dockerfile | 1 + ci/containers/centos-stream-8.Dockerfile | 1 + ci/containers/centos-stream-9.Dockerfile | 1 + ci/containers/fedora-35.Dockerfile | 1 + ci/containers/fedora-36-cross-mingw32.Dockerfile | 3 ++- ci/containers/fedora-36-cross-mingw64.Dockerfile | 3 ++- ci/containers/fedora-36.Dockerfile | 1 + ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 ++- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 ++- ci/containers/fedora-rawhide.Dockerfile | 1 + ci/containers/opensuse-leap-153.Dockerfile | 1 + ci/containers/opensuse-tumbleweed.Dockerfile | 1 + 12 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile index 1b55e9f66f..e6e5cdbf32 100644 --- a/ci/containers/almalinux-8.Dockerfile +++ b/ci/containers/almalinux-8.Dockerfile @@ -81,6 +81,7 @@ RUN dnf update -y && \ scrub \ sed \ systemd-devel \ + systemd-rpm-macros \ systemtap-sdt-devel \ wireshark-devel \ yajl-devel && \ diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 1614cd9b56..9b7287a416 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -82,6 +82,7 @@ RUN dnf distro-sync -y && \ scrub \ sed \ systemd-devel \ + systemd-rpm-macros \ systemtap-sdt-devel \ wireshark-devel \ yajl-devel && \ diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index 3981765fd5..cc8e26d6ea 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -80,6 +80,7 @@ RUN dnf distro-sync -y && \ scrub \ sed \ systemd-devel \ + systemd-rpm-macros \ systemtap-sdt-devel \ wireshark-devel \ yajl-devel && \ diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile index 5ff5abf242..7f39e9b424 100644 --- a/ci/containers/fedora-35.Dockerfile +++ b/ci/containers/fedora-35.Dockerfile @@ -89,6 +89,7 @@ exec "$@"' > /usr/bin/nosync && \ scrub \ sed \ systemd-devel \ + systemd-rpm-macros \ systemtap-sdt-devel \ wireshark-devel \ xen-devel \ diff --git a/ci/containers/fedora-36-cross-mingw32.Dockerfile b/ci/containers/fedora-36-cross-mingw32.Dockerfile index 4a222c05a6..3fec6a3ee8 100644 --- a/ci/containers/fedora-36-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-36-cross-mingw32.Dockerfile @@ -54,7 +54,8 @@ exec "$@"' > /usr/bin/nosync && \ rpcgen \ rpm-build \ scrub \ - sed && \ + sed \ + systemd-rpm-macros && \ nosync dnf autoremove -y && \ nosync dnf clean all -y diff --git a/ci/containers/fedora-36-cross-mingw64.Dockerfile b/ci/containers/fedora-36-cross-mingw64.Dockerfile index aaf26308e1..3874f61557 100644 --- a/ci/containers/fedora-36-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-36-cross-mingw64.Dockerfile @@ -54,7 +54,8 @@ exec "$@"' > /usr/bin/nosync && \ rpcgen \ rpm-build \ scrub \ - sed && \ + sed \ + systemd-rpm-macros && \ nosync dnf autoremove -y && \ nosync dnf clean all -y diff --git a/ci/containers/fedora-36.Dockerfile b/ci/containers/fedora-36.Dockerfile index 562f403ac7..895f2649fd 100644 --- a/ci/containers/fedora-36.Dockerfile +++ b/ci/containers/fedora-36.Dockerfile @@ -88,6 +88,7 @@ exec "$@"' > /usr/bin/nosync && \ scrub \ sed \ systemd-devel \ + systemd-rpm-macros \ systemtap-sdt-devel \ wireshark-devel \ xen-devel \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 4ff983dbd0..522ee668e7 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -55,7 +55,8 @@ exec "$@"' > /usr/bin/nosync && \ rpcgen \ rpm-build \ scrub \ - sed && \ + sed \ + systemd-rpm-macros && \ nosync dnf autoremove -y && \ nosync dnf clean all -y diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index 87bc98d29c..860aecfe86 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -55,7 +55,8 @@ exec "$@"' > /usr/bin/nosync && \ rpcgen \ rpm-build \ scrub \ - sed && \ + sed \ + systemd-rpm-macros && \ nosync dnf autoremove -y && \ nosync dnf clean all -y diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index a4d75c25a6..9dcce7baaf 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -89,6 +89,7 @@ exec "$@"' > /usr/bin/nosync && \ scrub \ sed \ systemd-devel \ + systemd-rpm-macros \ systemtap-sdt-devel \ wireshark-devel \ xen-devel \ diff --git a/ci/containers/opensuse-leap-153.Dockerfile b/ci/containers/opensuse-leap-153.Dockerfile index eeba0a327a..70ea582417 100644 --- a/ci/containers/opensuse-leap-153.Dockerfile +++ b/ci/containers/opensuse-leap-153.Dockerfile @@ -81,6 +81,7 @@ RUN zypper update -y && \ sanlock-devel \ scrub \ sed \ + systemd-rpm-macros \ systemtap-sdt-devel \ wireshark-devel \ xen-devel && \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 72824c5505..d8a302e6e2 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -79,6 +79,7 @@ RUN zypper dist-upgrade -y && \ sanlock-devel \ scrub \ sed \ + systemd-rpm-macros \ systemtap-sdt-devel \ wireshark-devel \ xen-devel && \ -- 2.37.3
On a Monday in 2022, Pavel Hrdina wrote:
Pavel Hrdina (2): spec: add systemd-rpm-macros build dependency ci: refresh generated files
ci/containers/almalinux-8.Dockerfile | 1 + ci/containers/centos-stream-8.Dockerfile | 1 + ci/containers/centos-stream-9.Dockerfile | 1 + ci/containers/fedora-35.Dockerfile | 1 + ci/containers/fedora-36-cross-mingw32.Dockerfile | 3 ++- ci/containers/fedora-36-cross-mingw64.Dockerfile | 3 ++- ci/containers/fedora-36.Dockerfile | 1 + ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 ++- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 ++- ci/containers/fedora-rawhide.Dockerfile | 1 + ci/containers/opensuse-leap-153.Dockerfile | 1 + ci/containers/opensuse-tumbleweed.Dockerfile | 1 + libvirt.spec.in | 1 + 13 files changed, 17 insertions(+), 4 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Pavel Hrdina