From d00667dbe45d1c1f637b1abe2ecbaa2ed88ad424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9zard?= Date: Sat, 3 Mar 2012 13:43:37 +0100 Subject: [PATCH 1/9] Add support for iscsi on boot to initrd (only built and added if ISCSI_SUPPORT is enabled in options). --- packages/initramfs/meta | 4 ++ .../sysutils/busybox-initramfs/scripts/init | 59 +++++++++++++++++++ packages/initramfs/sysutils/open-iscsi/build | 31 ++++++++++ .../initramfs/sysutils/open-iscsi/install | 31 ++++++++++ packages/initramfs/sysutils/open-iscsi/meta | 37 ++++++++++++ ...it20120226_dynamic_linked_iscsistart.patch | 11 ++++ 6 files changed, 173 insertions(+) create mode 100755 packages/initramfs/sysutils/open-iscsi/build create mode 100755 packages/initramfs/sysutils/open-iscsi/install create mode 100644 packages/initramfs/sysutils/open-iscsi/meta create mode 100644 packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-git20120226_dynamic_linked_iscsistart.patch diff --git a/packages/initramfs/meta b/packages/initramfs/meta index 176f1682df..15408a60fa 100644 --- a/packages/initramfs/meta +++ b/packages/initramfs/meta @@ -34,3 +34,7 @@ PKG_LONGDESC="debug is a Metapackage for installing initramfs" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +if [ -n "$ISCSI_SUPPORT" ] && [ "$ISCSI_SUPPORT" = yes ]; then + PKG_DEPENDS="$PKG_DEPENDS open-iscsi" +fi \ No newline at end of file diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index e391c6b9c9..db60226f7a 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -4,6 +4,7 @@ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) #      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv) +# Copyright (C) 2012 Yann Cézard (eesprit@free.fr) # # This Program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -66,6 +67,36 @@ NBD_DEVS="0" break=*) BREAK="${arg#*=}" ;; + iscsi_auto) + ISCSI_AUTO=yes + ;; + iscsi_initiator=*) + ISCSI_INITIATOR="${arg#iscsi_initiator=}" + ;; + iscsi_target_name=*) + ISCSI_TARGET_NAME="${arg#iscsi_target_name=}" + ;; + iscsi_target_ip=*) + ISCSI_TARGET_IP="${arg#iscsi_target_ip=}" + ;; + iscsi_target_port=*) + ISCSI_TARGET_PORT="${arg#iscsi_target_port=}" + ;; + iscsi_target_group=*) + ISCSI_TARGET_GROUP="${arg#iscsi_target_group=}" + ;; + iscsi_username=*) + ISCSI_USERNAME="${arg#iscsi_username=}" + ;; + iscsi_password=*) + ISCSI_PASSWORD="${arg#iscsi_password=}" + ;; + iscsi_in_username=*) + ISCSI_IN_USERNAME="${arg#iscsi_in_username=}" + ;; + iscsi_in_password=*) + ISCSI_IN_PASSWORD="${arg#iscsi_in_password=}" + ;; esac done @@ -230,6 +261,30 @@ NBD_DEVS="0" error "load_modules" "Failed to load kernel module $module" done } + + do_iscsi_login () + { + + /bin/busybox modprobe iscsi_tcp + + if [ -z $ISCSI_AUTO ]; then + for i in $ISCSI_TARGET_IP; do + /sbin/iscsistart -i $ISCSI_INITIATOR -t $ISCSI_TARGET_NAME \ + -g $ISCSI_TARGET_GROUP -a $i \ + -p $ISCSI_TARGET_PORT \ + ${ISCSI_USERNAME:+-u "$ISCSI_USERNAME"} \ + ${ISCSI_PASSWORD:+-w "$ISCSI_PASSWORD"} \ + ${ISCSI_IN_USERNAME:+-U "$ISCSI_IN_USERNAME"} \ + ${ISCSI_IN_PASSWORD:+-W "$ISCSI_IN_PASSWORD"} + + done + else + echo "Network configuration based on iBFT." + /sbin/iscsistart -N + echo "iSCSI auto connect based on iBFT." + /sbin/iscsistart -b + fi + } check_disks() { progress "Checking disks" @@ -301,6 +356,10 @@ NBD_DEVS="0" [ -f "/sysroot/sbin/init" ] || error "final_check" "Could not find system." } + + if [ -n "$ISCSI_AUTO" -o -n "$ISCSI_TARGET_NAME" ]; then + do_iscsi_login + fi # main boot sequence for BOOT_STEP in \ diff --git a/packages/initramfs/sysutils/open-iscsi/build b/packages/initramfs/sysutils/open-iscsi/build new file mode 100755 index 0000000000..f5eadbac94 --- /dev/null +++ b/packages/initramfs/sysutils/open-iscsi/build @@ -0,0 +1,31 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2012 Yann Cézard (eesprit@free.fr) +# +# This Program 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, or (at your option) +# any later version. +# +# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD/utils/open-isns +./configure CFLAGS="$(OPTFLAGS)" --with-security=no \ + --host=$TARGET_NAME \ + --build=$HOST_NAME +cd $PKG_BUILD +make user \ No newline at end of file diff --git a/packages/initramfs/sysutils/open-iscsi/install b/packages/initramfs/sysutils/open-iscsi/install new file mode 100755 index 0000000000..aaf2ce9196 --- /dev/null +++ b/packages/initramfs/sysutils/open-iscsi/install @@ -0,0 +1,31 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2012 Yann Cézard (eesprit@free.fr) +# +# This Program 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, or (at your option) +# any later version. +# +# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +OPEN_ISCSI_DIR="$BUILD/open-iscsi-$PKG_VERSION" + +INSTALL=$ROOT/$BUILD/image/initramfs/root-image + +mkdir -p $INSTALL/sbin + cp -P $OPEN_ISCSI_DIR/usr/iscsistart $INSTALL/sbin \ No newline at end of file diff --git a/packages/initramfs/sysutils/open-iscsi/meta b/packages/initramfs/sysutils/open-iscsi/meta new file mode 100644 index 0000000000..0d213ffb3b --- /dev/null +++ b/packages/initramfs/sysutils/open-iscsi/meta @@ -0,0 +1,37 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2012 Yann Cézard (eesprit@free.fr) +# +# This Program 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, or (at your option) +# any later version. +# +# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="open-iscsi" +PKG_VERSION="git20120226" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://eesprit.free.fr" +PKG_URL="$PKG_SITE/openelec.tv/bits/$PKG_NAME-$PKG_VERSION.tgz" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain util-linux" +PKG_PRIORITY="optional" +PKG_SECTION="initramfs/system" +PKG_SHORTDESC="open-iscsi: system utilities for Linux to access iSCSI targets" +PKG_LONGDESC="The open-iscsi package allows you to mount iSCSI targets. This package add support for using iscsi target as root device." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-git20120226_dynamic_linked_iscsistart.patch b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-git20120226_dynamic_linked_iscsistart.patch new file mode 100644 index 0000000000..27d30311b8 --- /dev/null +++ b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-git20120226_dynamic_linked_iscsistart.patch @@ -0,0 +1,11 @@ +--- a/usr/Makefile 2011-08-05 11:54:52.000000000 +0200 ++++ b/usr/Makefile 2011-08-05 11:55:06.000000000 +0200 +@@ -63,7 +63,7 @@ + + iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) -static $^ -o $@ ++ $(CC) $(CFLAGS) $^ -o $@ + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) + From ca8d8e53d9605c7efdad0cd1f6d9a4c5ed28bb70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9zard?= Date: Sat, 3 Mar 2012 14:01:05 +0100 Subject: [PATCH 2/9] Add option ISCSI_SUPPORT to enable/disable iscsi support (will build and install iscsistart in initrd). Default is disabled so it does not change anything. --- projects/ATV/options | 3 +++ projects/Fusion/options | 3 +++ projects/Generic/options | 3 +++ projects/Generic_OSS/options | 3 +++ projects/ION/options | 3 +++ projects/Intel/options | 3 +++ projects/Ultra/options | 3 +++ 7 files changed, 21 insertions(+) diff --git a/projects/ATV/options b/projects/ATV/options index 5b0a04b6ce..2e5983f11c 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -257,6 +257,9 @@ # build and install CEC adapter support (yes / no) CEC_SUPPORT="yes" + +# build and install iSCSI support - iscsistart (yes / no) + ISCSI_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Fusion/options b/projects/Fusion/options index 8dbd4b2ef4..c0da6418e2 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -257,6 +257,9 @@ # build and install CEC adapter support (yes / no) CEC_SUPPORT="yes" + +# build and install iSCSI support - iscsistart (yes / no) + ISCSI_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Generic/options b/projects/Generic/options index 7bbcf4e28e..da58cee423 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -257,6 +257,9 @@ # build and install CEC adapter support (yes / no) CEC_SUPPORT="yes" + +# build and install iSCSI support - iscsistart (yes / no) + ISCSI_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 22ef9bc89d..0d0cca0384 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -257,6 +257,9 @@ # build and install CEC adapter support (yes / no) CEC_SUPPORT="yes" + +# build and install iSCSI support - iscsistart (yes / no) + ISCSI_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/ION/options b/projects/ION/options index 97275897da..2653f2502b 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -257,6 +257,9 @@ # build and install CEC adapter support (yes / no) CEC_SUPPORT="yes" + +# build and install iSCSI support - iscsistart (yes / no) + ISCSI_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Intel/options b/projects/Intel/options index f1edfe7461..80c7886f19 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -257,6 +257,9 @@ # build and install CEC adapter support (yes / no) CEC_SUPPORT="yes" + +# build and install iSCSI support - iscsistart (yes / no) + ISCSI_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Ultra/options b/projects/Ultra/options index 41ea17d5af..61511b64d4 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -257,6 +257,9 @@ # build and install CEC adapter support (yes / no) CEC_SUPPORT="yes" + +# build and install iSCSI support - iscsistart (yes / no) + ISCSI_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, From 527388ef668b552f140ab6de879a2d17b2282bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9zard?= Date: Sat, 3 Mar 2012 19:00:38 +0100 Subject: [PATCH 3/9] Add iSCSI modules into kernel. Fix build script + updated init. --- .../sysutils/busybox-initramfs/scripts/init | 3 - packages/initramfs/sysutils/open-iscsi/build | 4 +- projects/ATV/linux/linux.i386.conf | 67 +++++++++++++++++-- projects/Fusion/linux/linux.i386.conf | 67 +++++++++++++++++-- projects/Fusion/linux/linux.x86_64.conf | 66 ++++++++++++++++-- projects/Generic/linux/linux.i386.conf | 67 +++++++++++++++++-- projects/Generic_OSS/linux/linux.i386.conf | 67 +++++++++++++++++-- projects/ION/linux/linux.i386.conf | 67 +++++++++++++++++-- projects/ION/linux/linux.x86_64.conf | 66 ++++++++++++++++-- projects/Intel/linux/linux.i386.conf | 67 +++++++++++++++++-- projects/Intel/linux/linux.x86_64.conf | 66 ++++++++++++++++-- projects/Ultra/linux/linux.x86_64.conf | 66 ++++++++++++++++-- 12 files changed, 618 insertions(+), 55 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index db60226f7a..6388b94574 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -264,9 +264,6 @@ NBD_DEVS="0" do_iscsi_login () { - - /bin/busybox modprobe iscsi_tcp - if [ -z $ISCSI_AUTO ]; then for i in $ISCSI_TARGET_IP; do /sbin/iscsistart -i $ISCSI_INITIATOR -t $ISCSI_TARGET_NAME \ diff --git a/packages/initramfs/sysutils/open-iscsi/build b/packages/initramfs/sysutils/open-iscsi/build index f5eadbac94..43a384a5c1 100755 --- a/packages/initramfs/sysutils/open-iscsi/build +++ b/packages/initramfs/sysutils/open-iscsi/build @@ -27,5 +27,5 @@ cd $PKG_BUILD/utils/open-isns ./configure CFLAGS="$(OPTFLAGS)" --with-security=no \ --host=$TARGET_NAME \ --build=$HOST_NAME -cd $PKG_BUILD -make user \ No newline at end of file +cd ../.. +make user diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index d37559cef3..d4273d06a8 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -218,7 +218,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # CONFIG_BLK_DEV_THROTTLING is not set @@ -842,11 +842,67 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -2505,7 +2561,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -2888,7 +2945,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 82e315e1b9..7560f7e3af 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -219,7 +219,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -889,11 +889,67 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -2815,7 +2871,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -3199,7 +3256,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index bb95f67fa6..61f75dc9a7 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -220,7 +220,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set CONFIG_BLOCK_COMPAT=y @@ -849,11 +849,66 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -2761,7 +2816,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -3144,7 +3200,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 165d3129c6..44072a557c 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -219,7 +219,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -901,11 +901,67 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -3000,7 +3056,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -3385,7 +3442,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 201dd87f51..8147c16276 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -219,7 +219,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -902,11 +902,67 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -3002,7 +3058,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -3387,7 +3444,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index b950b07e12..4705d25535 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -219,7 +219,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -887,11 +887,67 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -2791,7 +2847,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -3176,7 +3233,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 5541dd8dcf..7469775c57 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -219,7 +219,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -838,11 +838,66 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -2729,7 +2784,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -3112,7 +3168,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 4d8dfe36e2..9bf47ee4a8 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -219,7 +219,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -889,11 +889,67 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -2852,7 +2908,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -3237,7 +3294,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 426dd5850b..314c03e1f6 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -219,7 +219,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -841,11 +841,66 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -2791,7 +2846,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -3174,7 +3230,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index e496e6a56f..2c7c4dc78e 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -219,7 +219,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -830,11 +830,66 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=y +CONFIG_ISCSI_BOOT_SYSFS=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_VMWARE_PVSCSI is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_FCOE_FNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_ISCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y @@ -2564,7 +2619,8 @@ CONFIG_EFI_VARS=y # CONFIG_DCDBAS is not set CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=y # CONFIG_SIGMA is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -2947,7 +3003,7 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32C_INTEL is not set # CONFIG_CRYPTO_GHASH is not set CONFIG_CRYPTO_MD4=y From 5c176481a8b7235cd7f2ed3669c772c275759a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9zard?= Date: Wed, 7 Mar 2012 19:15:39 +0100 Subject: [PATCH 4/9] Add mkpkg_open-iscsi to build the package archive from the official open-iscsi GIT. --- packages/initramfs/sysutils/open-iscsi/meta | 4 ++-- ...-iscsi-git20120226_dynamic_linked_iscsistart.patch | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-git20120226_dynamic_linked_iscsistart.patch diff --git a/packages/initramfs/sysutils/open-iscsi/meta b/packages/initramfs/sysutils/open-iscsi/meta index 0d213ffb3b..0d8b5e6ea3 100644 --- a/packages/initramfs/sysutils/open-iscsi/meta +++ b/packages/initramfs/sysutils/open-iscsi/meta @@ -20,12 +20,12 @@ ################################################################################ PKG_NAME="open-iscsi" -PKG_VERSION="git20120226" +PKG_VERSION="f9f627f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://eesprit.free.fr" -PKG_URL="$PKG_SITE/openelec.tv/bits/$PKG_NAME-$PKG_VERSION.tgz" +PKG_URL="$PKG_SITE/openelec.tv/bits/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain util-linux" PKG_PRIORITY="optional" diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-git20120226_dynamic_linked_iscsistart.patch b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-git20120226_dynamic_linked_iscsistart.patch deleted file mode 100644 index 27d30311b8..0000000000 --- a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-git20120226_dynamic_linked_iscsistart.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/usr/Makefile 2011-08-05 11:54:52.000000000 +0200 -+++ b/usr/Makefile 2011-08-05 11:55:06.000000000 +0200 -@@ -63,7 +63,7 @@ - - iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) -static $^ -o $@ -+ $(CC) $(CFLAGS) $^ -o $@ - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - From 4848bbb78cc61a7f01d8a5c4de48824c0c2db183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9zard?= Date: Wed, 7 Mar 2012 20:10:10 +0100 Subject: [PATCH 5/9] Add mkpkg_open-iscsi to build the package archive from the official open-iscsi GIT (2) --- ...si-f9f627f_dynamic_linked_iscsistart.patch | 11 +++++ tools/mkpkg/mkpkg_open-iscsi | 43 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-f9f627f_dynamic_linked_iscsistart.patch create mode 100755 tools/mkpkg/mkpkg_open-iscsi diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-f9f627f_dynamic_linked_iscsistart.patch b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-f9f627f_dynamic_linked_iscsistart.patch new file mode 100644 index 0000000000..27d30311b8 --- /dev/null +++ b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-f9f627f_dynamic_linked_iscsistart.patch @@ -0,0 +1,11 @@ +--- a/usr/Makefile 2011-08-05 11:54:52.000000000 +0200 ++++ b/usr/Makefile 2011-08-05 11:55:06.000000000 +0200 +@@ -63,7 +63,7 @@ + + iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) -static $^ -o $@ ++ $(CC) $(CFLAGS) $^ -o $@ + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) + diff --git a/tools/mkpkg/mkpkg_open-iscsi b/tools/mkpkg/mkpkg_open-iscsi new file mode 100755 index 0000000000..aff497e137 --- /dev/null +++ b/tools/mkpkg/mkpkg_open-iscsi @@ -0,0 +1,43 @@ +#!/bin/sh +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program 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, or (at your option) +# any later version. +# +# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +echo "getting sources..." + if [ ! -d open-iscsi.git ]; then + git clone https://github.com/mikechristie/open-iscsi -b release open-iscsi.git + fi + + cd open-iscsi.git + git pull + GIT_REV=`git log -n1 --format=%h` + cd .. + +echo "copying sources..." + rm -rf open-iscsi-$GIT_REV + cp -R open-iscsi.git open-iscsi-$GIT_REV + +echo "cleaning sources..." + rm -rf open-iscsi-$GIT_REV/.git + +echo "packing sources..." + tar cvJf open-iscsi-$GIT_REV.tar.xz open-iscsi-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf open-iscsi-$GIT_REV From ee48f9a59a71a2a45ee7bfb16f81bcaf5dde1a1b Mon Sep 17 00:00:00 2001 From: Alain Kalker Date: Mon, 26 Mar 2012 02:27:35 +0200 Subject: [PATCH 6/9] busybox-initramfs: init: add support for iSCSI mounts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for iSCSI mounts. Based on the work by Yann Cézard , adapted to the new syntax. Example usage: Example 1: Autoconfigure network based on iBFT, autologin to iSCSI target based on iBFT, mount partition with label 'Storage': disk=ISCSI=auto,LABEL=Storage Example 2: Specify any needed iSCSI options, mount partition 1 on /dev/sdb: disk=ISCSI=param1=val1,param2=val2,...,/dev/sdb1 Note: the parameter after the very last comma _must_ be a valid LABEL=, UUID= or device path. Signed-off-by: Alain Kalker --- .../sysutils/busybox-initramfs/scripts/init | 124 ++++++++++-------- 1 file changed, 69 insertions(+), 55 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 6388b94574..9b157f18da 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -67,36 +67,6 @@ NBD_DEVS="0" break=*) BREAK="${arg#*=}" ;; - iscsi_auto) - ISCSI_AUTO=yes - ;; - iscsi_initiator=*) - ISCSI_INITIATOR="${arg#iscsi_initiator=}" - ;; - iscsi_target_name=*) - ISCSI_TARGET_NAME="${arg#iscsi_target_name=}" - ;; - iscsi_target_ip=*) - ISCSI_TARGET_IP="${arg#iscsi_target_ip=}" - ;; - iscsi_target_port=*) - ISCSI_TARGET_PORT="${arg#iscsi_target_port=}" - ;; - iscsi_target_group=*) - ISCSI_TARGET_GROUP="${arg#iscsi_target_group=}" - ;; - iscsi_username=*) - ISCSI_USERNAME="${arg#iscsi_username=}" - ;; - iscsi_password=*) - ISCSI_PASSWORD="${arg#iscsi_password=}" - ;; - iscsi_in_username=*) - ISCSI_IN_USERNAME="${arg#iscsi_in_username=}" - ;; - iscsi_in_password=*) - ISCSI_IN_PASSWORD="${arg#iscsi_in_password=}" - ;; esac done @@ -175,6 +145,72 @@ NBD_DEVS="0" mount_common "$CIFS_SHARE" "$2" "$3,$CIFS_OPTIONS" "cifs" } + get_iscsistart_options() { + # Convert kernel commandline ISCSI= options to iscsistart options + IFS_SAVE="$IFS" + IFS=, + + for arg in $1; do + val="${arg#*=}" + case "$arg" in + iscsi_initiator=*) + option="-i" + ;; + iscsi_target_name=*) + option="-t" + ;; + iscsi_target_ip=*) + option="-a" + ;; + iscsi_target_port=*) + option="-p" + ;; + iscsi_target_group=*) + option="-g" + ;; + iscsi_username=*) + option="-u" + ;; + iscsi_password=*) + option="-w" + ;; + iscsi_in_username=*) + option="-U" + ;; + iscsi_in_password=*) + option="-W" + ;; + esac + echo "$option $val" + done + + IFS="$IFS_SAVE" + } + + mount_iscsi() { + # Mount iSCSI target + ISCSI_DEV="${1##*,}" + ISCSI_OPTIONS="${1%,*}" + + if [ ! -f "/sbin/iscsistart" ]; then + error "iscsistart" "iSCSI support not available" + fi + + if [ "$ISCSI_OPTIONS" = "auto" ]; then + progress "Network configuration based on iBFT" + /sbin/iscsistart -N >&$SILENT_OUT 2>&1 || \ + error "iscsistart" "Unable to configure network" + progress "iSCSI auto connect based on iBFT" + /sbin/iscsistart -b >&$SILENT_OUT 2>&1 || \ + error "iscsistart" "Unable to auto connect" + else + /sbin/iscsistart $(get_iscsistart_options "$ISCSI_OPTIONS") >&$SILENT_OUT 2>&1 || \ + error "iscsistart" "Unable to connect to ISCSI target" + fi + + mount_common "$ISCSI_DEV" "$2" "$3" "$4" + } + mount_nbd() { # Mount NBD device NBD_SERVER="${1%%:*}" @@ -210,6 +246,9 @@ NBD_DEVS="0" CIFS=*|SMB=*) MOUNT_CMD="mount_cifs" ;; + ISCSI=*) + MOUNT_CMD="mount_iscsi" + ;; NBD=*) MOUNT_CMD="mount_nbd" ;; @@ -261,27 +300,6 @@ NBD_DEVS="0" error "load_modules" "Failed to load kernel module $module" done } - - do_iscsi_login () - { - if [ -z $ISCSI_AUTO ]; then - for i in $ISCSI_TARGET_IP; do - /sbin/iscsistart -i $ISCSI_INITIATOR -t $ISCSI_TARGET_NAME \ - -g $ISCSI_TARGET_GROUP -a $i \ - -p $ISCSI_TARGET_PORT \ - ${ISCSI_USERNAME:+-u "$ISCSI_USERNAME"} \ - ${ISCSI_PASSWORD:+-w "$ISCSI_PASSWORD"} \ - ${ISCSI_IN_USERNAME:+-U "$ISCSI_IN_USERNAME"} \ - ${ISCSI_IN_PASSWORD:+-W "$ISCSI_IN_PASSWORD"} - - done - else - echo "Network configuration based on iBFT." - /sbin/iscsistart -N - echo "iSCSI auto connect based on iBFT." - /sbin/iscsistart -b - fi - } check_disks() { progress "Checking disks" @@ -353,10 +371,6 @@ NBD_DEVS="0" [ -f "/sysroot/sbin/init" ] || error "final_check" "Could not find system." } - - if [ -n "$ISCSI_AUTO" -o -n "$ISCSI_TARGET_NAME" ]; then - do_iscsi_login - fi # main boot sequence for BOOT_STEP in \ From f5299492499c71a8d64d51a5f90b6eca20246333 Mon Sep 17 00:00:00 2001 From: Alain Kalker Date: Tue, 27 Mar 2012 18:03:23 +0200 Subject: [PATCH 7/9] initramfs: Remove redundant test Signed-off-by: Alain Kalker --- packages/initramfs/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/initramfs/meta b/packages/initramfs/meta index 15408a60fa..f1aa3b5598 100644 --- a/packages/initramfs/meta +++ b/packages/initramfs/meta @@ -35,6 +35,6 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -if [ -n "$ISCSI_SUPPORT" ] && [ "$ISCSI_SUPPORT" = yes ]; then +if [ "$ISCSI_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS open-iscsi" -fi \ No newline at end of file +fi From a148061ac776f7d2747364538cfdfb61b343d2c7 Mon Sep 17 00:00:00 2001 From: Alain Kalker Date: Tue, 27 Mar 2012 18:08:37 +0200 Subject: [PATCH 8/9] open-iscsi: Remove redundant line Signed-off-by: Alain Kalker --- packages/initramfs/sysutils/open-iscsi/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/initramfs/sysutils/open-iscsi/install b/packages/initramfs/sysutils/open-iscsi/install index aaf2ce9196..976b3fcc0e 100755 --- a/packages/initramfs/sysutils/open-iscsi/install +++ b/packages/initramfs/sysutils/open-iscsi/install @@ -25,7 +25,5 @@ OPEN_ISCSI_DIR="$BUILD/open-iscsi-$PKG_VERSION" -INSTALL=$ROOT/$BUILD/image/initramfs/root-image - mkdir -p $INSTALL/sbin - cp -P $OPEN_ISCSI_DIR/usr/iscsistart $INSTALL/sbin \ No newline at end of file + cp -P $OPEN_ISCSI_DIR/usr/iscsistart $INSTALL/sbin From 90dd3680fdccf9b939160c3884b9032b63388df2 Mon Sep 17 00:00:00 2001 From: Alain Kalker Date: Tue, 27 Mar 2012 18:18:05 +0200 Subject: [PATCH 9/9] open-iscsi: Enable support for all default builds Thanks, Stephan! Signed-off-by: Alain Kalker --- projects/ATV/options | 2 +- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/Generic_OSS/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- projects/Ultra/options | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index 2e5983f11c..ab05401d87 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -259,7 +259,7 @@ CEC_SUPPORT="yes" # build and install iSCSI support - iscsistart (yes / no) - ISCSI_SUPPORT="no" + ISCSI_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Fusion/options b/projects/Fusion/options index c0da6418e2..3abdbd24b1 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -259,7 +259,7 @@ CEC_SUPPORT="yes" # build and install iSCSI support - iscsistart (yes / no) - ISCSI_SUPPORT="no" + ISCSI_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Generic/options b/projects/Generic/options index da58cee423..baeb6c6568 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -259,7 +259,7 @@ CEC_SUPPORT="yes" # build and install iSCSI support - iscsistart (yes / no) - ISCSI_SUPPORT="no" + ISCSI_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 0d0cca0384..c4c028444a 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -259,7 +259,7 @@ CEC_SUPPORT="yes" # build and install iSCSI support - iscsistart (yes / no) - ISCSI_SUPPORT="no" + ISCSI_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/ION/options b/projects/ION/options index 2653f2502b..90b589b3a1 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -259,7 +259,7 @@ CEC_SUPPORT="yes" # build and install iSCSI support - iscsistart (yes / no) - ISCSI_SUPPORT="no" + ISCSI_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Intel/options b/projects/Intel/options index 80c7886f19..a8cd0d0d32 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -259,7 +259,7 @@ CEC_SUPPORT="yes" # build and install iSCSI support - iscsistart (yes / no) - ISCSI_SUPPORT="no" + ISCSI_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, diff --git a/projects/Ultra/options b/projects/Ultra/options index 61511b64d4..db8e4eecdf 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -259,7 +259,7 @@ CEC_SUPPORT="yes" # build and install iSCSI support - iscsistart (yes / no) - ISCSI_SUPPORT="no" + ISCSI_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,