Commit 704a5293 authored by Natanael Copa's avatar Natanael Copa

main/iscsitarget-grsec: recompile for 2.6.30.4

parent c11fe8f1
......@@ -6,6 +6,7 @@ _realname=iscsitarget
if [ -f ../linux-$_flavor/APKBUILD ]; then
. ../linux-$_flavor/APKBUILD
fi
_kernelver=$pkgver-r$pkgrel
_abi_release=$pkgver-${_flavor}
# get pkgver from iscsitarget
......@@ -14,17 +15,20 @@ if [ -f ../iscsitarget/APKBUILD ]; then
fi
pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-0.4.17}
pkgrel=3
pkgrel=4
pkgdesc="$_flavor kernel modules for iscsitarget"
url="http://iscsitarget.sourceforge.net/"
license="GPL-2"
depends=
#depends="linux-${_flavor}=${_kernelver}"
depends="linux-${_flavor}"
install=
#makedepends="linux-${_flavor}-dev=${_kernelver}"
makedepends="linux-${_flavor}-dev"
subpackages=
source="http://downloads.sourceforge.net/$_realname/$_realname-$pkgver.tar.gz
iscsitarget-0.4.17+linux-2.6.28.patch
iscsitarget-0.4.17+linux-2.6.29.patch
iscsitarget-0.4.17+linux-2.6.30.patch
"
build() {
......@@ -41,4 +45,5 @@ build() {
}
md5sums="e79b437695fc50e7d054631855a16b1b iscsitarget-0.4.17.tar.gz
f58dde50f72b04b7737b33e517e56208 iscsitarget-0.4.17+linux-2.6.28.patch
a7be10bb04c9014807e39db75c9cd468 iscsitarget-0.4.17+linux-2.6.29.patch"
a7be10bb04c9014807e39db75c9cd468 iscsitarget-0.4.17+linux-2.6.29.patch
2f65d30d1766828fc87cac55a84e0b07 iscsitarget-0.4.17+linux-2.6.30.patch"
From cb1b94ffa91d71aba8e07ed018e9f43064e05a49 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Wed, 10 Jun 2009 17:24:02 +0200
Subject: [PATCH 3/3] Fix building with Linux kernel 2.6.30 and later.
With commit 99b76233803beab302123d243eea9e41149804f3 the proc_dir_entry
structure does not have an owner any longer, this just removes the
assignment to make the code build with the newer kernel.
---
kernel/config.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/kernel/config.c b/kernel/config.c
index d6c4b5e..34681f5 100644
--- a/kernel/config.c
+++ b/kernel/config.c
@@ -5,6 +5,7 @@
*/
#include <linux/proc_fs.h>
+#include <linux/version.h>
#include "iscsi.h"
#include "iscsi_dbg.h"
@@ -43,7 +44,9 @@ int iet_procfs_init(void)
if (!(proc_iet_dir = proc_mkdir("iet", init_net.proc_net)))
goto err;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
proc_iet_dir->owner = THIS_MODULE;
+#endif
for (i = 0; i < ARRAY_SIZE(iet_proc_entries); i++) {
ent = create_proc_entry(iet_proc_entries[i].name, 0, proc_iet_dir);
--
1.6.3.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment