[leaf-commits] src/bering-uclibc4/source/iscsi iscsid.modules, NONE, 1.1 iscsitarget-2.6.32.10.patch, NONE, 1.1 buildtool.cfg, 1.1, 1.2 buildtool.mk, 1.1, 1.2 ietd.conf, 1.1, NONE
Andrew <[email protected]>
| Newsgroups | gmane.linux.leaf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/leaf/src/bering-uclibc4/source/iscsi
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12154
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
iscsid.modules iscsitarget-2.6.32.10.patch
Removed Files:
ietd.conf
Log Message:
Fixed iscsid
--- NEW FILE: iscsitarget-2.6.32.10.patch ---
diff -aur iscsitarget-1.4.20.1.orig/kernel/conn.c iscsitarget-1.4.20.1/kernel/conn.c
--- iscsitarget-1.4.20.1.orig/kernel/conn.c 2010-04-11 18:13:42.000000000 +0300
+++ iscsitarget-1.4.20.1/kernel/conn.c 2010-06-11 18:54:17.000000000 +0300
@@ -44,7 +44,7 @@
switch (sk->sk_family) {
case AF_INET:
snprintf(buf, sizeof(buf),
- "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr));
+ "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr));
break;
case AF_INET6:
snprintf(buf, sizeof(buf), "[%pI6]",
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/iscsi/buildtool.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.cfg 11 Jun 2010 14:45:51 -0000 1.1
--- buildtool.cfg 11 Jun 2010 17:09:08 -0000 1.2
***************
*** 12,16 ****
</File>
! <File iscsitarget-mem.patch>
Server = cvs4-sourceforge
Revision = HEAD
--- 12,16 ----
</File>
! <File iscsitarget-2.6.32.10.patch>
Server = cvs4-sourceforge
Revision = HEAD
***************
*** 25,29 ****
</File>
! <File ietd.conf>
Server = cvs4-sourceforge
Directory = iscsi
--- 25,35 ----
</File>
! #<File ietd.conf>
! # Server = cvs4-sourceforge
! # Directory = iscsi
! # Revision = HEAD
! #</File>
!
! <File iscsid.modules>
Server = cvs4-sourceforge
Directory = iscsi
***************
*** 76,79 ****
--- 82,117 ----
</File>
<File>
+ Filename = etc/initiators.allow
+ Source = etc/initiators.allow
+ Type = binary
+ Type = local
+ Type = conf
+ Description = iSCSI initiators.allow file
+ </File>
+ <File>
+ Filename = etc/initiators.deny
+ Source = etc/initiators.deny
+ Type = binary
+ Type = local
+ Type = conf
+ Description = iSCSI initiators.deny file
+ </File>
+ <File>
+ Filename = etc/targets.allow
+ Source = etc/targets.allow
+ Type = binary
+ Type = local
+ Type = conf
+ Description = iSCSI targets.allow file
+ </File>
+ <File>
+ Filename = etc/modules.d/iscsid.modules
+ Source = etc/modules.d/iscsid.modules
+ Type = binary
+ Type = local
+ Type = conf
+ Description = iSCSI modules file
+ </File>
+ <File>
Filename = etc/init.d/iscsi-target
Source = etc/init.d/iscsi-target
***************
*** 81,84 ****
--- 119,128 ----
Permissions = 755
</File>
+ <File>
+ Filename = lib/modules/iscsi_trgt.ko
+ Source = lib/modules/__KVER__/kernel/iscsi/iscsi_trgt.ko
+ Type = binary
+ Type = module
+ </File>
</Contents>
</iscsid>
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/iscsi/buildtool.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.mk 11 Jun 2010 14:45:51 -0000 1.1
--- buildtool.mk 11 Jun 2010 17:09:08 -0000 1.2
***************
*** 12,16 ****
source:
zcat $(ISCSI_SOURCE) | tar -xvf -
! # cat $(ISCSI_PATCH1) | patch -d $(ISCSI_DIR) -p1
build:
--- 12,16 ----
source:
zcat $(ISCSI_SOURCE) | tar -xvf -
! cat $(ISCSI_PATCH1) | patch -d $(ISCSI_DIR) -p1
build:
***************
*** 18,32 ****
mkdir -p $(ISCSI_TARGET_DIR)/lib/modules
mkdir -p $(ISCSI_TARGET_DIR)/etc/init.d
mkdir -p $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/kernel/iscsi
$(MAKE) KSRC=$(BT_LINUX_DIR) CC=$(TARGET_CC) -C $(ISCSI_DIR)
! $(BT_STRIP) $(BT_STRIP_BINOPTS) $(ISCSI_DIR)/iscsid/ietd
! $(BT_STRIP) $(BT_STRIP_BINOPTS) $(ISCSI_DIR)/iscsid/ietadm
! cp -a $(ISCSI_DIR)/iscsid/ietd $(ISCSI_TARGET_DIR)/usr/sbin
! cp -a $(ISCSI_DIR)/iscsid/ietadm $(ISCSI_TARGET_DIR)/usr/sbin
! cp -a ietd.conf $(ISCSI_TARGET_DIR)/etc
cp -a iscsi-target.init $(ISCSI_TARGET_DIR)/etc/init.d/iscsi-target
cp -a $(ISCSI_TARGET_DIR)/* $(BT_STAGING_DIR)
! cp -a $(ISCSI_DIR)/kernel/iscsi_trgt.o $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/kernel/iscsi
! cp -a $(ISCSI_DIR)/kernel/file-io.o $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/kernel/iscsi/fileio.o
$(BT_DEPMOD) -ae -b $(BT_STAGING_DIR) -r -F $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/build/System.map $(BT_KERNEL_RELEASE)
--- 18,32 ----
mkdir -p $(ISCSI_TARGET_DIR)/lib/modules
mkdir -p $(ISCSI_TARGET_DIR)/etc/init.d
+ mkdir -p $(ISCSI_TARGET_DIR)/etc/modules.d
mkdir -p $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/kernel/iscsi
$(MAKE) KSRC=$(BT_LINUX_DIR) CC=$(TARGET_CC) -C $(ISCSI_DIR)
! cp -a $(ISCSI_DIR)/usr/ietd $(ISCSI_TARGET_DIR)/usr/sbin
! cp -a $(ISCSI_DIR)/usr/ietadm $(ISCSI_TARGET_DIR)/usr/sbin
! $(BT_STRIP) $(BT_STRIP_BINOPTS) $(ISCSI_TARGET_DIR)/usr/sbin/*
! cp -a $(ISCSI_DIR)/etc/*.* $(ISCSI_TARGET_DIR)/etc
cp -a iscsi-target.init $(ISCSI_TARGET_DIR)/etc/init.d/iscsi-target
+ cp -a iscsid.modules $(ISCSI_TARGET_DIR)/etc/modules.d
cp -a $(ISCSI_TARGET_DIR)/* $(BT_STAGING_DIR)
! cp -a $(ISCSI_DIR)/kernel/iscsi_trgt.ko $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/kernel/iscsi
$(BT_DEPMOD) -ae -b $(BT_STAGING_DIR) -r -F $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/build/System.map $(BT_KERNEL_RELEASE)
***************
*** 39,42 ****
rm -f $(BT_STAGING_DIR)/etc/init.d/iscsi-target
rm -f $(BT_STAGING_DIR)/etc/ietd.conf
- rm -f $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/kernel/iscsi/fileio.o
rm -f $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/kernel/iscsi/iscsi_trgt.o
--- 39,41 ----
--- NEW FILE: iscsid.modules ---
iscsi_trgt
--- ietd.conf DELETED ---
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo