Makefile, scst[-dkms].spec.in: Add support for PKG_BUILD_MODE

See also commit 95c9bdc0f7 ("pass through `DEBUG_MODE_LEVEL` to
`dpkg` make target").
This commit is contained in:
Gleb Chesnokov
2023-01-09 23:23:11 +03:00
parent baa8a58833
commit 3d1dd5c90a
3 changed files with 5 additions and 2 deletions

View File

@@ -355,6 +355,7 @@ scst-rpm:
MAKE="$(MAKE)" rpmbuild --define="%_topdir $${rpmtopdir}" \
$(if $(KVER),--define="%kversion $(KVER)") \
$(if $(KDIR),--define="%kdir $(KDIR)") \
--define="%pkg_build_mode $(PKG_BUILD_MODE)" \
-ba $${name}.spec && \
rm -f $${name}-$(VERSION).tar.bz2
@@ -371,6 +372,7 @@ scst-dkms-rpm:
MAKE="$(MAKE)" rpmbuild --define="%_topdir $${rpmtopdir}" \
$(if $(KVER),--define="%kversion $(KVER)") \
$(if $(KDIR),--define="%kdir $(KDIR)") \
--define="%pkg_build_mode $(PKG_BUILD_MODE)" \
-ba $${name}.spec && \
rm -f $${name}-$(VERSION).tar.bz2

View File

@@ -137,6 +137,7 @@ space (scst_user).
%build
export KVER=%{kversion} PREFIX=%{_prefix}
export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y
make %{pkg_build_mode}
for d in scst fcst iscsi-scst qla2x00t-32gbit/qla2x00-target scst_local srpt; do
%{make} -C $d
done
@@ -162,7 +163,7 @@ cat >%{buildroot}/usr/src/%{kmod_name}-%{dkms_version}/dkms.conf <<"EOF"
PACKAGE_VERSION="%{dkms_version}"
PACKAGE_NAME="%{kmod_name}"
AUTOINSTALL=yes
MAKE[0]="export KVER=${kernelver} KDIR=${kernel_source_dir} BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y && make 2release && make -sC scst && make -sC fcst && make -sC iscsi-scst && make -sC qla2x00t-32gbit/qla2x00-target && make -sC scst_local && make -sC srpt && cp */*.ko */*/*.ko *scst*/*/*/*.ko ."
MAKE[0]="export KVER=${kernelver} KDIR=${kernel_source_dir} BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y && make %{pkg_build_mode} && make -sC scst && make -sC fcst && make -sC iscsi-scst && make -sC qla2x00t-32gbit/qla2x00-target && make -sC scst_local && make -sC srpt && cp */*.ko */*/*.ko *scst*/*/*/*.ko ."
CLEAN="make clean"
# Remove any existing ib_srpt.ko kernel modules
PRE_INSTALL="find /lib/modules/${kernelver} -name ib_srpt.ko -exec rm {} \;"

View File

@@ -129,7 +129,7 @@ Authors:
%{!?kdir:%{?kversion:export KVER=%{kversion}}}
export PREFIX=%{_prefix}
export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y
make 2release
make %{pkg_build_mode}
for d in scst fcst iscsi-scst qla2x00t-32gbit/qla2x00-target scst_local srpt; do
%{make} -C $d
done