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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2016-04-08 20:12:20 -07:00
parent 5e92656c23 dec1b4a12d
commit 781bf927e0
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -55,9 +55,9 @@ EMULEX_DIR=emulex
ISCSI_DIR=iscsi-scst
REVISION ?= $(shell if svn info >/dev/null 2>&1; \
then svn info | sed -n 's/^Revision:[[:blank:]]*/r/p';\
else echo -n r; git log | grep -c ^commit; \
fi)
then svn info | sed -n 's/^Revision:[[:blank:]]*//p';\
else git log | grep -c ^commit; \
fi)
VERSION = $(shell echo -n "$$(sed -n 's/^\#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^-]*\).*\"/\1/p' scst/include/scst_const.h).$(REVISION)")
help:

3
scst.spec.in
View File

@@ -140,6 +140,9 @@ for d in qla2x00t_git/qla2x00-target qla2x00t/qla2x00-target; do
break
fi
done
# Set the executable bit such that /usr/lib/rpm/find-debuginfo.sh can find the
# SCST kernel modules.
find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x
rm -f %{buildroot}/lib/modules/%{kversion}/[Mm]odule*
%clean

6
scstadmin/Makefile
View File

@@ -3,9 +3,9 @@ ifndef PREFIX
endif
REVISION ?= $(shell if svn info >/dev/null 2>&1; \
then svn info | sed -n 's/^Revision:[[:blank:]]*/r/p';\
else echo -n r; git log | grep -c ^commit; \
fi)
then svn info | sed -n 's/^Revision:[[:blank:]]*//p';\
else git log | grep -c ^commit; \
fi)
VERSION = $(shell echo -n "$$(sed -n 's/^[[:blank:]]*\$$VERSION[[:blank:]]*=[[:blank:]]*[\"'"'"']\([0-9.]*\)[\"'"'"'];$$/\1/p' scstadmin/scst-*/lib/SCST/SCST.pm).$(REVISION)")
SCSTADMIN_DIR = $(shell if [ ! -h scstadmin ]; then \