diff --git a/Makefile b/Makefile index 54312a7fc..02eb50b4d 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ else KDIR=/lib/modules/$(KVER)/build endif -DEBUG_MODE_LEVEL ?= 2release +PKG_BUILD_MODE ?= 2release OLD_QLA_INI_DIR=qla2x00t OLD_QLA_DIR=$(OLD_QLA_INI_DIR)/qla2x00-target @@ -442,7 +442,7 @@ dpkg: ../scst_$(VERSION).orig.tar.gz buildopts+=(-j4); \ fi && \ DEB_CC_SET="$(CC)" DEB_KVER_SET=$(KVER) DEB_KDIR_SET=$(KDIR) DEB_QLA_DIR_SET=$(QLA_DIR) \ - DEB_QLA_INI_DIR_SET=$(QLA_INI_DIR) DEB_DEBUG_MODE_LEVEL=$(DEBUG_MODE_LEVEL) \ + DEB_QLA_INI_DIR_SET=$(QLA_INI_DIR) DEB_PKG_BUILD_MODE=$(PKG_BUILD_MODE) \ debuild "$${buildopts[@]}" --lintian-opts --profile debian && \ mkdir -p dpkg && \ for f in "$${output_files[@]}" ../scst_$(VERSION).orig.tar.[gx]z; do\ diff --git a/debian/rules b/debian/rules index 9b67efa3b..8424310e4 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ export KDIR=$(DEB_KDIR_SET) export CC=$(DEB_CC_SET) export QLA_DIR=$(DEB_QLA_DIR_SET) export QLA_INI_DIR=$(DEB_QLA_INI_DIR_SET) -export DEBUG_MODE_LEVEL=$(DEB_DEBUG_MODE_LEVEL) +export PKG_BUILD_MODE=$(DEB_PKG_BUILD_MODE) SUBDIRS=scst $(shell grep -qw '^CONFIG_LIBFC' /boot/config-$(KVER) && echo fcst) iscsi-scst $(QLA_DIR) scst_local scstadmin srpt DESTDIR=$(CURDIR)/debian/tmp @@ -38,7 +38,7 @@ clean: build: [ -n "$(QLA_INI_DIR)" ] && \ - make $(DEBUG_MODE_LEVEL) && \ + make $(PKG_BUILD_MODE) && \ export BUILD_2X_MODULE=y && \ export CONFIG_SCSI_QLA_FC=y && \ export CONFIG_SCSI_QLA2XXX_TARGET=y && \ @@ -71,12 +71,12 @@ install: break; \ fi; \ done && \ - make $(DEBUG_MODE_LEVEL) && \ + make $(PKG_BUILD_MODE) && \ rm -f "$(DESTDIR)"/lib/modules/*/[Mm]odule* && \ mkdir -p $(DESTDIR)/usr/src/scst-$(VERSION) && \ for f in scst.dkms scst-dkms.postinst scst-dkms.prerm; do \ sed "s/\$${PACKAGE_VERSION}/$(VERSION)/; \ - s/\$${DEBUG_MODE_LEVEL}/$(DEBUG_MODE_LEVEL)/" \ + s/\$${PKG_BUILD_MODE}/$(PKG_BUILD_MODE)/" \ < debian/$$f.in >debian/$$f || exit $?; \ done && \ cp debian/scst.dkms \ diff --git a/debian/scst.dkms.in b/debian/scst.dkms.in index c626582bc..73ebaa109 100644 --- a/debian/scst.dkms.in +++ b/debian/scst.dkms.in @@ -1,7 +1,7 @@ PACKAGE_VERSION="${PACKAGE_VERSION}" PACKAGE_NAME="scst" 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 ${DEBUG_MODE_LEVEL} && make -sC scst && make -sC fcst && make -sC iscsi-scst && make -sC qla2x00t-32gbit/qla2x00-target && make -sC scst_local && make -sC srpt" +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" CLEAN="make clean" # Remove any existing ib_srpt.ko kernel modules PRE_INSTALL="find /lib/modules/${kernelver} -name ib_srpt.ko -exec rm {} \;"