[pve-devel] r4924 - in pve-kernel-2.6.32/trunk: . iscsideb iscsideb/patches

svn-commits at proxmox.com svn-commits at proxmox.com
Wed Aug 4 09:14:01 CEST 2010


Author: dietmar
Date: 2010-08-04 07:14:01 +0000 (Wed, 04 Aug 2010)
New Revision: 4924

Added:
   pve-kernel-2.6.32/trunk/iscsideb/
   pve-kernel-2.6.32/trunk/iscsideb/changelog
   pve-kernel-2.6.32/trunk/iscsideb/compat
   pve-kernel-2.6.32/trunk/iscsideb/control
   pve-kernel-2.6.32/trunk/iscsideb/copyright
   pve-kernel-2.6.32/trunk/iscsideb/dirs
   pve-kernel-2.6.32/trunk/iscsideb/docs
   pve-kernel-2.6.32/trunk/iscsideb/install
   pve-kernel-2.6.32/trunk/iscsideb/patches/
   pve-kernel-2.6.32/trunk/iscsideb/patches/adjust-path.diff
   pve-kernel-2.6.32/trunk/iscsideb/patches/disable-debug.diff
   pve-kernel-2.6.32/trunk/iscsideb/patches/init-script.diff
   pve-kernel-2.6.32/trunk/iscsideb/patches/series
   pve-kernel-2.6.32/trunk/iscsideb/postinst
   pve-kernel-2.6.32/trunk/iscsideb/postrm
   pve-kernel-2.6.32/trunk/iscsideb/rules
   pve-kernel-2.6.32/trunk/iscsideb/stamp-patched
Removed:
   pve-kernel-2.6.32/trunk/iscsi-scst-adjust-path.diff
   pve-kernel-2.6.32/trunk/iscsi-scst-disable-debug.diff
Modified:
   pve-kernel-2.6.32/trunk/Makefile
Log:
move iscsi-scst from 2.6.24 to this module


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-08-04 06:54:22 UTC (rev 4923)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-08-04 07:14:01 UTC (rev 4924)
@@ -1,4 +1,4 @@
-RELEASE=1.5
+RELEASE=1.6
 
 KERNEL_VER=2.6.32
 KERNEL_DEB_REL=18
@@ -26,22 +26,20 @@
 BUSYBOXSOURCE=busybox-${BUSYBOXVER}.tar.bz2
 BUSYBOXDIR=busybox-${BUSYBOXVER}
 
-DRBDDIR=drbd-8.3.4
-DRBDSRC=${DRBDDIR}.tar.gz
-
 AOEDIR=aoe6-73
 AOESRC=${AOEDIR}.tar.gz
 
 SCSTDIR=scst
 SCSTSRC=scst-snap-21.12.09.tgz
 ISCSIDIR=iscsi-scst
+ISCSI_DEB=iscsi-scst_1.0.1.1-3_${ARCH}.deb
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve-${KERNEL_VER}
 PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
 
-all: check_gcc ${DST_DEB} ${PVE_DEB} ${FW_DEB} ${HDR_DEB}
+all: check_gcc ${DST_DEB} ${PVE_DEB} ${FW_DEB} ${HDR_DEB} ${ISCSI_DEB}
 
 ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
 	rm -rf proxmox-ve/data
@@ -113,7 +111,6 @@
 	rm -rf ${KERNEL_SRC}
 	tar xf ${KERNEL_SRC_TAR}	
 	cd ${KERNEL_SRC}; patch -p1 <../${KERNEL_DEB_DIFF}
-	sdsd
 	./applydebpatches.pl ${KERNEL_SRC} ${KERNEL_DEB_REL}
 	cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31.patch 
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
@@ -137,7 +134,7 @@
 	#svn co https://scst.svn.sourceforge.net/svnroot/scst/trunk scst-src
 	tar xf ${SCSTSRC}
 
-scst-modules.tar scstmod ${SCSTDIR}/README: scst-src/AskingQuestions
+scst-modules.tar scstmod ${SCSTDIR}/README: .compile_mark scst-src/AskingQuestions
 	rm -rf ${SCSTDIR}
 	rsync -a --exclude .svn scst-src/scst/ ${SCSTDIR}
 	mkdir -p /lib/modules/${KVNAME}
@@ -149,16 +146,15 @@
 	tar cf scst-modules.tar -C ${SCSTDIR}/modules .	
 	touch ${SCSTDIR}/README
 
-${ISCSI_DEB} iscsi-scst.ko iscsi: ${SCSTDIR}/README scst-src/AskingQuestions
+${ISCSI_DEB} iscsi-scst.ko iscsi: .compile_mark ${SCSTDIR}/README scst-src/AskingQuestions
 	rm -rf ${ISCSIDIR} iscsi-scst.ko
 	rsync -a --exclude .svn scst-src/iscsi-scst/ ${ISCSIDIR}
-	cd ${ISCSIDIR}; patch -p 1 <../iscsi-scst-adjust-path.diff
-	cd ${ISCSIDIR}; patch -p 1 <../iscsi-scst-disable-debug.diff
-	cd ${ISCSIDIR}; make KVER=${KVNAME} include/iscsi_scst_itf_ver.h progs
+	cp -a iscsideb ${ISCSIDIR}/debian
+	cd ${ISCSIDIR}; export KVER=${KVNAME}; dpkg-buildpackage -rfakeroot -us -uc
 	cd ${ISCSIDIR}; make KVER=${KVNAME} mods
 	cp ${ISCSIDIR}/kernel/iscsi-scst.ko iscsi-scst.ko 
+	lintian ${ISCSI_DEB}
 
-
 busybox.tar: ${BUSYBOXSOURCE}
 	rm -rf ${BUSYBOXDIR}
 	tar xvjf ${BUSYBOXSOURCE}
@@ -232,7 +228,7 @@
 
 
 .PHONY: upload
-upload: ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB}
+upload: ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB} ${ISCSI_DEB}
 	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
 	mkdir -p /pve/${RELEASE}/extra
 	mkdir -p /pve/${RELEASE}/install
@@ -240,9 +236,7 @@
 	rm -rf /pve/${RELEASE}/extra/${HDRPACKAGE}_*.deb
 	rm -rf /pve/${RELEASE}/extra/${PVEPKG}_*.deb
 	rm -rf /pve/${RELEASE}/extra/Packages*
-	cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB} /pve/${RELEASE}/extra
-	rm -rf /pve/${RELEASE}/install/firmware-${KERNEL_VER}.tgz
-	cp firmware-${KERNEL_VER}.tgz /pve/${RELEASE}/install/
+	cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB} ${ISCSI_DEB} /pve/${RELEASE}/extra
 	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
 
@@ -252,6 +246,6 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb ${DRBDDIR} ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata initrdfirmware.tar
+	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata initrdfirmware.tar iscsideb/*~
 
 

Deleted: pve-kernel-2.6.32/trunk/iscsi-scst-adjust-path.diff
===================================================================
--- pve-kernel-2.6.32/trunk/iscsi-scst-adjust-path.diff	2010-08-04 06:54:22 UTC (rev 4923)
+++ pve-kernel-2.6.32/trunk/iscsi-scst-adjust-path.diff	2010-08-04 07:14:01 UTC (rev 4924)
@@ -1,17 +0,0 @@
---- iscsi-scst-1.0.1.1/Makefile.orig	2009-12-17 08:21:12.000000000 +0100
-+++ iscsi-scst-1.0.1.1/Makefile	2009-12-17 08:33:18.000000000 +0100
-@@ -7,11 +7,9 @@
- 
- SUBDIRS := $(shell pwd)
- 
--#SCST_INC_DIR := /usr/local/include/scst
--SCST_INC_DIR := $(SUBDIRS)/../scst/include
--#SCST_DIR := $(SCST_INC_DIR)
--SCST_DIR := $(shell pwd)/../scst/src
--SBINDIR := /usr/local/sbin
-+SCST_INC_DIR := $(shell pwd)/../scst/include
-+SCST_DIR := $(shell pwd)/../scst/src
-+SBINDIR := /usr/sbin
- INITDIR := /etc/init.d
- RCDIR := /etc/rc.d
- KMOD := $(shell pwd)/kernel

Deleted: pve-kernel-2.6.32/trunk/iscsi-scst-disable-debug.diff
===================================================================
--- pve-kernel-2.6.32/trunk/iscsi-scst-disable-debug.diff	2010-08-04 06:54:22 UTC (rev 4923)
+++ pve-kernel-2.6.32/trunk/iscsi-scst-disable-debug.diff	2010-08-04 07:14:01 UTC (rev 4924)
@@ -1,11 +0,0 @@
---- iscsi-scst/kernel/Makefile.org	2009-12-17 12:02:01.000000000 +0100
-+++ iscsi-scst/kernel/Makefile	2009-12-17 12:02:31.000000000 +0100
-@@ -25,7 +25,7 @@
- 
- EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
- #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
--EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -fno-inline -fno-inline-functions
-+EXTRA_CFLAGS += -g -fno-inline -fno-inline-functions
- 
- #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES
- 

Added: pve-kernel-2.6.32/trunk/iscsideb/changelog
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/changelog	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/changelog	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,18 @@
+iscsi-scst (1.0.1.1-3) unstable; urgency=low
+
+  * update to latest trunk
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 17 Dec 2009 10:37:36 +0100
+
+iscsi-scst (1.0.1.1-2) unstable; urgency=low
+
+  * fix postint script 
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 20 Oct 2009 11:04:12 +0200
+
+iscsi-scst (1.0.1.1-1) unstable; urgency=low
+
+  * Initial release (first debian package for PVE)
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 01 Oct 2009 11:33:06 +0200
+

Added: pve-kernel-2.6.32/trunk/iscsideb/compat
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/compat	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/compat	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1 @@
+7

Added: pve-kernel-2.6.32/trunk/iscsideb/control
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/control	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/control	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,34 @@
+Source: iscsi-scst
+Section: net
+Priority: optional
+Maintainer: Proxmox Support Team <support at proxmox.com>
+Build-Depends: debhelper (>= 7), libssl-dev
+Standards-Version: 3.7.3
+Homepage: http://scst.sourceforge.net
+
+Package: iscsi-scst
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, open-iscsi
+Description: Generic SCSI Target Subsystem for Linux
+ The generic SCSI target subsystem for Linux (SCST) is an alternative
+ implementation of a SCSI target subsystem for Linux. It provides
+ unified, consistent interface between SCSI target drivers and Linux
+ kernel as well as between Linux kernel and storage backend handlers,
+ connecting target drivers with real or emulated storage backend.
+ .
+ SCST allows creation of sophisticated storage devices, which provide
+ advanced functionality, like replication, thin provisioning,
+ deduplication, high availability, automatic backup, etc. Another
+ class of such devices are Virtual Tape Libraries (VTL) as well as
+ other disk-based backup solutions. SCST created devices not limited
+ by IP networking only. They can use any link which supports
+ SCSI-style data exchange, including Fibre Channel, iSCSI, SAS,
+ InfiniBand and parallel (Wide) SCSI. It might well be that your
+ favorite storage appliance running SCST in the firmware.
+ .
+ SCST project consists from a set of subprojects: generic SCSI target
+ mid-layer itself (SCST core) with a set of device handlers as well as
+ target drivers and user space utilities.
+ .
+ This package contains the userland part; you require the kernel modules
+ for proper operation.

Added: pve-kernel-2.6.32/trunk/iscsideb/copyright
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/copyright	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/copyright	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,28 @@
+This package was debianized by the Proxmox Support Team <support at proxmox.com> on
+Thu, 01 Oct 2009 11:33:06 +0200.
+
+It was downloaded from:
+
+https://sourceforge.net/projects/scst/files/iscsi-scst/iscsi-scst-1.0.1.1.tar.gz/download
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2009, Proxmox Support Team <support at proxmox.com> and
+is licensed under the GPL, see above.

Added: pve-kernel-2.6.32/trunk/iscsideb/dirs
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/dirs	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/dirs	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1 @@
+usr/sbin

Added: pve-kernel-2.6.32/trunk/iscsideb/docs
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/docs	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/docs	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,5 @@
+README
+README-IET
+README_in-tree
+ToDo
+ChangeLog-IET

Added: pve-kernel-2.6.32/trunk/iscsideb/install
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/install	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/install	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,2 @@
+etc/initiators.allow
+etc/initiators.deny

Added: pve-kernel-2.6.32/trunk/iscsideb/patches/adjust-path.diff
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/patches/adjust-path.diff	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/patches/adjust-path.diff	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,45 @@
+Index: iscsi-scst/Makefile
+===================================================================
+--- iscsi-scst.orig/Makefile	2009-12-17 09:02:52.000000000 +0100
++++ iscsi-scst/Makefile	2009-12-17 10:34:20.000000000 +0100
+@@ -7,11 +7,9 @@
+ 
+ SUBDIRS := $(shell pwd)
+ 
+-#SCST_INC_DIR := /usr/local/include/scst
+-SCST_INC_DIR := $(SUBDIRS)/../scst/include
+-#SCST_DIR := $(SCST_INC_DIR)
++SCST_INC_DIR := $(shell pwd)/../scst/include
+ SCST_DIR := $(shell pwd)/../scst/src
+-SBINDIR := /usr/local/sbin
++SBINDIR := /usr/sbin
+ INITDIR := /etc/init.d
+ RCDIR := /etc/rc.d
+ KMOD := $(shell pwd)/kernel
+@@ -42,24 +40,10 @@
+ 	echo -n "#define ISCSI_SCST_INTERFACE_VERSION " >>include/iscsi_scst_itf_ver.h
+ 	echo "\"`sha1sum include/iscsi_scst.h|awk '{printf $$1}'`\"" >>include/iscsi_scst_itf_ver.h
+ 
+-install: all
++install: progs
+ 	@install -vD usr/iscsi-scstd $(DESTDIR)$(SBINDIR)/iscsi-scstd
+ 	@install -vD usr/iscsi-scst-adm $(DESTDIR)$(SBINDIR)/iscsi-scst-adm
+-	if [ -f /etc/debian_version ]; then \
+-		install -vD -m 755 etc/initd/initd.debian $(DESTDIR)$(INITDIR)/iscsi-scst; \
+-	elif [ -f /etc/redhat-release ]; then \
+-		install -vD -m 755 etc/initd/initd.redhat $(DESTDIR)$(INITDIR)/iscsi-scst; \
+-	elif [ -f /etc/gentoo-release ]; then \
+-		install -vD -m 755 etc/initd/initd.gentoo $(DESTDIR)$(INITDIR)/iscsi-scst; \
+-	elif [ -f /etc/slackware-version ]; then \
+-		install -vD -m 755 etc/initd/initd $(DESTDIR)$(RCDIR)/iscsi-scst; \
+-	else \
+-		install -vD -m 755 etc/initd/initd $(DESTDIR)$(INITDIR)/iscsi-scst; \
+-	fi
+-	@eval `sed -n 's/#define UTS_RELEASE /KERNELRELEASE=/p' $(KDIR)/include/linux/version.h $(KDIR)/include/linux/utsrelease.h 2>/dev/null`; \
+-	install -vD -m 644 kernel/iscsi-scst.ko \
+-	$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/iscsi-scst.ko
+-	-/sbin/depmod -aq $(KVER)
++	install -vD -m 755 etc/initd/initd.debian $(DESTDIR)$(INITDIR)/iscsi-scst; 
+ 
+ SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)
+ ifneq ($(SCST_MOD_VERS),)

Added: pve-kernel-2.6.32/trunk/iscsideb/patches/disable-debug.diff
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/patches/disable-debug.diff	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/patches/disable-debug.diff	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,13 @@
+Index: iscsi-scst/kernel/Makefile
+===================================================================
+--- iscsi-scst.orig/kernel/Makefile	2009-12-17 12:06:31.000000000 +0100
++++ iscsi-scst/kernel/Makefile	2009-12-17 12:06:45.000000000 +0100
+@@ -25,7 +25,7 @@
+ 
+ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
+ #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
+-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -fno-inline -fno-inline-functions
++EXTRA_CFLAGS += -g -fno-inline -fno-inline-functions
+ 
+ #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES
+ 

Added: pve-kernel-2.6.32/trunk/iscsideb/patches/init-script.diff
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/patches/init-script.diff	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/patches/init-script.diff	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,67 @@
+Index: iscsi-scst-1.0.1.1/etc/initd/initd.debian
+===================================================================
+--- iscsi-scst-1.0.1.1.orig/etc/initd/initd.debian	2009-04-01 13:02:55.000000000 +0200
++++ iscsi-scst-1.0.1.1/etc/initd/initd.debian	2009-10-02 12:52:53.000000000 +0200
+@@ -1,14 +1,21 @@
+ #!/bin/sh
+-#
+-# chkconfig: - 39 35
+-# description: Starts and stops the iSCSI target
+-# debianized start-stop script
++
++### BEGIN INIT INFO
++# Provides:          iscsi-scst
++# Required-Start:    $network $local_fs
++# Required-Stop:
++# Should-Start:      $named
++# Should-Stop:
++# Default-Start:     2 3 4 5
++# Default-Stop:      0 1 6
++# Short-Description: Starts and stops the iSCSI target
++### END INIT INFO
+ 
+ PID_FILE=/var/run/iscsi-scstd.pid
+ CONFIG_FILE=/etc/iscsi-scstd.conf
+-DAEMON=/usr/local/sbin/iscsi-scstd
++DAEMON=/usr/sbin/iscsi-scstd
+ 
+-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ 
+ # Don't touch this "memsize thingy" unless you are blessed
+ # with knowledge about it.
+@@ -59,7 +66,6 @@
+ 	    echo "succeeded."
+ 	else
+ 	    echo "failed."
+-	    rmmod iscsi-scst
+ 	fi
+ }
+ 	
+@@ -75,17 +81,6 @@
+ 	fi
+ 	# ugly, but pid file is not removed ba iscsi-scstd
+ 	rm -f $PID_FILE
+-
+-	echo -n "Removing iSCSI-SCST target modules: "
+-	rmmod -w iscsi-scst
+-	RETVAL=$?
+-	modprobe -r crc32c 2>/dev/null
+-	if [ $RETVAL -eq 0 ]; then
+-	    echo "succeeded."
+-	else
+-	    echo "failed."
+-	    exit 1
+-	fi
+ }
+ 
+ case "$1" in
+@@ -95,7 +90,7 @@
+   stop)
+         iscsi_scstd_stop
+         ;;
+-  restart)
++  restart|force-reload)
+         iscsi_scstd_stop
+ 	sleep 1
+ 	iscsi_scstd_start

Added: pve-kernel-2.6.32/trunk/iscsideb/patches/series
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/patches/series	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/patches/series	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,3 @@
+adjust-path.diff
+init-script.diff
+disable-debug.diff

Added: pve-kernel-2.6.32/trunk/iscsideb/postinst
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/postinst	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/postinst	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,57 @@
+#!/bin/sh
+# postinst script for iscsi-scst
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+
+	if [ ! -e /etc/iscsi-scstd.conf ]; then
+	    if [ -e /etc/iscsi/initiatorname.iscsi ]; then
+		echo "Target $(sed -n 's/InitiatorName=//p' /etc/iscsi/initiatorname.iscsi):storage" >/etc/iscsi-scstd.conf
+	    fi
+	fi
+
+	if [ -x "/etc/init.d/iscsi-scst" ]; then
+	    update-rc.d iscsi-scst defaults >/dev/null
+	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d iscsi-scst start || exit $?
+	    else
+		/etc/init.d/iscsi-scst start || exit $?
+	    fi
+	fi
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: pve-kernel-2.6.32/trunk/iscsideb/postrm
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/postrm	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/postrm	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# postrm script for iscsi-scst
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+
+    purge)
+	update-rc.d iscsi-scst remove >/dev/null || exit $?
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: pve-kernel-2.6.32/trunk/iscsideb/rules
===================================================================
--- pve-kernel-2.6.32/trunk/iscsideb/rules	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/iscsideb/rules	2010-08-04 07:14:01 UTC (rev 4924)
@@ -0,0 +1,90 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq "$(wildcard /usr/share/quilt/quilt.make)" ""
+include /usr/share/quilt/quilt.make
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: patch build-stamp
+
+build-stamp: configure-stamp  
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE) include/iscsi_scst_itf_ver.h progs
+
+	touch $@
+
+clean: unpatch 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/iscsi-scst.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/iscsi-scst install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure


Property changes on: pve-kernel-2.6.32/trunk/iscsideb/rules
___________________________________________________________________
Added: svn:executable
   + *



More information about the pve-devel mailing list