Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2014-11-05 16:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2014-10-01 11:21:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2014-11-05 16:26:32.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 28 09:56:55 PDT 2014 - [email protected] + +- Added fix from Hannes to properly boot all iBFT cards, + fixing previous update (bnc#902183) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi-Factory-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.3LGsUD/_old 2014-11-05 16:26:33.000000000 +0100 +++ /var/tmp/diff_new_pack.3LGsUD/_new 2014-11-05 16:26:33.000000000 +0100 @@ -18575,10 +18575,10 @@ /** diff --git a/rpm/build_rpm b/rpm/build_rpm -index cbfd1003897a..3210d4ab2a55 100755 +index cbfd1003897a..f4858a97a2e2 100755 --- a/rpm/build_rpm +++ b/rpm/build_rpm -@@ -1,67 +1,76 @@ +@@ -1,73 +1,80 @@ #!/bin/bash # -# Build an open-iscsi source rpm @@ -18593,7 +18593,7 @@ RPM="open-iscsi" -BRANCH="sles11-sp2" -VERSION="2.0-872" -+BRANCH="openSUSE-Factory" ++BRANCH=$(git rev-parse --abbrev-ref HEAD) +VERSION="2.0-873" +PATCH1_END_TAG="HEAD" DESTDIR= @@ -18682,7 +18682,13 @@ ;; esac done -@@ -82,7 +91,10 @@ if [ -d "$DESTDIR" ] ; then + +-RELEASE=$(sed -n 's/.* iscsi_release *\(.*\)/\1/p' rpm/$RPM.spec) +- + if ! which git > /dev/null ; then + echo "git not found, cannot continue" + exit 1 +@@ -82,7 +89,10 @@ if [ -d "$DESTDIR" ] ; then echo "Cannot remove directory $DESTDIR" exit 1 fi @@ -18693,7 +18699,7 @@ else DESTDIR=$(mktemp -d --tmpdir $RPM-XXXXXXXX) if [ ! -d "$DESTDIR" ] ; then -@@ -102,21 +114,32 @@ if [ -n "$use_osc" ] ; then +@@ -102,21 +112,32 @@ if [ -n "$use_osc" ] ; then popd fi @@ -18736,7 +18742,7 @@ if (( $uncommitted_changes )) ; then echo "WARNING: Including uncommitted changes for testing." >&2 echo " Don't submit the package to Autobuild!" >&2 -@@ -124,10 +147,12 @@ if (( $uncommitted_changes )) ; then +@@ -124,10 +145,12 @@ if (( $uncommitted_changes )) ; then patchname=$RPM-$(date -u +%Y-%M-%d_%T_%Z).diff git diff $BRANCH > $DESTDIR/$patchname @@ -18777,11 +18783,17 @@ +# space separated list of allowed UDP broadcast ports +BROADCAST="isns" diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 2e21afc6bc7b..84c81f2b5b1e 100644 +index 2e21afc6bc7b..6296fee051cd 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes -@@ -1,4 +1,328 @@ +@@ -1,4 +1,334 @@ ------------------------------------------------------------------- ++Tue Oct 28 09:56:55 PDT 2014 - [email protected] ++ ++- Added fix from Hannes to properly boot all iBFT cards, ++ fixing previous update (bnc#902183) ++ ++------------------------------------------------------------------- +Tue Sep 23 14:09:33 PDT 2014 - [email protected] + +- Added fix from hannes to fixup IPv6 iBFT interface @@ -19109,7 +19121,7 @@ Fri Dec 9 15:09:01 CET 2011 - [email protected] - iscsiadm: Return correct error when login fails (bnc#715071) -@@ -40,6 +364,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] +@@ -40,6 +370,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] - Stop iscsiuio when run inside initrd (bnc#728095) ------------------------------------------------------------------- @@ -19121,7 +19133,7 @@ Mon Oct 24 09:13:19 CEST 2011 - [email protected] - Update iscsiuio to 0.7.0.14f (bnc#687392) -@@ -101,6 +430,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] +@@ -101,6 +436,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] - Include scripts for automated build ------------------------------------------------------------------- @@ -19133,7 +19145,7 @@ Wed Feb 2 11:32:12 CET 2011 - [email protected] - Fix the following issues: -@@ -224,6 +558,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] +@@ -224,6 +564,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] - Read initiatorname correctly from sysfs (bnc#541882) ------------------------------------------------------------------- @@ -19145,7 +19157,7 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Synchronize startup settings (bnc#514273) -@@ -231,11 +570,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] +@@ -231,11 +576,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Do not use temp file in iscsi_discovery (bnc#528711) ------------------------------------------------------------------- @@ -27031,16 +27043,21 @@ } diff --git a/utils/fwparam_ibft/fwparam_sysfs.c b/utils/fwparam_ibft/fwparam_sysfs.c -index 3997363eb044..5868eaed5add 100644 +index 3997363eb044..4b01742c3eaf 100644 --- a/utils/fwparam_ibft/fwparam_sysfs.c +++ b/utils/fwparam_ibft/fwparam_sysfs.c -@@ -170,6 +170,13 @@ static int fill_nic_context(char *subsys, char *id, +@@ -170,6 +170,18 @@ static int fill_nic_context(char *subsys, char *id, { int rc; + rc = sysfs_get_int(id, subsys, "flags", &context->nic_flags); -+ /* Bit 1 is 'target block valid' */ -+ if (!rc && !(context->nic_flags & 1)) ++ /* ++ * Per spec we would need to check against Bit 0 ++ * (Block Valid Flag), but some firmware only ++ * sets Bit 1 (Firmware Booting Selected). ++ * So any setting is deemed okay. ++ */ ++ if (!rc && (context->nic_flags == 0)) + rc = ENODEV; + if (rc) + return rc; @@ -27048,7 +27065,7 @@ rc = sysfs_get_str(id, subsys, "mac", context->mac, sizeof(context->mac)); if (rc) -@@ -200,12 +207,16 @@ static int fill_nic_context(char *subsys, char *id, +@@ -200,12 +212,16 @@ static int fill_nic_context(char *subsys, char *id, strlcpy(context->scsi_host_name, subsys, sizeof(context->scsi_host_name)); @@ -27065,7 +27082,7 @@ sysfs_get_str(id, subsys, "gateway", context->gateway, sizeof(context->gateway)); sysfs_get_str(id, subsys, "primary-dns", context->primary_dns, -@@ -214,6 +225,7 @@ static int fill_nic_context(char *subsys, char *id, +@@ -214,6 +230,7 @@ static int fill_nic_context(char *subsys, char *id, sizeof(context->secondary_dns)); sysfs_get_str(id, subsys, "dhcp", context->dhcp, sizeof(context->dhcp)); @@ -27073,7 +27090,7 @@ return 0; } -@@ -224,12 +236,22 @@ static void fill_initiator_context(char *subsys, struct boot_context *context) +@@ -224,12 +241,22 @@ static void fill_initiator_context(char *subsys, struct boot_context *context) sizeof(context->initiatorname)); sysfs_get_str("initiator", subsys, "isid", context->isid, sizeof(context->isid)); @@ -27096,7 +27113,7 @@ rc = sysfs_get_str(id, subsys, "target-name", context->targetname, sizeof(context->targetname)); if (rc) -@@ -240,6 +262,9 @@ static int fill_tgt_context(char *subsys, char *id, +@@ -240,6 +267,9 @@ static int fill_tgt_context(char *subsys, char *id, if (rc) return rc; @@ -27106,7 +27123,7 @@ /* * We can live without the rest of they do not exist. If we * failed to get them we will figure it out when we login. -@@ -391,7 +416,7 @@ static int get_targets(struct list_head *list, char *rootdir, char *subsys) +@@ -391,7 +421,7 @@ static int get_targets(struct list_head *list, char *rootdir, char *subsys) nic_cnt = 0; tgt_cnt = 0; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
