mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 02:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2021-08-27 10:58:36 -07:00
parent 78a12a523f d5cee6ebf4
commit 6aa46747e2
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -35,6 +35,11 @@ ifdef KDIR
cat $(KDIR)/include/config/kernel.release 2>/dev/null || \
make -s -C $(KDIR) kernelversion))
endif
else
ifndef KVER
KVER=$(strip $(shell uname -r))
endif
KDIR=/lib/modules/$(KVER)/build
endif
ifeq ($(QLA_32GBIT),no)
@@ -380,12 +385,14 @@ debian/compat:
dpkg: ../scst_$(VERSION).orig.tar.gz
@[ -z "$$DEBEMAIL" ] || export DEBEMAIL=bvanassche@acm.org && \
[ -z "$$DEBFULLNAME" ] || export DEBFULLNAME="Bart Van Assche" &&\
echo "KDIR=$(KDIR)" && \
echo "KVER=$(KVER)" && \
sed 's/%{scst_version}/$(VERSION)/' \
<debian/scst.dkms.in >debian/scst.dkms && \
sed 's/%{KVER}/$(KVER)/' \
<debian/scst.preinst.in >debian/scst.preinst && \
sed 's/%{KVER}/$(KVER)/' \
<debian/scst.postinst.in >debian/scst.postinst && \
sed 's/%{KVER}/$(KVER)/' \
<debian/scst.preinst.in >debian/scst.preinst && \
sed 's/%{KVER}/$(KVER)/' \
<debian/scst.postinst.in >debian/scst.postinst && \
output_files=( \
../*_$(VERSION)-$(DEBIAN_REVISION)_*.deb \
../*_$(VERSION)-$(DEBIAN_REVISION)_*.ddeb \

2
scstadmin/init.d/scst
View File

@@ -69,8 +69,6 @@ fi
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin
SCST_DFLT=/etc/default/scst
[ -x "$(which scstadmin)" ] || exit 5
if [ -f $SCST_DFLT ]; then
. $SCST_DFLT
fi