From 3f9f08fe6f02ed9ec6fd57caef568cb77eea6eb6 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Jul 07 2023 15:06:16 +0000 Subject: Reenable Perl support for hs builds, only disable on hs+fb Signed-off-by: Michel Alexandre Salim --- diff --git a/kernel-tools.spec b/kernel-tools.spec index e73465b..e141d15 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -4,9 +4,13 @@ # note: on hs.el9 it might be possible to use LIBBPF_DYNAMIC=1 so try when reenabling bpftool %bcond_with bpftool +%if 0%{?facebook} # disable perl support by default. On hs.el8 this currently pulls in an updated Perl stack # from modular packages, making it a pain to use on systems with modules filtered out %bcond_with perl +%else +%bcond_without perl +%endif # Much of this is borrowed from the original kernel.spec # It needs a bunch of the macros for rawhide vs. not-rawhide builds. @@ -53,7 +57,7 @@ # pkg_release is what we'll fill in for the rpm Release: field %if 0%{?released_kernel} -%global pkg_release %{fedora_build}%{?buildid}.2%{?dist} +%global pkg_release %{fedora_build}%{?buildid}.3%{?dist} %else @@ -631,6 +635,9 @@ popd %{_mandir}/man1/rv.1.gz %changelog +* Fri Jul 07 2023 Michel Alexandre Salim - 6.3.3-200.3 +- Reenable Perl support for hs builds, only disable on hs+fb + * Thu Jun 29 2023 Michel Alexandre Salim - 6.3.3-200.2 - Disable Perl support by default to avoid modularity issues on hs.el8