aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-01-24 14:12:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-01-24 15:06:10 +0000
commitbdeb1544255f85ed635bf584636808c45a1abad5 (patch)
tree445d63e1d227bdf3c46d0ded29cfd593409daf3c /main
parent051b7c31213528193ad1e9d140d6dd0fc79067fb (diff)
downloadaports-bdeb1544255f85ed635bf584636808c45a1abad5.tar.bz2
aports-bdeb1544255f85ed635bf584636808c45a1abad5.tar.xz
main/open-iscsi*: removed
We will switch to linux-iscsi.org
Diffstat (limited to 'main')
-rw-r--r--main/open-iscsi-grsec/APKBUILD59
-rw-r--r--main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch33
-rw-r--r--main/open-iscsi/APKBUILD44
-rw-r--r--main/open-iscsi/iscsid.confd13
-rw-r--r--main/open-iscsi/iscsid.initd124
5 files changed, 0 insertions, 273 deletions
diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD
deleted file mode 100644
index 23da2fd277..0000000000
--- a/main/open-iscsi-grsec/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-
-_flavor=grsec
-_realname=open-iscsi
-_realver=2.0-872
-_kver=3.0.17
-_kpkgrel=0
-
-# verify the kernel version before entering chroot
-if [ -f ../linux-${_flavor}/APKBUILD ]; then
- . ../linux-${_flavor}/APKBUILD
- [ "$_kver" != "$pkgver" ] && die "open-iscsi-$_flavor: please update _kver to $pkgver"
- [ "$_kpkgrel" != "$pkgrel" ] && die "open-iscsi-$_flavor: please update _kpkgrel to $pkgrel"
-fi
-
-_kernelver="$_kver-r$_kpkgrel"
-_abi_release=$_kver-${_flavor}
-_ksrc=/usr/src/linux-headers-${_abi_release}
-
-_iscsiver=$_realver
-
-pkgname=${_realname}-${_flavor}
-pkgver=$_kver
-_mypkgrel=0
-pkgrel=$(($_kpkgrel + $_mypkgrel))
-pkgdesc="$_flavor kernel modules for open-iscsi $_iscsiver"
-url="http://www.open-iscsi.org"
-arch="all"
-license="GPL-2"
-depends="linux-${_flavor}=${_kernelver}"
-install=
-makedepends="linux-${_flavor}-dev=${_kernelver}"
-subpackages=
-source="http://www.open-iscsi.org/bits/$_realname-$_realver.tar.gz
- Makefile-Alpine-kernels-support.patch"
-
-_builddir="$srcdir/$_realname-$_realver"
-
-prepare() {
- cd "$_builddir"
- patch -p1 < "$srcdir"/Makefile-Alpine-kernels-support.patch || return 1
-}
-
-build() {
- cd "$_builddir"
- unset ARCH
- export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
- make KSRC="$_ksrc" kernel || return 1
-}
-
-package() {
- cd "$_builddir"
- make KSRC="$_ksrc" DESTDIR="$pkgdir" \
- INSTALL_MOD_DIR="extra/drivers/scsi" \
- install_kernel
-}
-
-md5sums="b4df94f08c241352bb964043b3e44779 open-iscsi-2.0-872.tar.gz
-3987a17affa407eb03e845b84c71211e Makefile-Alpine-kernels-support.patch"
diff --git a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch
deleted file mode 100644
index 997250a7f5..0000000000
--- a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -63,11 +63,19 @@
- # check to see if code is unpatched
- unpatch_code=$(shell test -e $(cur_patched) && echo do_unpatch_code )
-
-+KVERSION = $(shell cat $(KSRC)/Makefile | awk -F= '/^VERSION =/ {print $$2}' | \
-+ sed 's/^[ \t]*//;s/[ \t]*$$//')
-+
-+KPATCHLEVEL = $(shell cat $(KSRC)/Makefile | awk -F= '/^PATCHLEVEL =/ {print $$2}' | \
-+ sed 's/^[ \t]*//;s/[ \t]*$$//')
-+
- KSUBLEVEL = $(shell cat $(KSRC)/Makefile | awk -F= '/^SUBLEVEL =/ {print $$2}' | \
- sed 's/^[ \t]*//;s/[ \t]*$$//')
-
-+linux_2_6_38: $(unpatch_code)
-
--KERNEL_TARGET=linux_2_6_$(KSUBLEVEL)
-+
-+KERNEL_TARGET=linux_$(KVERSION)_$(KPATCHLEVEL)_$(KSUBLEVEL)
- kernel_check: $(KERNEL_TARGET)
-
- linux_2_6_14: has_14to23_patch
-@@ -113,6 +121,8 @@
- linux_2_6_34: has_33to34_patch
-
- linux_2_6_35: $(unpatch_code)
-+
-+$(foreach num, 16 17 18 19 20 21 22 23 24, linux_3_0_$(num)): $(unpatch_code)
-
- do_unpatch_code:
- echo "Un-patching source code for use with linux-2.6.14 and up ..."
-Only in b: kernel/Makefile.orig
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
deleted file mode 100644
index f8eff5b440..0000000000
--- a/main/open-iscsi/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=open-iscsi
-pkgver=2.0.872
-_realver=${pkgver%.*}-${pkgver##*.}
-pkgrel=3
-pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
-url="http://www.open-iscsi.org"
-arch="all"
-license="GPL-2"
-depends=
-makedepends="openssl-dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://kernel.org/pub/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-$_realver.tar.gz
- iscsid.initd
- iscsid.confd"
-
-_builddir="$srcdir"/$pkgname-$_realver
-
-prepare() {
- cd "$_builddir"
-}
-
-build() {
- cd "$_builddir"
- make user || return 1
-}
-
-package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install_user
- mkdir -p $pkgdir/usr/bin
- mkdir -p $pkgdir/usr/sbin
- mv $pkgdir/sbin/iscsi-iname $pkgdir/usr/bin
- mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin
- mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin
- mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin
- install -Dm755 "$srcdir"/iscsid.initd "$pkgdir"/etc/init.d/iscsid
- install -Dm644 "$srcdir"/iscsid.confd "$pkgdir"/etc/conf.d/iscsid
-}
-
-md5sums="b4df94f08c241352bb964043b3e44779 open-iscsi-2.0-872.tar.gz
-9971f5abe255764ee616566e60955dba iscsid.initd
-b762b687d4628791b4362df22cf22d34 iscsid.confd"
diff --git a/main/open-iscsi/iscsid.confd b/main/open-iscsi/iscsid.confd
deleted file mode 100644
index 1c4cc40542..0000000000
--- a/main/open-iscsi/iscsid.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/conf.d/iscsid
-
-# config file to use
-CONFIG_FILE=/etc/iscsi/iscsid.conf
-
-# you need to specify an initiatorname in the file
-INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi
-
-# options to pass to iscsid
-OPTS="-i ${INITIATORNAME_FILE}"
-
-# Start automatic targets when iscsid is started
-AUTOSTARTTARGETS="yes"
diff --git a/main/open-iscsi/iscsid.initd b/main/open-iscsi/iscsid.initd
deleted file mode 100644
index 8ac8e1d9b5..0000000000
--- a/main/open-iscsi/iscsid.initd
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/sbin/runscript
-
-extra_started_commands="starttargets stoptargets restarttargets"
-
-depend() {
- after modules
- use net
-}
-
-checkconfig() {
- if [ ! -e /etc/conf.d/${SVCNAME} ]; then
- eerror "Config file /etc/conf.d/${SVCNAME} does not exist!"
- return 1
- fi
- if [ ! -e "${CONFIG_FILE}" ]; then
- eerror "Config file ${CONFIG_FILE} does not exist!"
- return 1
- fi
- if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then
- ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name."
- IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi
- IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g')
- ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}"
- echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}"
- eend $?
- fi
-}
-
-do_modules() {
- msg="$1"
- shift
- modules="${1}"
- shift
- modopts="$@"
- for m in ${modules}
- do
- if [ -n "$(find /lib/modules/`uname -r` | grep ${m})" ]
- then
- ebegin "${msg} ${m}"
- modprobe ${modopts} ${m}
- ret=$?
- eend ${ret}
- if [ ${ret} -ne 0 ]; then
- return ${ret}
- fi
- else
- ebegin "${msg} ${m}: not found"
- return 1
- fi
- done
- return 0
-}
-
-start() {
- ebegin "Checking open-iSCSI configuration"
- checkconfig
- ret=$?
- if [ $ret -ne 0 ]; then
- eend 1
- return 1
- fi
- ebegin "Loading iSCSI modules"
- do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp'
- ret=$?
- if [ $ret -ne 0 ]; then
- eend 1
- return 1
- fi
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --quiet --exec /usr/sbin/iscsid -- ${OPTS}
- ret=$?
- if [ $ret -ne 0 ]; then
- eend $?
- return $?
- fi
-
- # Start automatic targets when iscsid is started
- if [ "${AUTOSTARTTARGETS}" = "yes" ]; then
- starttargets
- return $?
- fi
- return 0
-}
-
-stop() {
- local ret=
- stoptargets
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --signal HUP --stop --quiet --exec /usr/sbin/iscsid #--pidfile $PID_FILE
- ret=$?
- eend $ret
-
- # ugly, but pid file is not removed by iscsid
- rm -f $PID_FILE
- return $ret
-}
-
-starttargets() {
- ebegin "Setting up iSCSI targets"
- /usr/bin/iscsiadm -m node --loginall=automatic
- ret=$?
- eend $ret
- return $ret
-}
-
-stoptargets() {
- ebegin "Disconnecting iSCSI targets"
- sync
- /usr/bin/iscsiadm -m node --logoutall=all
- ret=$?
- eend $ret
- return $ret
-}
-
-restarttargets() {
- stoptargets
- starttargets
-}
-
-status() {
- ebegin "Showing current active iSCSI sessions"
- /usr/bin/iscsiadm -m session
-}