Hello community, here is the log from the commit of package open-iscsi.1840 for openSUSE:12.3:Update checked in at 2013-07-10 10:23:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/open-iscsi.1840 (Old) and /work/SRC/openSUSE:12.3:Update/.open-iscsi.1840.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-iscsi.1840" Changes: -------- New Changes file: --- /dev/null 2013-07-02 09:26:14.908030755 +0200 +++ /work/SRC/openSUSE:12.3:Update/.open-iscsi.1840.new/open-iscsi.changes 2013-07-10 10:23:57.000000000 +0200 @@ -0,0 +1,821 @@ +------------------------------------------------------------------- +Wed Jul 3 15:01:50 UTC 2013 - meissner@suse.com + +- moved the open-iscsi branch to the SLES 11 SP3 codebase. + + Update coalesces and drops patches: + iscsi-gen-initiatorname.sh + open-iscsi-2.0-870-rc1-static.patch + open-iscsi-2.0-870-rc1.tar.bz2 + open-iscsi-add-error-msg-to-log.c + open-iscsi-add-mkinitrd-scriptlets + open-iscsi-add-rhel5-compat + open-iscsi-add-sles10-compat + open-iscsi-allow-onboot-for-loginall + open-iscsi-beta5-kernel-patch-update + open-iscsi.changes + open-iscsi-cxgb3i-support + open-iscsi-error-check-in-db-lock-creation + open-iscsi-fix-sysfs-get-value-null.patch + open-iscsi-fixup-onboot-for-loginall + open-iscsi-fw-crash-on-ppc + open-iscsi-fwparam_ppc-string-overflow + open-iscsi-header.patch + open-iscsi-initiator-compile-warning + open-iscsi-install-mkinitrd-scriptlets + open-iscsi-iscsid-adjust-settings + open-iscsi-iscsi_discovery-doc-fixes + open-iscsi-load-ibft-before-reading-sys-firmware + open-iscsi-login-retry-update + open-iscsi-no-pid-file + open-iscsi-option-no-pid-file + open-iscsi-remove-dump-char + open-iscsi-remove-trailing-tilde + open-iscsi-rm-unused-variable + open-iscsi-set-LOCK_DIR-during-compilation + open-iscsi.spec + open-iscsi-start-target-before-initiator + open-iscsi-support-non-root-boot-volume.patch + open-iscsi-suse-build-fixes + open-iscsi-sync-modules-with-2.6.27 + open-iscsi-update-init-script + open-iscsi-update-suse-init-scripts + +- New patches: + open-iscsi-openSUSE-12.3-first-merge.diff.bz2 + open-iscsi-sles11-sp2-latest.diff.bz2 + open-iscsi-sles11-sp2-update.diff.bz2 + open-iscsi-sles11-sp3-flash-update.diff.bz2 + open-iscsi-sles11-sp3-general-updates-1.diff.bz2 + open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 + +------------------------------------------------------------------- +Wed Jun 5 15:53:34 PDT 2013 - lduncan@suse.com + +- check return from nice() correctly (bnc#807936) + +------------------------------------------------------------------- +Tue Jun 4 11:27:55 PDT 2013 - lduncan@suse.com + +- Branched from SLES 11 SP3 + +- Modified for openSUSE by removing iscsiuio references, and + by changing service name from open-iscsi to iscsid (bnc#821695) + +------------------------------------------------------------------- +Thu May 23 19:24:20 PDT 2013 - lduncan@suse.com + +- Adds support to be able to use isns discovery and + bind the portals found to offload ifaces (bnc#820881) + +------------------------------------------------------------------- +Fri May 17 18:34:23 PDT 2013 - lduncan@suse.com + +- Now handles boot-time non-root iSCSI volumes (bnc#630434) + +------------------------------------------------------------------- +Thu May 9 10:32:17 PDT 2013 - lduncan@suse.com + +- Fixed iscsiadm name/value command-line parsing + bug caused by previous update (bnc#818517) + +------------------------------------------------------------------- +Fri Apr 5 11:04:21 PDT 2013 - lduncan@suse.com + +- Added iscsiadm support for user management of target adapter + flash (bnc#810208) + +------------------------------------------------------------------- +Thu Mar 14 13:19:32 PDT 2013 - lduncan@suse.com + +- Add open-iscsi-support-non-root-boot-volume.patch: handle non- + root boot-time iscsi volumes (bnc#630434) +- Add open-iscsi-fix-sysfs-get-value-null.patch: accept "(null)" + password as meaning no password, when using sysfs (bnc#766300) + +------------------------------------------------------------------- +Mon Mar 11 15:20:47 PDT 2013 - lduncan@suse.com + +- Updated iscsiuio to latest (bnc#769125) + +------------------------------------------------------------------- +Fri Sep 7 10:19:41 PDT 2012 - lduncan@suse.com + +- Added iscsiuio patches and other cleanup (bnc#751056) + +------------------------------------------------------------------- +Thu Jun 21 11:12:01 PDT 2012 - lduncan@suse.com + +- Updated open-iscsi to version 2.0.873 (bnc#751056) +- Updated iscsiuio to version 0.7.4.3, to match + +------------------------------------------------------------------- +Mon Feb 6 15:57:43 CET 2012 - hare@suse.de + +- Do not install initiatorname.iscsi (bnc#742430) +- iscsi_offload: Fixup qla4xxx booting (bnc#742570) + +------------------------------------------------------------------- +Fri Feb 3 12:38:57 CET 2012 - hare@suse.de + +- Append '.suse' to version string (bnc#713975) +- iscsiadm dumps core on invalid config file (bnc#742570) +- Load iscsi_tcp kernel modules unconditionally (bnc#738040) + +------------------------------------------------------------------- +Fri Dec 9 15:09:01 CET 2011 - hare@suse.de + +- iscsiadm: Return correct error when login fails (bnc#715071) +- Add bnx2i to list of modules (bnc#718014) +- iscsi_offload: Configure interface from iBFT +- Allow modifications for iface.gateway and iface.subnet_mask +- Remove OFFLOAD_BOOT_SUPPORTED define +- iscsiadm: Allow -d flag for firmware mode +- iscsid prints invalid log message +- Start iscsiuio early in boot.open-iscsi (bnc#731216) + +------------------------------------------------------------------- +Mon Nov 28 16:20:20 CET 2011 - hare@suse.de + +- Enable offload interfaces from iscsi_offload script (bnc#730157) + +------------------------------------------------------------------- +Fri Nov 25 15:18:49 CET 2011 - hare@suse.de + +- Start iscsiuio manually again (bnc#732798) +- Remove compat code from iscsiuio +- Fixup build warnings +- Add uip_broadcast() header declaration +- Handle error when starting iscsiuio from iscsid +- Fixup definition for krecv_conn_state() +- Include iscsi-gen-initiatorname script +- Update mkinitrd scripts for iSCSI offload boot (bnc#732634) +- Added launching of iscsiuio before session sync (bnc#731216) + +------------------------------------------------------------------- +Fri Nov 4 09:15:52 CET 2011 - hare@suse.de + +- Update iscsiuio to 0.7.0.14g (bnc#726708) +- Merge with mainline: + * Update for mixed mode on qla4xxx (bnc#727415) + * Fix printing of unknown host values in iscsiadm + * Fix IPv6 ibft/firmware boot + * Remove iSNS RFC files +- Stop iscsiuio when run inside initrd (bnc#728095) + +------------------------------------------------------------------- +Thu Oct 27 09:25:02 UTC 2011 - aj@suse.de + +- Rename init scripts (bnc#661401). + +------------------------------------------------------------------- +Mon Oct 24 09:13:19 CEST 2011 - hare@suse.de + +- Update iscsiuio to 0.7.0.14f (bnc#687392) +- Default iscsid version to 872 for iscsiuio (bnc#687392) + +------------------------------------------------------------------- +Mon Oct 10 13:46:21 CEST 2011 - hare@suse.de + +- Update iscsi_offload script (bnc#718014) +- Fixup mac address calculation +- Fixup iscsi_offload script to work on qla4xxx (bnc#722268) + +------------------------------------------------------------------- +Fri Oct 7 16:17:58 CEST 2011 - hare@suse.de + +- Fix build error. + +------------------------------------------------------------------- +Thu Oct 6 19:07:04 CEST 2011 - hare@suse.de + +- Merge with mainline: + * Include qla4xxx support (bnc#722268) + * Multiple sessions from single iface (bnc#713975) +- Fix memory leak when parsing config file + +------------------------------------------------------------------- ++++ 624 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.open-iscsi.1840.new/open-iscsi.changes New: ---- open-iscsi-2.0-873.tar.bz2 open-iscsi-openSUSE-12.3-first-merge.diff.bz2 open-iscsi-sles11-sp2-latest.diff.bz2 open-iscsi-sles11-sp2-update.diff.bz2 open-iscsi-sles11-sp3-flash-update.diff.bz2 open-iscsi-sles11-sp3-general-updates-1.diff.bz2 open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 open-iscsi.changes open-iscsi.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ # # spec file for package open-iscsi # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: open-iscsi BuildRequires: bison BuildRequires: db-devel BuildRequires: flex BuildRequires: openssl-devel Url: http://www.open-iscsi.org PreReq: %fillup_prereq %insserv_prereq Version: 2.0.873 Release: 0 Provides: linux-iscsi Obsoletes: linux-iscsi %define iscsi_release 873 Summary: Linux* Open-iSCSI Software Initiator License: GPL-2.0+ Group: Productivity/Networking/Other Source: %{name}-2.0-%{iscsi_release}.tar.bz2 Patch1: %{name}-sles11-sp2-update.diff.bz2 Patch2: %{name}-sles11-sp2-latest.diff.bz2 Patch3: %{name}-sles11-sp3-iscsiuio-update.diff.bz2 Patch4: %{name}-sles11-sp3-flash-update.diff.bz2 Patch5: %{name}-sles11-sp3-general-updates-1.diff.bz2 Patch6: %{name}-openSUSE-12.3-first-merge.diff.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Open-iSCSI is a high-performance, transport independent, multi-platform implementation of RFC3720 iSCSI. Open-iSCSI is partitioned into user and kernel parts. The kernel portion of Open-iSCSI is a from-scratch code licensed under GPL. The kernel part implements iSCSI data path (that is, iSCSI Read and iSCSI Write), and consists of two loadable modules: iscsi_if.ko and iscsi_tcp.ko. User space contains the entire control plane: configuration manager, iSCSI Discovery, Login and Logout processing, connection-level error processing, Nop-In and Nop-Out handling, and (in the future:) Text processing, iSNS, SLP, Radius, etc. The user space Open-iSCSI consists of a daemon process called iscsid, and a management utility iscsiadm. Authors: -------- open-iscsi@googlegroups.com %prep %setup -n %{name}-2.0-%{iscsi_release} %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DLOCK_DIR=\\\"/etc/iscsi\\\"" user %install make DESTDIR=${RPM_BUILD_ROOT} install_user make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse # rename open-iscsi service to iscsid for openSUSE mv ${RPM_BUILD_ROOT}/etc/init.d/boot.open-iscsi \ ${RPM_BUILD_ROOT}/etc/init.d/boot.iscsid-early mv ${RPM_BUILD_ROOT}/etc/init.d/open-iscsi \ ${RPM_BUILD_ROOT}/etc/init.d/iscsid # create rc shortcut [ -d ${RPM_BUILD_ROOT}/usr/sbin ] || mkdir -p ${RPM_BUILD_ROOT}/usr/sbin ln -sf ../../etc/init.d/iscsid ${RPM_BUILD_ROOT}/usr/sbin/rciscsid (cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi %clean [ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %{fillup_and_insserv -y boot.iscsid-early} if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then /sbin/iscsi-gen-initiatorname fi %postun [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %{insserv_cleanup} %preun %{stop_on_removal iscsid} %files %defattr(-,root,root) %dir /etc/iscsi %attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf %ghost /etc/iscsi/initiatorname.iscsi %dir /etc/iscsi/ifaces %config /etc/iscsi/ifaces/iface.example /etc/iscsid.conf %config /etc/init.d/iscsid %config /etc/init.d/boot.iscsid-early /sbin/* /usr/sbin/rciscsid %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-iscsi.sh /lib/mkinitrd/scripts/boot-iscsi.sh /lib/mkinitrd/scripts/boot-killiscsi.sh %doc COPYING README %doc %{_mandir}/man8/* %changelog ++++++ open-iscsi-openSUSE-12.3-first-merge.diff.bz2 ++++++ diff --git a/etc/initd/initd.suse b/etc/initd/initd.suse index 6f4e2c3..9090138 100644 --- a/etc/initd/initd.suse +++ b/etc/initd/initd.suse @@ -5,9 +5,9 @@ ### BEGIN INIT INFO # Provides: iscsi # Required-Start: $network -# Should-Start: iscsitarget multipathd +# Should-Start: iscsitarget # Required-Stop: $network -# Should-Stop: multipathd +# Should-Stop: iscsitarget # Default-Start: 3 5 # Default-Stop: # Short-Description: iSCSI initiator daemon @@ -18,7 +18,6 @@ CONFIG_FILE=/etc/iscsi/iscsid.conf DAEMON=/sbin/iscsid ISCSIADM=/sbin/iscsiadm -ISCSIUIO=/sbin/iscsiuio ARGS="-c $CONFIG_FILE -n" # Source LSB init functions @@ -54,11 +53,12 @@ iscsi_load_transport_modules() for iface in /etc/iscsi/ifaces/*; do [ -f "$iface" ] || continue - [ "$iface" = "iface.example" ] && continue + [ "$iface" = "/etc/iscsi/ifaces/iface.example" ] && continue # Check if the iface has been configured - result=$(sed '/#.*/D;/iface.iscsi_ifacename/D;/iface.hwaddress/D;/iface.transport_name/D' $iface) + result=$(sed '/#.*/D;/^$/D;/iface.iscsi_ifacename/D;/iface.hwaddress/D;/iface.transport_name/D' $iface) if [ "$result" ] ; then - mod=$(sed -n 's/iface.transport_name *= *\(.*\)/\1/p' $iface) + mod=$(sed -n 's/^iface.transport_name *= *\(.*\)/\1/p' $iface) + [ "$mod" = "iscsi_tcp" -o "$mod" = "tcp" ] && continue loaded=$(sed -n "/^$mod/p" /proc/modules) if [ -z "$loaded" ] ; then modprobe $mod @@ -407,9 +407,6 @@ case "$1" in RETVAL=0 else echo -n "Starting iSCSI initiator service: " - if grep -q bnx2i /proc/modules && [ -x $ISCSIUIO ] ; then - startproc $ISCSIUIO - fi startproc $DAEMON $ARGS RETVAL=$? rc_status -v @@ -425,10 +422,6 @@ case "$1" in if [ -z "$m" ] ; then killproc -KILL $DAEMON RETVAL=$? - if grep -q bnx2i /proc/modules && [ -x $ISCSIUIO ]; then - killproc -KILL $ISCSIUIO - fi - RETVAL=$? else RETVAL=1 fi diff --git a/etc/mkinitrd/mkinitrd-setup.sh b/etc/mkinitrd/mkinitrd-setup.sh index a3dc8f1..ae35ca7 100644 --- a/etc/mkinitrd/mkinitrd-setup.sh +++ b/etc/mkinitrd/mkinitrd-setup.sh @@ -23,7 +23,7 @@ function check_iscsi() { local devname="$1" retval=1 local sysfs_path=$(/sbin/udevadm info -q path -n "${devname}" 2>/dev/null) - local ip target startup + local ip # do we have a valid device? [[ -z "${sysfs_path}" ]] && sysfs_path="/block${devname##/dev}" @@ -40,49 +40,60 @@ function check_iscsi() ip="$(echo ${sysfs_path}/connection*)" verify_path "${devname}" "${ip}" || return 1 # no, return false + # check for node startup value of "onboot", else print a warning + check_for_node_onboot $ip + + # attached ot an iSCSI device + return 0 # success +} + + +check_for_node_onboot() +{ + local ip="$1" startup target + + # get persistent address and port, for iscsiadm command ip="${ip}/iscsi_connection/${ip##*/}/persistent_" - [[ ! -r "${ip}address" || ! -r "${ip}port" ]] && - error 2 "iSCSI device ${devname} connected to iSCSI target without any persistent_{address,port}!" - ip="$(cat "${ip}address"):$(cat "${ip}port")" + if [[ ! -r "${ip}address" || ! -r "${ip}port" ]] ; then + echo >&2 "Warning: iSCSI device ${devname} connected to iSCSI target without any persistent_{address,port}!" + return + fi + ip="$(< "${ip}address"):$(< "${ip}port")" + # is there a session directory? target=$(echo ${sysfs_path}/iscsi_session/*) - verify_path "${devname}" "${target}" || return 1 # no, return false + verify_path "${devname}" "${target}" || return # no session: return target="${target}/targetname" - [[ ! -r "${target}" ]] && - error 2 "iSCSI device ${devname} connected to iSCSI target without any targetname!" - target="$(cat ${target})" + if [[ ! -r "${target}" ]] ; then + echo >&2 "Warning: iSCSI device ${devname} connected to iSCSI target without any targetname!" + return + fi + target="$(< ${target})" # figure out whether it has been correctly configured - [[ ! -x "${_iadm_}" ]] && - error 2 "iSCSI device ${devname} connected to iSCSI target, but no ${_iadm_} command available!" + if [[ ! -x "${_iadm_}" ]] ; then + echo >&2 "Warning: iSCSI device ${devname} connected to iSCSI target, but no ${_iadm_} command available!" + return + fi startup="$( ${_iadm_} -m node -p "${ip}" -T "${target}" 2>/dev/null | grep 'node.conn\[0\].startup' )" + startup="${startup##* }" startup="${startup%% *}" if [[ "${startup}" != "onboot" ]] ; then - [[ -z "${startup}" ]] && return 1 # Oops, no parameter - not an iSCSI, return false - - ## Either: - #echo >&2 "WARNING: iSCSI device ${devname} is using 'node.conn[0].startup = ${startup}'," - #echo >&2 "WARNING: setting it to 'onboot' instead." - #${_iadm_} -m node -p "${ip}" -T "${target}" -o update -n 'node.conn[0].startup' -v onboot - - ## or: - echo >&2 "WARNING: iSCSI device ${devname} is using 'node.conn[0].startup = ${startup}'!" - echo >&2 "WARNING: System not bootable with this setting, need to be set to 'onboot' instead, using:" - echo >&2 " - ${_iadm_} -m node -p '${ip}' -T '${target}' -o update -n 'node.conn[0].startup' -v onboot" - fi + [[ -z "${startup}" ]] && return # No parameter - either iBFT or not iSCSI: return - # attached to an iSCSI device - return 0 + ## Note: could set "onboot" ourselves here, but that seems heavy-handed + echo >&2 "Warning: iSCSI device ${devname} is using 'node.conn[0].startup = ${startup}'" + echo >&2 " System may not be bootable with this setting," + echo >&2 " need to be set to 'onboot' instead, using:" + echo >&2 " ${_iadm_} -m node -p '${ip}' -T '${target}' -o update -n 'node.conn[0].startup' -v onboot" + fi } - - _iadm_="/sbin/iscsiadm" # Are system device(s) attached to iSCSI devices? @@ -100,18 +111,20 @@ done # (1) the iSCSI gets included in "initrd", and # (2) the iSCSI sessions have been configured with # "node.conn[0].startup = onboot". -for bd in $(awk '/^[[:space:]]*(\/dev\/|(LABEL|UUID)=)/ { print $1 }' /etc/fstab) -do - bd="${bd/LABEL=//dev/disk/by-label/}" - bd="${bd/UUID=//dev/disk/by-uuid/}" - update_blockdev $bd - check_iscsi $bd && root_iscsi=1 -done +if [[ -z "${root_iscsi}" ]] ; then + for bd in $(awk '/^[[:space:]]*(\/dev\/|(LABEL|UUID)=)/ { print $1 }' /etc/fstab) ; do + bd="${bd/LABEL=//dev/disk/by-label/}" + bd="${bd/UUID=//dev/disk/by-uuid/}" + update_blockdev $bd + check_iscsi $bd && root_iscsi=1 + done +fi + # Include the iSCSI stack, when at least one active iSCSI session has # been configured with "node.conn[0].startup = onboot", even if it was # not used for a system device or mounted partition. -if [[ -x "${_iadm_}" ]] ; then +if [[ -x "${_iadm_}" && -z "${root_iscsi}" ]] ; then for node in $(${_iadm_} -m node 2>/dev/null | sed -e 's/ /,/g') ; do [[ "$( ${_iadm_} -m node -T "${node##*,}" -p "${node%%,*}" 2>/dev/null | @@ -124,13 +137,11 @@ unset _iadm_ save_var root_iscsi -if [ "${root_iscsi}" ]; then +if [[ "${root_iscsi}" ]] ; then # copy the iscsi configuration cp -rp /etc/iscsi etc/ - if [ -z "$interface" ] ; then - interface="default" # needed? - fi + [[ -z "$interface" ]] && interface="default" # In case target port was not defined via command line, assign default port save_var TargetPort 3260 diff --git a/include/iscsi_err.h b/include/iscsi_err.h index aabea4e..de54497 100644 --- a/include/iscsi_err.h +++ b/include/iscsi_err.h @@ -62,6 +62,8 @@ enum { ISCSI_ERR_OP_NOT_SUPP = 27, /* device or resource in use */ ISCSI_ERR_BUSY = 28, + /* unknown discovery type */ + ISCSI_ERR_UNKNOWN_DISCOVERY_TYPE = 29, /* Always last. Indicates end of error code space */ ISCSI_MAX_ERR_VAL, diff --git a/rpm/build_rpm b/rpm/build_rpm index 02d770c..773f00e 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -9,14 +9,15 @@ # RPM="open-iscsi" -BRANCH="sles11-sp3" +BRANCH="openSUSE-12.3" VERSION="2.0-873" BRANCH_TAG="sles11-sp2-update" PATCH2_END_TAG="sles11-sp2-update2" PATCH3_END_TAG="sles11-sp3-update-iscsiuio" PATCH4_END_TAG="sles11-sp3-update-flash" -PATCH5_END_TAG="HEAD" -NUM_PATCHES=5 +PATCH5_END_TAG="openSUSE-12.3-branch" +PATCH6_END_TAG="HEAD" +NUM_PATCHES=6 let NEXT_PATCH=$NUM_PATCHES+1 DESTDIR= uncommitted_changes=0 @@ -144,8 +145,9 @@ git diff $VERSION..$BRANCH_TAG | bzip2 > $DESTDIR/$RPM-sles11-sp2-update.diff.bz git diff $BRANCH_TAG..$PATCH2_END_TAG | \ bzip2 > $DESTDIR/$RPM-sles11-sp2-latest.diff.bz2 -# patch3: some iscsiuio changes for SP3 -git diff $PATCH2_END_TAG..$PATCH3_END_TAG | \ +# patch3: some iscsiuio changes for SP3, but only need the +# non-iscsiuio part (one rev) +git diff $PATCH2_END_TAG..$PATCH3_END_TAG rpm | \ bzip2 > $DESTDIR/$RPM-sles11-sp3-iscsiuio-update.diff.bz2 # patch4: some iscsiuio changes for flash support @@ -156,6 +158,10 @@ git diff $PATCH3_END_TAG..$PATCH4_END_TAG | \ git diff $PATCH4_END_TAG..$PATCH5_END_TAG | \ bzip2 > $DESTDIR/$RPM-sles11-sp3-general-updates-1.diff.bz2 +# patch6: changes since branching SP3 to openSUSE 12.3 +git diff $PATCH5_END_TAG..$PATCH6_END_TAG | \ + bzip2 > $DESTDIR/$RPM-openSUSE-12.3-first-merge.diff.bz2 + # if the user specified this then get all changes not even checked in # and patch them into the spec file as "Patch$NEXT_PATCH" if (( $uncommitted_changes )) ; then diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes index 6450133..35da303 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Jun 5 15:53:34 PDT 2013 - lduncan@suse.com + +- check return from nice() correctly (bnc#807936) + +------------------------------------------------------------------- +Tue Jun 4 11:27:55 PDT 2013 - lduncan@suse.com + +- Branched from SLES 11 SP3 + +- Modified for openSUSE by removing iscsiuio references, and + by changing service name from open-iscsi to iscsid (bnc#821695) + +------------------------------------------------------------------- Thu May 23 19:24:20 PDT 2013 - lduncan@suse.com - Adds support to be able to use isns discovery and diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec index c321684..b08b688 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -15,21 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: open-iscsi -BuildRequires: autoconf bison db-devel flex openssl-devel +BuildRequires: bison +BuildRequires: db-devel +BuildRequires: flex +BuildRequires: openssl-devel Url: http://www.open-iscsi.org -License: GPL v2 or later +License: GPL-2.0+ Group: Productivity/Networking/Other PreReq: %fillup_prereq %insserv_prereq -AutoReqProv: on Version: 2.0.873 -Release: 0.<RELEASE9> +Release: 0 Provides: linux-iscsi Obsoletes: linux-iscsi -Recommends: logrotate %define iscsi_release 873 Summary: Linux* Open-iSCSI Software Initiator Source: %{name}-2.0-%{iscsi_release}.tar.bz2 @@ -38,6 +37,7 @@ Patch2: %{name}-sles11-sp2-latest.diff.bz2 Patch3: %{name}-sles11-sp3-iscsiuio-update.diff.bz2 Patch4: %{name}-sles11-sp3-flash-update.diff.bz2 Patch5: %{name}-sles11-sp3-general-updates-1.diff.bz2 +Patch6: %{name}-openSUSE-12.3-first-merge.diff.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,22 +72,22 @@ Authors: %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build -%{__make} OPTFLAGS="${RPM_OPT_FLAGS} -DLOCK_DIR=\\\"/etc/iscsi\\\" -DOFFLOAD_BOOT_SUPPORTED" user -cd iscsiuio -touch NEWS -touch AUTHORS -autoreconf --install -%configure --sbindir=/sbin -make CFLAGS="${RPM_OPT_FLAGS}" +%{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DLOCK_DIR=\\\"/etc/iscsi\\\"" user %install make DESTDIR=${RPM_BUILD_ROOT} install_user make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse -(cd iscsiuio; make DESTDIR=${RPM_BUILD_ROOT} install) -[ -d $RPM_BUILD_ROOT/usr/sbin ] || mkdir $RPM_BUILD_ROOT/usr/sbin -ln -sf ../../etc/init.d/open-iscsi $RPM_BUILD_ROOT/usr/sbin/rcopen-iscsi +# rename open-iscsi service to iscsid for openSUSE +mv ${RPM_BUILD_ROOT}/etc/init.d/boot.open-iscsi \ + ${RPM_BUILD_ROOT}/etc/init.d/boot.iscsid-early +mv ${RPM_BUILD_ROOT}/etc/init.d/open-iscsi \ + ${RPM_BUILD_ROOT}/etc/init.d/iscsid +# create rc shortcut +[ -d ${RPM_BUILD_ROOT}/usr/sbin ] || mkdir -p ${RPM_BUILD_ROOT}/usr/sbin +ln -sf ../../etc/init.d/iscsid ${RPM_BUILD_ROOT}/usr/sbin/rciscsid (cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi @@ -96,7 +96,7 @@ touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -%{fillup_and_insserv -Y boot.open-iscsi} +%{fillup_and_insserv -Y boot.iscsid-early} if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then /sbin/iscsi-gen-initiatorname fi @@ -106,7 +106,7 @@ fi %{insserv_cleanup} %preun -%{stop_on_removal open-iscsi} +%{stop_on_removal iscsid} %files %defattr(-,root,root) @@ -116,11 +116,10 @@ fi %dir /etc/iscsi/ifaces %config /etc/iscsi/ifaces/iface.example /etc/iscsid.conf -%config /etc/init.d/open-iscsi -%config /etc/init.d/boot.open-iscsi +%config /etc/init.d/iscsid +%config /etc/init.d/boot.iscsid-early /sbin/* -/usr/sbin/rcopen-iscsi -%config /etc/logrotate.d/iscsiuiolog +/usr/sbin/rciscsid %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-iscsi.sh diff --git a/usr/Makefile b/usr/Makefile index 86220f1..8125b55 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -61,7 +61,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o 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/usr/iscsi_util.c b/usr/iscsi_util.c index adc31a4..22491c4 100644 --- a/usr/iscsi_util.c +++ b/usr/iscsi_util.c @@ -31,6 +31,7 @@ #include "log.h" #include "iscsi_settings.h" +#include "transport.h" #include "iface.h" #include "session_info.h" #include "iscsi_util.h" @@ -61,7 +62,7 @@ int oom_adjust(void) struct stat statb; errno = 0; - if (nice(-10) < 0 && errno) + if (nice(-10) == -1 && errno != 0) log_debug(1, "Could not increase process priority: %s", strerror(errno)); diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c index 84d5a27..5030894 100644 --- a/usr/iscsiadm.c +++ b/usr/iscsiadm.c @@ -1235,6 +1235,7 @@ sw_discovery: return do_isns(drec, ifaces, info_level, do_login, op); default: log_debug(1, "Unknown Discovery Type : %d\n", drec->type); + return ISCSI_ERR_UNKNOWN_DISCOVERY_TYPE; } } diff --git a/utils/fwparam_ibft/fw_entry.c b/utils/fwparam_ibft/fw_entry.c index b6f05c1..1256227 100644 --- a/utils/fwparam_ibft/fw_entry.c +++ b/utils/fwparam_ibft/fw_entry.c @@ -36,6 +36,7 @@ #include "iscsi_net_util.h" #include "iscsi_err.h" #include "config.h" +#include "transport.h" #include "iface.h" /** ++++++ open-iscsi-sles11-sp2-latest.diff.bz2 ++++++ diff --git a/Makefile b/Makefile index ba588e5..c0fe0da 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ install: install_programs install_doc install_etc \ install_initd install_iname install_iface install_user: install_programs install_doc install_etc \ - install_initd install_iname install_iface + install_initd install_iface install_programs: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d $(DESTDIR)$(sbindir) diff --git a/etc/iscsid.conf b/etc/iscsid.conf index fcb4696..1ae9091 100644 --- a/etc/iscsid.conf +++ b/etc/iscsid.conf @@ -20,7 +20,7 @@ # iscsid.startup = /etc/rc.d/init.d/iscsid force-start # # Default for upstream open-iscsi scripts (uncomment to activate). -iscsid.startup = /sbin/iscsid +iscsid.startup = /usr/sbin/rcopen-iscsi start ############################# # NIC/HBA and driver settings @@ -29,7 +29,7 @@ iscsid.startup = /sbin/iscsid # to handle normal (ie non-iSCSI) traffic. # If you want iscsid start up the daemon automatically # set this value to the daemon executable. -iscsiuio.startup = /sbin/iscsiuio +iscsiuio.startup = /usr/sbin/rcopen-iscsi start # open-iscsi can create a session and bind it to a NIC/HBA. # To set this up see the example iface config file. diff --git a/rpm/build_rpm b/rpm/build_rpm index 744cae8..f749471 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -4,15 +4,18 @@ # RPM="open-iscsi" -#BRANCH="sles11-sp2" BRANCH="sles11-sp2" VERSION="2.0-873" +BRANCH_TAG="sles11-sp2-update" DESTDIR= -TMPDIR= +uncommitted_changes=0 + +# if using osc ... OBS_BRANCH=home:hreinecke:branches OBS_PRJ=SUSE:SLE-11-SP2:GA OSC="osc -A https://api.suse.de" -uncommitted_changes=0 +TMPDIR= + while [ $# -gt 0 ] ; do case "$1" in @@ -103,22 +106,31 @@ if [ -n "$use_osc" ] ; then popd fi -git archive --format=tar --prefix=$RPM-$VERSION/ "$VERSION" \ - | bzip2 > $DESTDIR/$RPM-$VERSION.tar.bz2 - -## # Changes from upstream -## git diff $VERSION..sles11-sp2-base | bzip2 > $DESTDIR/$RPM-git-update.diff.bz2 -## # Merge in SUSE specifi changes -## git diff sles11-sp2-base..sles11-sp2-merge | bzip2 > $DESTDIR/$RPM-git-merge.diff.bz2 -## # Maintenance patches -## git diff sles11-sp2-merge..$BRANCH | bzip2 > $DESTDIR/$RPM-$BRANCH.diff.bz2 +# +# to be able to convert this git archive into the proper format +# for package building, we want a spec file, a changes file, +# a base tar file, and zero or more patch files +# +# create the spec and changes files -- Note that this +# gets the HEAD of these files from the specified branch, +# not from the current workspace git show $BRANCH:rpm/$RPM.spec > $DESTDIR/$RPM.spec git show $BRANCH:rpm/$RPM.changes > $DESTDIR/$RPM.changes +# create the base tar file containing the open-iscsi base code +git archive --format=tar --prefix=$RPM-$VERSION/ "$VERSION" \ + | bzip2 > $DESTDIR/$RPM-$VERSION.tar.bz2 + +# patch1: create a diff file for changes between the base version +# and the update tag +git diff $VERSION..$BRANCH_TAG | bzip2 > $DESTDIR/$RPM-sles11-sp2-update.diff.bz2 -# -# if the user specified +# patch2: lastly, create a diff for everything since the update tag +git diff $BRANCH_TAG..HEAD | bzip2 > $DESTDIR/$RPM-sles11-sp2-latest.diff.bz2 + +# if the user specified this then get all changes not even checked in +# and patch them into the spec file as "Patch3" (fragile) if (( $uncommitted_changes )) ; then echo "WARNING: Including uncommitted changes for testing." >&2 echo " Don't submit the package to Autobuild!" >&2 @@ -126,10 +138,9 @@ if (( $uncommitted_changes )) ; then patchname=$RPM-$(date -u +%Y-%M-%d_%T_%Z).diff git diff $BRANCH > $DESTDIR/$patchname - sed -i "/Patch0:.*$/a\ -Patch1:\t\t$patchname" $DESTDIR/rpm/$RPM.spec - sed -i "/%patch0 -p1/a\ -%patch1 -p1" $DESTDIR/rpm/$RPM.spec + # XXX this assumes the highest existing patch is 2 -- should be cleaned up + sed -i "/Patch2:.*$/aPatch3: $patchname" $DESTDIR/$RPM.spec + sed -i "/%patch2 -p1/a%patch3 -p1" $DESTDIR/$RPM.spec fi echo "$RPM src rpm copied to $DESTDIR" diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes index 5f26692..9efeb58 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue Sep 18 18:31:50 PDT 2012 + +- Fixed bug where initiatorname.iscsi was same on all systems +- Fixed startup values in iscsid.conf to use rcopen-iscsi start + +------------------------------------------------------------------- +Fri Sep 7 10:19:41 PDT 2012 - lduncan@suse.com + +- Added iscsiuio patches and other cleanup (bnc#751056) + +------------------------------------------------------------------- Thu Jun 21 11:12:01 PDT 2012 - lduncan@suse.com - Updated open-iscsi to version 2.0.873 (bnc#751056) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec index 0ca0e39..2e103f5 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -26,13 +26,15 @@ Group: Productivity/Networking/Other PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 2.0.873 -Release: 0.<RELEASE26> +Release: 0.<RELEASE30> Provides: linux-iscsi Obsoletes: linux-iscsi Recommends: logrotate %define iscsi_release 873 Summary: Linux* Open-iSCSI Software Initiator Source: %{name}-2.0-%{iscsi_release}.tar.bz2 +Patch1: %{name}-sles11-sp2-update.diff.bz2 +Patch2: %{name}-sles11-sp2-latest.diff.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,6 +64,8 @@ Authors: %prep %setup -n %{name}-2.0-%{iscsi_release} +%patch1 -p1 +%patch2 -p1 %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -DLOCK_DIR=\\\"/etc/iscsi\\\" -DOFFLOAD_BOOT_SUPPORTED" user @@ -101,7 +105,6 @@ fi %defattr(-,root,root) %dir /etc/iscsi %attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf -%attr(0600,root,root) %config(noreplace) /etc/iscsi/initiatorname.iscsi %dir /etc/iscsi/ifaces %config /etc/iscsi/ifaces/iface.example /etc/iscsid.conf ++++++ open-iscsi-sles11-sp2-update.diff.bz2 ++++++ ++++ 6130 lines (skipped) ++++++ open-iscsi-sles11-sp3-flash-update.diff.bz2 ++++++ ++++ 2724 lines (skipped) ++++++ open-iscsi-sles11-sp3-general-updates-1.diff.bz2 ++++++ ++++ 664 lines (skipped) ++++++ open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 ++++++ diff --git a/rpm/build_rpm b/rpm/build_rpm index f749471..8409da0 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm @@ -4,9 +4,11 @@ # RPM="open-iscsi" -BRANCH="sles11-sp2" +BRANCH="sles11-sp3" VERSION="2.0-873" BRANCH_TAG="sles11-sp2-update" +PATCH2_END_TAG="sles11-sp2-update2" +PATCH3_END_TAG="HEAD" # fix when more changes added DESTDIR= uncommitted_changes=0 @@ -126,8 +128,13 @@ git archive --format=tar --prefix=$RPM-$VERSION/ "$VERSION" \ # and the update tag git diff $VERSION..$BRANCH_TAG | bzip2 > $DESTDIR/$RPM-sles11-sp2-update.diff.bz2 -# patch2: lastly, create a diff for everything since the update tag -git diff $BRANCH_TAG..HEAD | bzip2 > $DESTDIR/$RPM-sles11-sp2-latest.diff.bz2 +# patch2: create a diff for everything since the update tag +git diff $BRANCH_TAG..$PATCH2_END_TAG | \ + bzip2 > $DESTDIR/$RPM-sles11-sp2-latest.diff.bz2 + +# patch3: some iscsiuio changes for SP3 +git diff $PATCH2_END_TAG..$PATCH3_END_TAG | \ + bzip2 > $DESTDIR/$RPM-sles11-sp3-iscsiuio-update.diff.bz2 # if the user specified this then get all changes not even checked in # and patch them into the spec file as "Patch3" (fragile) @@ -138,9 +145,9 @@ if (( $uncommitted_changes )) ; then patchname=$RPM-$(date -u +%Y-%M-%d_%T_%Z).diff git diff $BRANCH > $DESTDIR/$patchname - # XXX this assumes the highest existing patch is 2 -- should be cleaned up - sed -i "/Patch2:.*$/aPatch3: $patchname" $DESTDIR/$RPM.spec - sed -i "/%patch2 -p1/a%patch3 -p1" $DESTDIR/$RPM.spec + # XXX this assumes the highest existing patch is 3 -- should be cleaned up + sed -i "/Patch3:.*$/aPatch4: $patchname" $DESTDIR/$RPM.spec + sed -i "/%patch3 -p1/a%patch4 -p1" $DESTDIR/$RPM.spec fi echo "$RPM src rpm copied to $DESTDIR" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org