From 4a05024656cc3e9ed3c276e6c70592053808b78b Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Thu, 11 Mar 2021 01:25:55 -0500 Subject: [PATCH] spec: cmake-config cmake paramters Change-Id: Ic0e7f62d9172f31afe90297bdd22b8e50cc6fc9e --- docs/install.rst | 16 ---------------- scripts/mckernel.spec.in | 14 +++++++++++--- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/docs/install.rst b/docs/install.rst index c777c1db..dae364d6 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -166,22 +166,6 @@ Create the tarball and the spec file: make dist cp mckernel-.tar.gz /SOURCES -(optional) Edit the following line in ``scripts/mckernel.spec`` to change -cmake options. For example: - -:: - - %cmake -DCMAKE_BUILD_TYPE=Release \ - -DUNAME_R=%{kernel_version} \ - -DKERNEL_DIR=%{kernel_dir} \ - %{?cmake_libdir:-DCMAKE_INSTALL_LIBDIR=%{cmake_libdir}} \ - %{?build_target:-DBUILD_TARGET=%{build_target}} \ - %{?toolchain_file:-DCMAKE_TOOLCHAIN_FILE=%{toolchain_file}} \ - -DENABLE_TOFU=ON -DENABLE_FUGAKU_HACKS=ON \ - -DENABLE_KRM_WORKAROUND=OFF -DWITH_KRM=ON \ - -DENABLE_FUGAKU_DEBUG=OFF -DENABLE_UTI=ON \ - . - Create the rpm package: When not cross-compiling: diff --git a/scripts/mckernel.spec.in b/scripts/mckernel.spec.in index 240fe9a4..3303d841 100644 --- a/scripts/mckernel.spec.in +++ b/scripts/mckernel.spec.in @@ -15,6 +15,11 @@ %{!?kernel_dir: %global kernel_dir /usr/src/kernels/%{kernel_version}} %define krequires %(echo %{kernel_version} | sed "s/.%{_target_cpu}$//") %define ktag %(echo %{krequires} | tr '-' '_' | sed -e 's/\.el[0-9_]*$//' | sed -e 's/\.\([a-zA-Z]\)/_\1/') +%if "@ENABLE_UTI@" == "ON" +%define enable_uti 1 +%else +%define enable_uti 0 +%endif Name: mckernel Version: @MCKERNEL_VERSION@ @@ -77,9 +82,10 @@ pushd build %{?cmake_libdir:-DCMAKE_INSTALL_LIBDIR=%{cmake_libdir}} \ %{?build_target:-DBUILD_TARGET=%{build_target}} \ %{?toolchain_file:-DCMAKE_TOOLCHAIN_FILE=%{toolchain_file}} \ - -DENABLE_TOFU=ON -DENABLE_FUGAKU_HACKS=ON \ - -DENABLE_KRM_WORKAROUND=OFF -DWITH_KRM=ON \ - -DENABLE_FUGAKU_DEBUG=OFF -DENABLE_UTI=ON \ + -DENABLE_TOFU=@ENABLE_TOFU@ -DENABLE_FUGAKU_HACKS=@ENABLE_FUGAKU_HACKS@ \ + -DENABLE_KRM_WORKAROUND=@ENABLE_KRM_WORKAROUND@ -DWITH_KRM=@WITH_KRM@ \ + -DENABLE_FUGAKU_DEBUG=@ENABLE_FUGAKU_DEBUG@ -DENABLE_UTI=@ENABLE_UTI@ \ + -DENABLE_FJMPI_WORKAROUND=@ENABLE_FJMPI_WORKAROUND@ \ .. %make_build popd @@ -112,6 +118,7 @@ popd %{_libdir}/libsched_yield.so.1.0.0 %{_libdir}/libsched_yield.so %{_libdir}/libldump2mcdump.so +%if 0%{?enable_uti} %{_libdir}/libmck_syscall_intercept.so %{_libdir}/libsyscall_intercept.so.0.1.0 %{_libdir}/libsyscall_intercept.so.0 @@ -119,6 +126,7 @@ popd %{_libdir}/mck/libuti.so.1.0.0 %{_libdir}/mck/libuti.so.1 %{_libdir}/mck/libuti.so +%endif %{_sysconfdir}/irqbalance_mck.in %{_mandir}/man1/mcreboot.1.gz %{_mandir}/man1/ihkconfig.1.gz