[Pkg-iscsi-maintainers] [SCM] Debian iscsitarget packaging branch, experimental, updated. debian/1.4.20.2-7-8-g5585260

Ritesh Raj Sarraf rrs at researchut.com
Wed Feb 22 13:33:05 UTC 2012


The following commit has been merged in the experimental branch:
commit dcab13f3b52bfce1e34266354bb7fe4a2b6cd6c2
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Wed Feb 22 18:22:46 2012 +0530

    Drop unmaintained iscsitarget-source package

diff --git a/debian/control b/debian/control
index 1ca8576..895de05 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Package: iscsitarget
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, procps, lsb-base (>= 3.2-14)
 Recommends: iscsitarget-module
-Suggests: iscsitarget-source, iscsitarget-dkms
+Suggests: iscsitarget-dkms
+Conflicts: iscsitarget-source
 Description: iSCSI Enterprise Target userland tools
  iSCSI Enterprise Target is for building an iSCSI storage system on
  Linux. It is aimed at developing an iSCSI target satisfying enterprise
@@ -22,23 +23,11 @@ Description: iSCSI Enterprise Target userland tools
  This package contains the userland part; you require the kernel module 
  for proper operation.
 
-Package: iscsitarget-source
-Architecture: all
-Depends: debhelper (>= 5.0.0), module-assistant, bzip2, ${misc:Depends}
-Recommends: linux-headers
-Description: iSCSI Enterprise Target kernel module source
- iSCSI Enterprise Target is for building an iSCSI storage system on
- Linux. It is aimed at developing an iSCSI target satisfying enterprise
- requirements.
- .
- This package provides the source code for the iscsitarget kernel module.
- The iscsitarget package is also required in order to make use of this
- module. Kernel source or headers are required to compile this module.
-
 Package: iscsitarget-dkms
 Architecture: all
 Depends: dkms (>= 1.95), make, ${misc:Depends}
 Recommends: linux-headers
+Conflicts: iscsitarget-source
 Description: iSCSI Enterprise Target kernel module source - dkms version
  iSCSI Enterprise Target is for building an iSCSI storage system on
  Linux. It is aimed at developing an iSCSI target satisfying enterprise
diff --git a/debian/iscsitarget-source.dirs b/debian/iscsitarget-source.dirs
deleted file mode 100644
index 014ec9e..0000000
--- a/debian/iscsitarget-source.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/modass/overrides
diff --git a/debian/modass.iscsitarget-source b/debian/modass.iscsitarget-source
deleted file mode 100644
index 240d764..0000000
--- a/debian/modass.iscsitarget-source
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# (c) Eduard Bloch <blade at debian.org>, 2003
-# generic maintainer script for module-assistant controled packages
-# to be sourced or copied as example code
-
-# autodetecting values. They may be overriden by the caller.
-
-MA_DIR=${MA_DIR:-/usr/share/modass}
-
-BUILDDIR=${MODULE_LOC:-/usr/src/modules}/iscsitarget
-
-. $MA_DIR/packages/generic.sh
-
-$1 "$@"
diff --git a/debian/rules b/debian/rules
index aa5eb16..c87a7fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,16 +24,11 @@ get-orig-source:
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 
 PACKAGE=iscsitarget
-psource=iscsitarget-source
 pmodules = $(PACKAGE)-module-$(non_epoch_version)
 
 # DKMS package
 pdkms=iscsitarget-dkms
 
-MA_DIR ?= /usr/share/modass
--include $(MA_DIR)/include/generic.make
--include $(MA_DIR)/include/common-rules.make
-
 CFLAGS = `dpkg-buildflags --get CFLAGS`
 CFLAGS += -Wall
 CFLAGS += `dpkg-buildflags --get CPPFLAGS`
@@ -206,36 +201,6 @@ install-indep:
 	dh_clean -k -i 
 	dh_installdirs -i
 	
-	# Create the directories to install the source into
-	dh_installdirs -p$(psource)  usr/src/modules/$(PACKAGE)
-	dh_installdirs -p$(psource)  usr/src/modules/$(PACKAGE)/debian
-	dh_installdirs -p$(psource)  usr/src/modules/$(PACKAGE)/include
-	dh_installdirs -p$(psource)  usr/src/modules/$(PACKAGE)/kernel
-	dh_installdirs -p$(psource)  usr/src/modules/$(PACKAGE)/patches
-	
-	# Copy only the driver source to the proper location
-	cp kernel/*  debian/$(psource)/usr/src/modules/$(PACKAGE)/kernel/
-	cp include/* debian/$(psource)/usr/src/modules/$(PACKAGE)/include/
-	cp patches/* debian/$(psource)/usr/src/modules/$(PACKAGE)/patches/
-	
-	# Copy the needed debian/ pieces to the proper location
-	cp debian/*-module-* \
-		debian/$(psource)/usr/src/modules/$(PACKAGE)/debian
-	cp debian/control.modules.in \
-		debian/$(psource)/usr/src/modules/$(PACKAGE)/debian/control.in
-	cp debian/rules \
-		debian/$(psource)/usr/src/modules/$(PACKAGE)/debian
-	cp debian/changelog \
-		debian/$(psource)/usr/src/modules/$(PACKAGE)/debian
-	cp debian/copyright \
-		debian/$(psource)/usr/src/modules/$(PACKAGE)/debian
-	
-	# install debian/ files
-	cd debian ; cp changelog control compat *.modules.in rules copyright $(psource)/usr/src/modules/$(PACKAGE)/debian
-	
-	# create toplevel module Makefile
-	echo "obj-m = kernel/" > debian/$(psource)/usr/src/modules/$(PACKAGE)/Makefile
-	
 	# For DKMS
 	# Create the directories to install the source into
 	dh_installdirs -p$(pdkms)  usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)
@@ -273,12 +238,6 @@ install-indep:
 	grep ^PATCH dkms.conf >> debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/dkms.conf
 
 
-	# tar the stuff
-	cd debian/$(psource)/usr/src/ ; tar cvjf iscsitarget.tar.bz2 modules ; rm -rf modules
-	
-	install -m 755 $(CURDIR)/debian/modass.iscsitarget-source $(CURDIR)/debian/$(psource)/usr/share/modass/overrides/iscsitarget-source
-
-
 	dh_install -i
 
 install-arch:

-- 
Debian iscsitarget packaging



More information about the Pkg-iscsi-maintainers mailing list