From 76cd77d64a820fa93b46437570974c2e1de3927b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 9 Apr 2016 03:04:09 +0000 Subject: [PATCH 1/3] scst.spec.in: Leave out 'r' from revision number RPM version comparison works correctly with numbers but not if the revision starts with 'r'. Hence leave out the 'r'. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6855 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e5092d915..104403592 100644 --- a/Makefile +++ b/Makefile @@ -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: From e3988e8c92f27fe7e492e54645fa74d278c4dd15 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 9 Apr 2016 03:05:39 +0000 Subject: [PATCH 2/3] scst.spec.in: Enable .debug generation for .ko files git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6856 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scst.spec.in b/scst.spec.in index e7138ceef..5376f17a7 100644 --- a/scst.spec.in +++ b/scst.spec.in @@ -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 From dec1b4a12d2667aec43c78d0677117c43c7a1e68 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 9 Apr 2016 03:11:52 +0000 Subject: [PATCH 3/3] scstadmin: Leave out "r" from RPM revision number git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6857 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scstadmin/Makefile b/scstadmin/Makefile index 0cb1cf85c..79bfbf168 100644 --- a/scstadmin/Makefile +++ b/scstadmin/Makefile @@ -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 \