From: Jan Stancek <jstan...@redhat.com>
redhat: kernel.spec: add ynl to kernel-tools
build and package tools/net/ynl.
Signed-off-by: Jan Stancek <jstan...@redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -230,6 +230,8 @@ Summary: The Linux kernel
%define with_libperf %{?_without_libperf: 0} %{?!_without_libperf: 1}
# tools
%define with_tools %{?_without_tools: 0} %{?!_without_tools: 1}
+# ynl
+%define with_ynl %{?_without_ynl: 0} %{?!_without_ynl: 1}
# kernel-debuginfo
%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
# kernel-abi-stablelists
@@ -761,6 +763,11 @@ BuildRequires: pciutils-devel
BuildRequires: libnl3-devel
%endif
%endif
+
+%if %{with_tools} && %{with_ynl}
+BuildRequires: python3-pyyaml python3-jsonschema python3-pip python3-setuptools
+%endif
+
%if %{with_tools} || %{signmodules} || %{signkernel}
BuildRequires: openssl-devel
%endif
@@ -3066,6 +3073,19 @@ chmod +x tools/perf/check-headers.sh
%endif
%if %{with_tools}
+
+%if %{with_ynl}
+pushd tools/net/ynl
+export PIP_CONFIG_FILE=/tmp/pip.config
+cat <<EOF > $PIP_CONFIG_FILE
+[install]
+no-index = true
+no-build-isolation = false
+EOF
+%{tools_make} %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
+popd
+%endif
+
%ifarch %{cpupowerarchs}
# cpupower
# make sure version-gen.sh is executable.
@@ -3954,6 +3974,12 @@ fi\
%config(noreplace) %{_sysconfdir}/logrotate.d/kvm_stat
%{_bindir}/page_owner_sort
%{_bindir}/slabinfo
+%if %{with_ynl}
+%{_bindir}/ynl*
+%{_docdir}/ynl
+%{_datadir}/ynl
+%{python3_sitelib}/pyynl*
+%endif
%if %{with_debuginfo}
%files -f %{package_name}-tools-debuginfo.list -n
%{package_name}-tools-debuginfo
@@ -3963,13 +3989,19 @@ fi\
%files -n %{package_name}-tools-libs
%{_libdir}/libcpupower.so.1
%{_libdir}/libcpupower.so.0.0.1
+%endif
%files -n %{package_name}-tools-libs-devel
+%ifarch %{cpupowerarchs}
%{_libdir}/libcpupower.so
%{_includedir}/cpufreq.h
%{_includedir}/cpuidle.h
%{_includedir}/powercap.h
%endif
+%if %{with_ynl}
+%{_libdir}/libynl*
+%{_includedir}/ynl
+%endif
%files -n rtla
%{_bindir}/rtla
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3638
--
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
