From 128244096aba1dcd9c7ef41f64fb6beda4ab6af5 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 16 Sep 2015 13:49:25 -0700 Subject: [PATCH 1/8] bump(sys-block/open-iscsi): sync with upstream --- .../sys-block/open-iscsi/ChangeLog | 333 ++++++++++++++++++ .../sys-block/open-iscsi/Manifest | 21 ++ .../sys-block/open-iscsi/files/99-iscsi.rules | 1 + .../open-iscsi/files/initiatorname.iscsi | 31 ++ .../sys-block/open-iscsi/files/iscsid-conf.d | 18 + .../sys-block/open-iscsi/files/iscsid-init.d | 107 ++++++ .../sys-block/open-iscsi/files/iscsidev.sh | 78 ++++ .../files/open-iscsi-2.0.872-conf.d | 18 + ...en-iscsi-2.0.872-dont-call-configure.patch | 11 + .../files/open-iscsi-2.0.872-glibc212.patch | 10 + .../files/open-iscsi-2.0.872-init.d-r1 | 131 +++++++ .../files/open-iscsi-2.0.872-isns-slp.patch | 16 + .../files/open-iscsi-2.0.872-ldflags.patch | 11 + ...iscsi-2.0.872-makefile-cleanup-pass2.patch | 55 +++ .../open-iscsi-2.0.872-makefile-cleanup.patch | 20 ++ .../files/open-iscsi-2.0.873-Makefiles.patch | 161 +++++++++ .../sys-block/open-iscsi/metadata.xml | 5 + .../open-iscsi/open-iscsi-2.0.872-r2.ebuild | 105 ++++++ .../open-iscsi/open-iscsi-2.0.872-r3.ebuild | 113 ++++++ .../open-iscsi/open-iscsi-2.0.873.ebuild | 96 +++++ 20 files changed, 1341 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/ChangeLog create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/99-iscsi.rules create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/initiatorname.iscsi create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-conf.d create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-init.d create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsidev.sh create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/metadata.xml create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/ChangeLog new file mode 100644 index 0000000000..df860f6b5c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/ChangeLog @@ -0,0 +1,333 @@ +# ChangeLog for sys-block/open-iscsi +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.64 2015/08/08 05:42:15 prometheanfire Exp $ + + 08 Aug 2015; Matthew Thode files/iscsid-init.d, + open-iscsi-2.0.873.ebuild: + fixing bug 511064 and bug 501996 + + 06 Aug 2015; Matthew Thode files/iscsidev.sh, + open-iscsi-2.0.872-r3.ebuild: + fix the glaring bug + +*open-iscsi-2.0.872-r3 (05 Aug 2015) + + 05 Aug 2015; Matthew Thode +files/99-iscsi.rules, + +files/iscsidev.sh, +open-iscsi-2.0.872-r3.ebuild: + adding udev scripts to generate symlinks for bug 556632 + + 02 Feb 2014; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: + Stable for alpha, wrt bug #498446 + + 02 Feb 2014; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: + Stable for arm, wrt bug #498446 + + 26 Jan 2014; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: + Stable for sparc, wrt bug #498446 + + 19 Jan 2014; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: + Stable for ppc64, wrt bug #498446 + + 18 Jan 2014; Pacho Ramos open-iscsi-2.0.872-r2.ebuild: + ia64 stable, bug #498446 (thanks to Emeric Maschino for testing) + + 20 Oct 2013; Christian Ruppert files/iscsid-init.d: + Make sure iscsid starts after multipath + +*open-iscsi-2.0.873 (11 Oct 2013) + + 11 Oct 2013; Christian Ruppert +open-iscsi-2.0.873.ebuild, + +files/open-iscsi-2.0.873-Makefiles.patch, +files/iscsid-conf.d, + +files/iscsid-init.d: + Version bump, fixes bug 449830, bug 480158 and bug 456906 + + 18 Aug 2013; Samuli Suominen + -files/CVE-2009-1297.patch, -files/iscsid-2.0.871-r1.init.d, + -files/iscsid-conf.d, -files/iscsid-init.d, + -files/open-iscsi-2.0.871-makefile-cleanup.patch, + -files/open-iscsi-2.0.871.3-glibc212.patch, -files/open-iscsi-2.0.872-init.d, + -open-iscsi-2.0.870.3-r1.ebuild, -open-iscsi-2.0.871-r1.ebuild, + -open-iscsi-2.0.871.3.ebuild, -open-iscsi-2.0.871.ebuild, + -open-iscsi-2.0.872-r1.ebuild, -open-iscsi-2.0.872.ebuild, metadata.xml: + old + + 18 Aug 2013; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: + Stable for x86, wrt bug #479786 + + 10 Aug 2013; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: + Stable for ppc, wrt bug #479786 + + 07 Aug 2013; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: + Stable for amd64, wrt bug #479786 + +*open-iscsi-2.0.872-r2 (07 Mar 2013) + + 07 Mar 2013; Samuli Suominen + +open-iscsi-2.0.872-r2.ebuild, +files/open-iscsi-2.0.872-init.d-r1: + Stop using "modprobe -l" which went away with sys-apps/kmod wrt #409931 + + 06 Jan 2013; Agostino Sarubbo open-iscsi-2.0.872-r1.ebuild: + Add ~sparc, wrt bug #449220 + + 01 Jan 2013; Agostino Sarubbo open-iscsi-2.0.872-r1.ebuild: + Add ~alpha, wrt bug #449220 + + 01 Jan 2013; Agostino Sarubbo open-iscsi-2.0.872-r1.ebuild: + Add ~ia64, wrt bug #449220 + + 31 Dec 2012; Agostino Sarubbo open-iscsi-2.0.872-r1.ebuild: + Add ~ppc64, wrt bug #449220 + + 18 Sep 2012; Tim Harder metadata.xml: + Remove redundant maintainer from metadata. + + 03 Apr 2012; Sebastian Pipping open-iscsi-2.0.872.ebuild, + open-iscsi-2.0.872-r1.ebuild: + Fix broken SRC_URI x2, reported by David Goulet + + 25 Feb 2012; Robin H. Johnson + open-iscsi-2.0.870.3-r1.ebuild, open-iscsi-2.0.871-r1.ebuild, + open-iscsi-2.0.871.3.ebuild, open-iscsi-2.0.871.ebuild, + open-iscsi-2.0.872-r1.ebuild, open-iscsi-2.0.872.ebuild: + Bug #405687: Depend on virtual/modutils instead of sys-apps/module-init-tools. + +*open-iscsi-2.0.872-r1 (09 Feb 2012) + + 09 Feb 2012; Robin H. Johnson + +open-iscsi-2.0.872-r1.ebuild: + Revbump so that all users get new init scripts per bug #307619. + + 09 Feb 2012; Robin H. Johnson + +files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch, + open-iscsi-2.0.872.ebuild: + Bug #400619: respect user CC/AR values during build. + + 09 Feb 2012; Robin H. Johnson + files/iscsid-2.0.871-r1.init.d, files/iscsid-conf.d: + Bug #307619: improve init script for BL2. + + 09 Feb 2012; Robin H. Johnson open-iscsi-2.0.872.ebuild, + +files/open-iscsi-2.0.872-isns-slp.patch: + Bug #383437: Fix iSNS SLP linking in the main binaries. + + 01 Feb 2012; Brent Baude open-iscsi-2.0.871.3.ebuild: + Marking open-iscsi-2.0.871.3 ppc for bug 370679 + + 05 Nov 2011; Robin H. Johnson open-iscsi-2.0.871.ebuild, + open-iscsi-2.0.871-r1.ebuild, open-iscsi-2.0.871.3.ebuild, + open-iscsi-2.0.872.ebuild: + Fix linux_chkconfig_module usage to be non-fatal, this package does not build + kernel modules. Verified good build with no kernel sources or kernel config + available. + + 02 Nov 2011; Mike Doty metadata.xml: + Setting maintainer to base-system + + 19 Jun 2011; Markus Meier open-iscsi-2.0.871.3.ebuild: + x86 stable, bug #370679 + + 18 Jun 2011; Markos Chandras + open-iscsi-2.0.871.3.ebuild: + Stable on amd64 wrt bug #370679 + + 13 Jun 2011; Sebastian Pipping + open-iscsi-2.0.870.3-r1.ebuild, open-iscsi-2.0.871.ebuild, + open-iscsi-2.0.871-r1.ebuild, open-iscsi-2.0.871.3.ebuild, + open-iscsi-2.0.872.ebuild: + Fix version check for Linux 3 + +*open-iscsi-2.0.872 (07 Jun 2011) + + 07 Jun 2011; Sebastian Pipping +open-iscsi-2.0.872.ebuild, + +files/open-iscsi-2.0.872-conf.d, + +files/open-iscsi-2.0.872-dont-call-configure.patch, + +files/open-iscsi-2.0.872-glibc212.patch, +files/open-iscsi-2.0.872-init.d, + +files/open-iscsi-2.0.872-ldflags.patch, + +files/open-iscsi-2.0.872-makefile-cleanup.patch: + Bump to 2.0.872 (bug #340425) + + 24 Apr 2011; Ulrich Mueller open-iscsi-2.0.870.3-r1.ebuild: + Replace dependency on virtual/modutils, bug 358891. + + 24 Aug 2010; Samuli Suominen + open-iscsi-2.0.871.3.ebuild, +files/open-iscsi-2.0.871.3-glibc212.patch: + Fix building with recent glibc wrt #334077 by "fkhp". + + 31 Mar 2010; Robin H. Johnson + open-iscsi-2.0.871-r1.ebuild, open-iscsi-2.0.871.3.ebuild: + CONFIG_CHECK_MODULES should continue to exist for the as-module sanity + check. + +*open-iscsi-2.0.871.3 (07 Mar 2010) + + 07 Mar 2010; Tobias Scherbaum + +open-iscsi-2.0.871.3.ebuild: + Version bump, proxy committing for Craig #301602 + + 08 Dec 2009; nixnut open-iscsi-2.0.871-r1.ebuild: + ppc stable #293712 + + 23 Nov 2009; Markus Meier + open-iscsi-2.0.871-r1.ebuild: + amd64/x86 stable, bug #293712 + + 19 Nov 2009; Robin H. Johnson + open-iscsi-2.0.871-r1.ebuild: + Works on ~arm (mv78100). + +*open-iscsi-2.0.871-r1 (12 Nov 2009) + + 12 Nov 2009; Robin H. Johnson + +open-iscsi-2.0.871-r1.ebuild, + +files/open-iscsi-2.0.871-makefile-cleanup.patch, + +files/iscsid-2.0.871-r1.init.d: + Cleanup remaining modules code so that kernel sources are no longer + required. Do not decide what to include in the binpkg based on $ROOT, as + it may be for use on a different machine. Always install the utils. Bug + #273321: Do not build iscsistart statically. Bug #284871: Fix init.d + return codes. Bug #291584: install initiatorname.iscsi in the correct + place. + +*open-iscsi-2.0.871 (28 Oct 2009) + + 28 Oct 2009; Tobias Scherbaum + +open-iscsi-2.0.871.ebuild: + Bump, proxy-committing for Craig (#278589) + +*open-iscsi-2.0.870.3-r1 (27 Oct 2009) + + 27 Oct 2009; Tobias Scherbaum + -open-iscsi-2.0.870.3.ebuild, +open-iscsi-2.0.870.3-r1.ebuild, + +files/CVE-2009-1297.patch: + Revbump, proxy-committing for Craig (security bug #290631) + + 23 Sep 2009; Patrick Lauer + open-iscsi-2.0.870.3.ebuild: + Remove virtual/libc + +*open-iscsi-2.0.870.3 (20 Mar 2009) + + 20 Mar 2009; Tobias Scherbaum + -files/iscsid-2.0.868_rc1.conf.d, -files/iscsid-2.0.868_rc1.init.d, + -files/iscsid-2.0.870.init.d, -files/iscsid-2.0.870.init.d-r1, + +files/iscsid-conf.d, files/iscsid-init.d, -open-iscsi-2.0.865.12.ebuild, + -open-iscsi-2.0.868_rc1.ebuild, -open-iscsi-2.0.870.ebuild, + -open-iscsi-2.0.870-r1.ebuild, +open-iscsi-2.0.870.3.ebuild: + Version bump (#196096), Cleanup + +*open-iscsi-2.0.870-r1 (06 Dec 2008) + + 06 Dec 2008; Tobias Scherbaum + +files/iscsid-2.0.870.init.d-r1, +open-iscsi-2.0.870-r1.ebuild: + Check if /etc/conf.d/iscsid exists and INITIATOR_FILENAME isn't empty. + Thanks to Marcel Pennewiß and Craig (#196096) + +*open-iscsi-2.0.870 (17 Nov 2008) + + 17 Nov 2008; Tobias Scherbaum + +files/iscsid-2.0.870.conf.d, +files/iscsid-2.0.870.init.d, + +open-iscsi-2.0.870.ebuild: + Version bump, thanks to Marcel Pennewiß, Craig and others involved in bug + #196096 + + 08 Aug 2008; Ulrich Mueller metadata.xml: + Add USE flag description to metadata wrt GLEP 56. + +*open-iscsi-2.0.868_rc1 (25 Mar 2008) + + 25 Mar 2008; Mike Doty + +files/iscsid-2.0.868_rc1.conf.d, +files/iscsid-2.0.868_rc1.init.d, + +open-iscsi-2.0.868_rc1.ebuild: + adding open-iscsi-2.0.868_rc1.ebuild and related files thanks to Craig + Bug 196096 + + 14 Jan 2008; Robin H. Johnson metadata.xml: + Add herd per email. + + 14 Jan 2008; Robin H. Johnson + -files/r438-idbm-file-locking.diff, -files/backward-compile-2.6.13.patch, + -files/open-iscsi-485-out.state.patch, metadata.xml, + -open-iscsi-0.4.413.ebuild, -open-iscsi-0.4.413-r1.ebuild, + -open-iscsi-0.4.434.ebuild, -open-iscsi-0.4.438.ebuild, + -open-iscsi-0.5.485.ebuild, -open-iscsi-1.0.490.ebuild, + -open-iscsi-1.0.490-r1.ebuild, -open-iscsi-1.0.514.ebuild, + open-iscsi-2.0.865.12.ebuild: + Remove old ebuilds (they were for really old kernels), clean up remaining + ebuild, then remove myself from the metadata. + +*open-iscsi-2.0.865.12 (28 Aug 2007) + + 28 Aug 2007; Mike Doty metadata.xml, + +open-iscsi-2.0.865.12.ebuild: + version bump + + 22 Feb 2007; Markus Ullmann ChangeLog: + Redigest for Manifest2 + + 23 May 2006; Robin H. Johnson + open-iscsi-1.0.514.ebuild: + Add ~ppc. + + 08 Mar 2006; Robin H. Johnson + files/initiatorname.iscsi: + Include instructions for initiatorname.iscsi. + +*open-iscsi-1.0.514 (07 Mar 2006) +*open-iscsi-1.0.490-r1 (07 Mar 2006) +*open-iscsi-1.0.490 (07 Mar 2006) + + 07 Mar 2006; Robin H. Johnson + +files/open-iscsi-485-out.state.patch, files/iscsid-init.d, + +open-iscsi-1.0.490.ebuild, +open-iscsi-1.0.490-r1.ebuild, + +open-iscsi-1.0.514.ebuild: + New upstream snapshots. Not for production use at all!. + + 02 Feb 2006; Robin H. Johnson + open-iscsi-0.5.485.ebuild: + Add missing dep on berkdb. + +*open-iscsi-0.5.485 (02 Feb 2006) + + 02 Feb 2006; Robin H. Johnson + +open-iscsi-0.5.485.ebuild: + New version. + +*open-iscsi-0.4.438 (06 Nov 2005) + + 06 Nov 2005; Robin H. Johnson + +files/r438-idbm-file-locking.diff, +files/backward-compile-2.6.13.patch, + +open-iscsi-0.4.438.ebuild: + Version bump. Custom patches for compile agasinst 2.6.13 or newer, and + possible IDBM corruption fix. + +*open-iscsi-0.4.434 (03 Nov 2005) + + 03 Nov 2005; Robin H. Johnson + +open-iscsi-0.4.434.ebuild: + Version bump. + +*open-iscsi-0.4.413-r1 (23 Sep 2005) + + 23 Sep 2005; Robin H. Johnson files/iscsid-init.d, + +open-iscsi-0.4.413-r1.ebuild: + Add debug support, and improve init script to properly stop iscsid. + + 21 Sep 2005; Robin H. Johnson + files/digest-open-iscsi-0.4.413, Manifest: + Incorrect digest from duplicate tarball. + + 20 Sep 2005; Robin H. Johnson files/iscsid-init.d, + open-iscsi-0.4.413.ebuild: + Change SRC_URI to mirror://gentoo/ now that the source has spread, also + clean up install location for modules, security of config file and + databases, and clean up the init script to be gentoo-like instead of + debian-like. + +*open-iscsi-0.4.413 (20 Sep 2005) + + 20 Sep 2005; Robin H. Johnson + +files/initiatorname.iscsi, +files/iscsid-init.d, +metadata.xml, + +open-iscsi-0.4.413.ebuild: + Initial commit. Ebuild by Robin H. Johnson . A special + thanks to The Gallery Group (www.thegallerygroup.com) for helping to support + iSCSI on Gentoo. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest new file mode 100644 index 0000000000..0cf84cac67 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest @@ -0,0 +1,21 @@ +AUX 99-iscsi.rules 81 SHA256 35f1475f02f9447c6d1d9e5249eef2f3e34206356f7f675ebab5f1dc1bf14988 SHA512 ee4cf1776493c27f2222d118606a04021117b6176c6879c0e98626e1edea3b0731bff95ca8fee0f6bc6fe91d0ab0e7648e8014acc84831af2ab932c2a0a00692 WHIRLPOOL 852e2c0dfdcdd593eda9d571a645efd323d0671641279eecfdebd9a6d9715266cd888e8fedca1bb214ab06cd3becba51dd9efdebd18e992c14cb4111714521a7 +AUX initiatorname.iscsi 1167 SHA256 c509a0233d8348f01566b7a461c3e927d779716ac1e67ff917ecbb370e08ba62 SHA512 4a2cc669ee56592eb574bd13f40b664f2a63f82062477b30d673babd70d85e335162a8c2f0e21117c7504cc78e3e7860a0525bd4323485813fb4ddd51e6a5ffb WHIRLPOOL 314809004fe7e0b4639eca70110b7adf3c15519344d75e3113f09382fa2e117798189547d538e5f031d93bf3ad55ca80cdaea38421ab6a9e8aa09df864661e77 +AUX iscsid-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a WHIRLPOOL 19e7dc2d647a271dd67bf2f92e3c866719b1a7c978ecc86395d3586ab0c897e93ab4dce740497a6139f4fae1c5a34c455b806c627c9a9f876133d808890a85bf +AUX iscsid-init.d 2100 SHA256 f59ba37c7f00b5d65d99e4cacf329b4da85b0b0f0af6ba113c26edd23a6b0dda SHA512 107b9166828203a3a9695e08a6a5de461f5ca388459f6bbae6f061a24b8468f8af674c131d5f91626b2df92f292e59e912563de757ab54d4b797aba294f36327 WHIRLPOOL 0cca21dcb10b7fb116398a69d21e88133bfe9abfb2b4d9831a0b83998c6355ea2cb70fcf610ca5d8ab02da9627241a993ef1ca9023f95862ca930953f1f470ed +AUX iscsidev.sh 2119 SHA256 1189dc43936fa5e428ad05fe0299d2ffdffe28ccd193396213ac9d59a5c25aaf SHA512 b4ed7fad25e3f000134a77f3aea2702f03ff75e99ecf49e580085127ab58de5a64bea9c4fc2ae5b324deafd0a860494d1a8dc1223db7d3679b960552f0c00813 WHIRLPOOL 28f57226d487fc0843e571c8ceeecf3e2b0eec506efef0b7a54636b1479dfc964d405f2be7f134c0858a24d1d24c67adb6ca9153ed9aaf4955ae403b4500d845 +AUX open-iscsi-2.0.872-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a WHIRLPOOL 19e7dc2d647a271dd67bf2f92e3c866719b1a7c978ecc86395d3586ab0c897e93ab4dce740497a6139f4fae1c5a34c455b806c627c9a9f876133d808890a85bf +AUX open-iscsi-2.0.872-dont-call-configure.patch 296 SHA256 92ab247afde924a6d07643abc2cb34598a2fb13f62718684803ab44b9bce7241 SHA512 513e775695288b747b40cfb9815c9083b61637f0e3ba241f5d5f3363730059ac4a01e55c23ab3ff983da7d3a5b40448447740ac35e0748c4d5e8942946146522 WHIRLPOOL af5c1cae289cf669dcd9cc6ce02e6a7e6603dceb8f3827d79f4d7adeb35aa9c9c6e588e1e915c078c31532a9985f4fb2a74fe7270269c686be4d7f6c2083ae06 +AUX open-iscsi-2.0.872-glibc212.patch 266 SHA256 e7b299da12daed432f18a115b7a14eadb61a3db13df89af21a9078357ebf63ca SHA512 8d869642b27dc7d243cf5697858a19127e5e627dd62fd2a8879e4baf84f87aa07e7682faa5f7153ef75e8f9a78ae9b1a84e3260f449fbbb26d848064ec736630 WHIRLPOOL c501c6d8ae334974635f25060b29e326da7a6ef33062c518cd115fa7cae6a63ef3901dc7e1c421a70557b114cead6cc951a09712cf19c83c7f79ec96635fe7e4 +AUX open-iscsi-2.0.872-init.d-r1 2847 SHA256 e9669386a355a3fc96b7cf0bd95ef1249dfffc214266943cf6205dfadb4000bd SHA512 79009ffdf4fcb30737cbc92eb13e7c64b8277935621280f2e10d8c104d711242b591f31238befbdf34cd08496f0be251017c9c2b415f96202acf1b950a7ff1f5 WHIRLPOOL a0d335c736ac2c0adadee1c47278d7cc1207e5b5b2f51c7681cea68e4718619ba7964a274e55c4090aaf565e2d1948a2039e1de37595fc97d850c316650a9f9d +AUX open-iscsi-2.0.872-isns-slp.patch 871 SHA256 d83640c9a7f9d7fed2b502d0164f6f8a91adb87f45e79a793954eae536a22138 SHA512 8aa4e6897c3284b7d914b7805d37a5d21014d66514675a4878c05535c460fc5ffafb43628f4112226f116fb8d941f14fc66246f0d395f0e44c90610494546f73 WHIRLPOOL f98cb605e1311792c6c9e5e03d2508cc05a10a94fc36feeb70c0b558f65861f743bdb1896da971dc93bac67638f69b8ac4a27ff7bfc9ef3c9c735c1f4ded81af +AUX open-iscsi-2.0.872-ldflags.patch 309 SHA256 b8544087dfbc579209d326f825a251f6fc10898ca29ce46264d4a86ceac95941 SHA512 4204a615e10d52130a2fb39b81d99df45350b7f7431fa4e110e535ece2c1aab2cda0b8e787561a051c232a80f2cd99af007e94c1ca122727aac7854eee478219 WHIRLPOOL c8a6a6fad91680df09227a5ae29b2a9f7c172c0a9326e3d53ec5c16ae63fe733ab392949e777c5ca3a3c01d6a07d925f22a2dc82bbb53c3b76a7ed7b7e5010fd +AUX open-iscsi-2.0.872-makefile-cleanup-pass2.patch 2134 SHA256 8725f8aba89f86c275f9a53bfb066d392b43e6ba5496c09bc2d9543453f45122 SHA512 ee1700c010578160f2fe3bb2f5a7eca4bde900faa138445eaf6b1875a7ad89d5c13b530d25a0ac5844213fa118b4e5253180414956d4e514dae0ede936dee2c8 WHIRLPOOL ef5377ca5d95e7ce12727dca3a3547e59b37c21772799e24be0cf6725e432502bcfd7156990be98405f0382793247d3edc3cba6e85fc45261ddaa2a797180679 +AUX open-iscsi-2.0.872-makefile-cleanup.patch 839 SHA256 c0e92ba2211dd74e89dcc0c5793e02ad8ad06b41a07a0687007bba6415546dfd SHA512 bc4cae49f435a4396a88b5d238c1f72a808c5d272042ee1acfe6c27d96613b9fc03ba2ce7e40d0a0f4aef2a924a66b45fb8a1e6db131415668c5336c5a4cf720 WHIRLPOOL 4045bf2826a33460f00218a65dc1e1614aac1bf16a07f4752546df4066c9e4c0420d5fa5b235b634a4bfd1c5626ab1813b6f595ab2b71743755ac378b41e8138 +AUX open-iscsi-2.0.873-Makefiles.patch 5441 SHA256 8b12789550bef694d49a4bf89752c5bd3e60ca9c7ce63d6268f49bf672af317f SHA512 8dd3433db748f2fd0da0ab6a1059d7058eb09c527e9d039e768bc359a6b665da3e5c13463c32f35d7c630a3b901a689315ece3adb88cccabe452352658705f33 WHIRLPOOL 2115505cc80080454f810f973dd2b80ee6dd6567e2e3a9e2d1d3b4457e2bd3254958d6cdeae7bbce3e3f38c86a577d2900f11e5321b21b264658f38b171ebb8e +DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935 +DIST open-iscsi-2.0-873.tar.gz 667069 SHA256 7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b WHIRLPOOL 05af106f11da9f9f02c10edd5412d0f99816349e06e192059700eb1ae24a36027c3f0d7ed423aa7bb1c0b9d8b3aa1b6aa72a2aadb00f27762edf16b7f7d08c09 +EBUILD open-iscsi-2.0.872-r2.ebuild 3014 SHA256 daf083a8158b6018fb786447e25a9ebdfc14b9ad2186837fd3fc77ffc0183c9f SHA512 0731fc9f813986c44874c672f67e654559461a57204b95817c2cc67dba1ed17531d56482ba2658f2fc660dc0be696a132ebaec2da00db69ac2d3b6cd9008e0f3 WHIRLPOOL 430be248ccb1797f764030521c2e449d86dbb3b9dd35de940989f55f2113ca9e88302aa7cbbc93618b86015a770667cfce5624b8ae675e335e73f8a65020468e +EBUILD open-iscsi-2.0.872-r3.ebuild 3190 SHA256 59fa39903f4595da38c00e8a20d3b09be5a8ac68978de7d1483b4e0fa3519f67 SHA512 86a69ad169efda6debf2715c2c5a80656bd8c966da36c53f0b5a66d25700698904c8cd590e860fc17e4660388dc4d56092254965ed63288762bd62073c39c2ae WHIRLPOOL 6899720caee31a93fa0dc7f30da1e2cce17940258949a260cc3235993dc7207792bb9335ba9150f8d947f6efd2e5842cc0d4a009d95ff6287697e5c2eb2e68f6 +EBUILD open-iscsi-2.0.873.ebuild 2435 SHA256 551779dc8f87da2b682b2c2f87fc1ca387552a983e20155ec12a89c584fdff7f SHA512 b3fabd513dc933f88a5feb3fa14aeb75c08494b157f60db2a63de8019b530d2a6673078de4c22321829c5062f1141c568a0a16965560b4a980f5dedb3e9522ca WHIRLPOOL af396a9993739be054df6bb42713e5a9f4ae2295dbdaca77ef63b2f9a24cf15ddec29a5871462f1775136041260bae9988173a7243435707428b51ea306cae4f +MISC ChangeLog 12774 SHA256 9b9181930bb9ff4372f3be4dba556ea5bd21a5ac8b0c7477f04bc487013005a2 SHA512 68fe6c69d7a6bb1ae5f130ce454428d9eef12985e9a9a92bb8231eb667dbf2b0da9dd32aa949cdaeaa1aa5c8f8eea498c47f101206b383e141f97dc7d14fd6f6 WHIRLPOOL 74d28df5ad38713c3f3b1e2dd50d95175d5580a4c95703bc4c904069a895c1c3d62f7045b4c6e3e73fea08549bc0be1b54a34a9e412705e4c0dace8bce2f31e6 +MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/99-iscsi.rules b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/99-iscsi.rules new file mode 100644 index 0000000000..74c8e14bc5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/99-iscsi.rules @@ -0,0 +1 @@ +KERNEL=="sd*", SUBSYSTEMS=="block", RUN{program}="/etc/udev/scripts/iscsidev.sh" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/initiatorname.iscsi b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/initiatorname.iscsi new file mode 100644 index 0000000000..9a80438ee9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/initiatorname.iscsi @@ -0,0 +1,31 @@ +# Copyright 1999-2005 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Id$ +# +# This file must contain a InitiatorName entry! +# white space is significent here! +#InitiatorName=iqn.2005-09.tld.domain.hostname:openiscsi-initiator +#InitiatorAlias=foobar + +# Sample documentation follows: + +# The InitiatorName should take the following format +# iqn.${YEAR}-${MONTH}-${DOMAIN_REVERSED}.${HOSTNAME}:${UNIQUE_STRING} +# Where YEAR and MONTH are the dates that your domain was registered. +# You can use WHOIS to find when your domain was registered. +# If you don't have a real domain in the outside world, invent one, but use +# .local for your top-level. + +# Example case #1: +# This assumes you own foobar.co.uk. +# Domain name: foobar.co.uk. +# Registration date: March 2001 +# Hostname: linux +# InitiatorName=iqn.2001-03.uk.co.foobar.linux:openiscsi-29b48ad602d5f83dd9cd9aa3ef741216 + +# Example case #2: +# This assumes you don't have a domain of your own. +# Domain name: foobar.local +# Registration date: March 2001 +# Hostname: linux +# InitiatorName=iqn.2001-03.local.foobar.linux:openiscsi-29b48ad602d5f83dd9cd9aa3ef741216 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-conf.d b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-conf.d new file mode 100644 index 0000000000..02e584fbce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-conf.d @@ -0,0 +1,18 @@ +# /etc/conf.d/iscsid + +# config file to use +CONFIG_FILE=/etc/iscsi/iscsid.conf + +# you need to specify an initiatorname in the file +INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi + +# options to pass to iscsid +OPTS="-i ${INITIATORNAME_FILE}" + +# Start automatic targets when iscsid is started +AUTOSTARTTARGETS="yes" + +# if set to "strict", iscsid will stop, if connecting the +# autostart targets failed +# AUTOSTART="strict" + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-init.d b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-init.d new file mode 100644 index 0000000000..6bd49ab09a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-init.d @@ -0,0 +1,107 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Id$ + +command="/usr/sbin/iscsid" +command_args="${OPTS}" +start_stop_daemon_args="-w 100" # iscsid might fail e.g. when the iSCSI kernel modules aren't available +pidfile=${PIDFILE:-/var/run/${SVCNAME}.pid} + +extra_started_commands="starttargets stoptargets" +extra_commands="restarttargets" + +ISCSIADM=/usr/sbin/iscsiadm + +depend() { + after modules multipath + use net +} + +checkconfig() { + if [ ! -e /etc/conf.d/${SVCNAME} ]; then + eerror "Config file /etc/conf.d/${SVCNAME} does not exist!" + return 1 + fi + if [ ! -e "${CONFIG_FILE}" ]; then + eerror "Config file ${CONFIG_FILE} does not exist!" + return 1 + fi + + if [ -e ${INITIATORNAME_FILE} ]; then + . ${INITIATORNAME_FILE} + fi + if [ ! -e ${INITIATORNAME_FILE} -o -z "${InitiatorName}" ]; then + ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name." + local IQN=$(/usr/sbin/iscsi-iname) + ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}" + echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}" + eend $? + fi +} + +starttargets() { + ebegin "Setting up iSCSI targets" + $ISCSIADM -m node --loginall=automatic + local ret=$? + eend $ret + return $ret +} + +stoptargets() { + ebegin "Disconnecting iSCSI targets" + sync + $ISCSIADM -m node --logoutall=all + local ret=$? + + if [ $ret -eq 21 ]; then + # See man iscsiadm(8) + einfo "No active sessions to disconnect" + eend 0 + return 0 + fi + + eend $ret + return $ret +} + +restarttargets() { + stoptargets + starttargets +} + +status() { + ebegin "Showing current active iSCSI sessions" + $ISCSIADM -m session +} + + +start_pre() { + local ret=1 + + ebegin "Checking Open-iSCSI configuration" + checkconfig + ret=$? + if [ $ret -ne 0 ]; then + eend 1 + return 1 + fi + eend 0 +} + +start_post() { + # Start automatic targets when iscsid is started + if [ "${AUTOSTARTTARGETS}" = "yes" ]; then + starttargets + local ret=$? + if [ "${AUTOSTART}" = "strict" -a $ret -ne 0 ]; then + stop + return $ret + fi + fi + return 0 +} + +stop_pre() { + stoptargets +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsidev.sh b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsidev.sh new file mode 100644 index 0000000000..d045fae570 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsidev.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env bash + +# KERNEL=="sd*", SUBSYSTEMS=="block", RUN{program}="/etc/udev/scripts/iscsidev.sh" + +# we only care about iscsi devices +[[ $ID_VENDOR = "IET" ]] || exit 1 + +# don't care about partitions either +echo $DEVNAME | egrep -q "[0-9]$" +status=$? +[[ $status != 0 ]] || exit 1 + +#ID_MODEL=VIRTUAL-DISK +#ID_MODEL_ENC=VIRTUAL-DISK +#ID_REVISION=0001 +#DEVTYPE=disk +#ID_BUS=scsi +#SUBSYSTEM=block +#ID_SERIAL=1IET_00010001 +#DEVPATH=/devices/platform/host74/session68/target74:0:0/74:0:0:1/block/sde +#ID_VENDOR_ENC=IET\x20\x20\x20\x20\x20 +#MINOR=64 +#ID_SCSI=1 +#ACTION=add +#PWD=/ +#ID_PART_TABLE_UUID=54f71c65-a5d5-45cd-8915-5ffd5ff4fea6 +#ID_FS_TYPE= +#USEC_INITIALIZED=999037905 +#MAJOR=8 +#ID_SCSI_SERIAL=beaf11 +#DEVLINKS=/dev/disk/by-id/scsi-1IET_00010001 +#DEVNAME=/dev/sde +#SHLVL=1 +#ID_TYPE=disk +#ID_PART_TABLE_TYPE=gpt +#ID_VENDOR=IET +#ID_SERIAL_SHORT=IET_00010001 +#SEQNUM=25775 + +# do the removal +if [[ $ACTION = 'remove' ]]; then + # nohup needed so this isn't constantly run... + nohup find -L /dev/disk/by-path/ -type l -lname ${DEVNAME} -exec rm "{}" + 2>/dev/null & + exit 0 +fi + +TARGET_NAME=$(lsscsi -t | grep "${DEVNAME}" | awk '{print $3}' | awk -F, '{print $1}') +[[ $TARGET_NAME = '' ]] && exit 1 + +# we don't know which host is correct +declare -a POSSIBLE_HOSTS +declare -a POSSIBLE_PORTS +for item in $(cat /sys/class/iscsi_connection/connection*/address); do + POSSIBLE_HOSTS+=("${item}") +done +for item in $(cat /sys/class/iscsi_connection/connection*/port); do + POSSIBLE_PORTS+=("${item}") +done + +#get correct ip and port +for ((i=0;i<${#POSSIBLE_HOSTS[@]};++i)); do + printf "%s is in %s\n" "$POSSIBLE_HOSTS[i]}" "${POSSIBLE_PORTS[i]}" + iscsiadm --mode node --targetname "${TARGET_NAME}" -p "${POSSIBLE_HOSTS[i]}":"${POSSIBLE_PORTS[i]}" + status=$? + if [[ $status = 0 ]]; then + TARGET_IP="${POSSIBLE_HOSTS[i]}" + TARGET_PORT="${POSSIBLE_PORTS[i]}" + break + fi +done + +# exit if not found +[[ -z $TARGET_IP ]] && exit 1 +[[ -z $TARGET_PORT ]] && exit 1 + +# actually create the link +mkdir -p /dev/disk/by-path/ +ln -s "${DEVNAME}" "/dev/disk/by-path/ip-${TARGET_IP}:${TARGET_PORT}-iscsi-${TARGET_NAME}-lun-1" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d new file mode 100644 index 0000000000..02e584fbce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d @@ -0,0 +1,18 @@ +# /etc/conf.d/iscsid + +# config file to use +CONFIG_FILE=/etc/iscsi/iscsid.conf + +# you need to specify an initiatorname in the file +INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi + +# options to pass to iscsid +OPTS="-i ${INITIATORNAME_FILE}" + +# Start automatic targets when iscsid is started +AUTOSTARTTARGETS="yes" + +# if set to "strict", iscsid will stop, if connecting the +# autostart targets failed +# AUTOSTART="strict" + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch new file mode 100644 index 0000000000..185f1acd83 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch @@ -0,0 +1,11 @@ +--- open-iscsi-2.0-872.orig/Makefile ++++ open-iscsi-2.0-872/Makefile +@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example + all: user kernel + + user: ; +- cd utils/open-isns; ./configure; $(MAKE) ++ cd utils/open-isns; $(MAKE) + $(MAKE) -C utils/sysdeps + $(MAKE) -C utils/fwparam_ibft + $(MAKE) -C usr diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch new file mode 100644 index 0000000000..6171703294 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch @@ -0,0 +1,10 @@ +--- usr/iscsid.c 2010-10-10 23:06:37.000000000 +0200 ++++ usr/iscsid.c 2010-10-10 23:07:55.000000000 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include "iscsid.h" + #include "mgmt_ipc.h" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 new file mode 100644 index 0000000000..aa6cebf690 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 @@ -0,0 +1,131 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Id$ + +opts="${opts} starttargets stoptargets restarttargets" + +depend() { + after modules + use net +} + +PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid} +BINARY="/usr/sbin/iscsid" + +checkconfig() { + if [ ! -e /etc/conf.d/${SVCNAME} ]; then + eerror "Config file /etc/conf.d/${SVCNAME} does not exist!" + return 1 + fi + if [ ! -e "${CONFIG_FILE}" ]; then + eerror "Config file ${CONFIG_FILE} does not exist!" + return 1 + fi + if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then + ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name." + IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi + IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g') + ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}" + echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}" + eend $? + fi +} + +do_modules() { + msg="$1" + shift + modules="${1}" + shift + modopts="$@" + for m in ${modules} + do + if modprobe --show --quiet "${m}" + then + ebegin "${msg} ${m}" + modprobe ${modopts} ${m} + ret=$? + eend ${ret} + if [ ${ret} -ne 0 ]; then + return ${ret} + fi + else + ebegin "${msg} ${m}: not found" + return 1 + fi + done + return 0 +} + +start() { + ebegin "Checking open-iSCSI configuration" + checkconfig + ret=$? + if [ $ret -ne 0 ]; then + eend 1 + return 1 + fi + ebegin "Loading iSCSI modules" + do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp' + ret=$? + if [ $ret -ne 0 ]; then + eend 1 + return 1 + fi + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS} + ret=$? + if [ $ret -ne 0 ]; then + eend $? + return $? + fi + + # Start automatic targets when iscsid is started + if [ "${AUTOSTARTTARGETS}" = "yes" ]; then + starttargets + ret=$? + if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then + stop + return $ret + fi + fi + return 0 +} + +stop() { + stoptargets + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE} + eend $? + + do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r' + eend $? +} + +starttargets() { + ebegin "Setting up iSCSI targets" + /usr/sbin/iscsiadm -m node --loginall=automatic + ret=$? + eend $ret + return $ret +} + +stoptargets() { + ebegin "Disconnecting iSCSI targets" + sync + /usr/sbin/iscsiadm -m node --logoutall=all + ret=$? + eend $ret + return $ret +} + +restarttargets() { + stoptargets + starttargets +} + +status() { + ebegin "Showing current active iSCSI sessions" + /usr/sbin/iscsiadm -m session +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch new file mode 100644 index 0000000000..db280a3dd8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch @@ -0,0 +1,16 @@ +diff -Nuar open-iscsi-2.0-872.orig/usr/Makefile open-iscsi-2.0-872/usr/Makefile +--- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:25:13.656604152 +0000 ++++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:26:28.960171260 +0000 +@@ -53,10 +53,10 @@ + + iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto + + iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch new file mode 100644 index 0000000000..fc02cbcc1e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch @@ -0,0 +1,11 @@ +--- utils/Makefile 2011-05-31 01:30:27.302609540 +0200 ++++ utils/Makefile 2011-05-31 01:32:50.229602790 +0200 +@@ -6,7 +6,7 @@ + all: $(PROGRAMS) + + iscsi-iname: md5.o iscsi-iname.o +- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ + + clean: + rm -f *.o $(PROGRAMS) .depend diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch new file mode 100644 index 0000000000..fb563d10e1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch @@ -0,0 +1,55 @@ +diff -NuarwbB open-iscsi-2.0-872/usr/Makefile open-iscsi-2.0-872.orig/usr/Makefile +--- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:58:04.402623915 +0000 ++++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:56:51.159070006 +0000 +@@ -65,6 +65,6 @@ + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) + + depend: ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend +- gcc $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +diff -NuarwbB open-iscsi-2.0-872/utils/fwparam_ibft/Makefile open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile +--- open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile 2012-02-09 08:57:58.579273051 +0000 ++++ open-iscsi-2.0-872/utils/fwparam_ibft/Makefile 2010-08-11 15:27:07.000000000 +0000 +@@ -38,6 +38,6 @@ + $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h + + depend: ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend +- gcc $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +diff -NuarwbB open-iscsi-2.0-872/utils/Makefile open-iscsi-2.0-872.orig/utils/Makefile +--- open-iscsi-2.0-872.orig/utils/Makefile 2012-02-09 08:57:37.825877235 +0000 ++++ open-iscsi-2.0-872/utils/Makefile 2012-02-09 08:56:51.145736633 +0000 +@@ -12,6 +12,6 @@ + rm -f *.o $(PROGRAMS) .depend + + depend: ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend +- gcc $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +diff -NuarwbB open-iscsi-2.0-872/utils/open-isns/Makefile.in open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in +--- open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in 2012-02-09 08:57:47.812573971 +0000 ++++ open-iscsi-2.0-872/utils/open-isns/Makefile.in 2010-08-11 15:27:07.000000000 +0000 +@@ -77,6 +77,6 @@ + ar cr $@ $(LIBOBJS) + + depend: ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend +- gcc $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +diff -NuarwbB open-iscsi-2.0-872/utils/sysdeps/Makefile open-iscsi-2.0-872.orig/utils/sysdeps/Makefile +--- open-iscsi-2.0-872.orig/utils/sysdeps/Makefile 2012-02-09 08:57:43.459227530 +0000 ++++ open-iscsi-2.0-872/utils/sysdeps/Makefile 2010-08-11 15:27:07.000000000 +0000 +@@ -10,6 +10,6 @@ + rm -f *.o .depend + + depend: ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend +- gcc $(CFLAGS) -M `ls *.c` > .depend + + -include .depend diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch new file mode 100644 index 0000000000..b3e93f459f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch @@ -0,0 +1,20 @@ +--- usr/Makefile 2010-10-10 22:48:04.000000000 +0200 ++++ usr/Makefile.ori 2010-10-10 22:48:34.000000000 +0200 +@@ -53,14 +53,14 @@ + + iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o +- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o +- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto + + iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) -static $^ -o $@ ++ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@ + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch new file mode 100644 index 0000000000..db5d6d14ec --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch @@ -0,0 +1,161 @@ +diff --git a/Makefile b/Makefile +index c5d9700..4dbff18 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,8 +14,8 @@ mandir = $(prefix)/share/man + etcdir = /etc + initddir = $(etcdir)/init.d + +-MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 +-PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname ++MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 doc/iscsistart.8 doc/iscsi-iname.8 ++PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname usr/iscsistart + INSTALL = install + ETCFILES = etc/iscsid.conf + IFACEFILES = etc/iface.example +@@ -84,11 +84,11 @@ install_programs: $(PROGRAMS) + # ugh, auto-detection is evil + # Gentoo maintains their own init.d stuff + install_initd: +- if [ -f /etc/debian_version ]; then \ ++ if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \ + $(MAKE) install_initd_debian ; \ +- elif [ -f /etc/redhat-release ]; then \ ++ elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \ + $(MAKE) install_initd_redhat ; \ +- elif [ -f /etc/SuSE-release ]; then \ ++ elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \ + $(MAKE) install_initd_suse ; \ + fi + +@@ -115,7 +115,7 @@ install_iface: $(IFACEFILES) + $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces + + install_etc: $(ETCFILES) +- if [ ! -f /etc/iscsi/iscsid.conf ]; then \ ++ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \ + $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \ + $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \ + fi +@@ -128,11 +128,11 @@ install_kernel: + $(MAKE) -C kernel install_kernel + + install_iname: +- if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \ +- echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \ ++ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \ ++ echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \ + echo "***************************************************" ; \ +- echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \ +- echo "To override edit /etc/iscsi/initiatorname.iscsi" ; \ ++ echo "Setting InitiatorName to `cat $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi`" ; \ ++ echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \ + echo "***************************************************" ; \ + fi + +diff --git a/usr/Makefile b/usr/Makefile +index 673b7f1..83507f3 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -54,18 +54,18 @@ all: $(PROGRAMS) + + iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o +- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o +- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns + + iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) -static $^ -o $@ ++ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@ + clean: +- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) ++ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +diff --git a/utils/Makefile b/utils/Makefile +index 2c7e891..62c49fa 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -1,17 +1,18 @@ + # This Makefile will work only with GNU make. + +-CFLAGS += $(OPTFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g ++OPTFLAGS ?= -O2 -g ++CFLAGS += $(OPTFLAGS) -fno-inline -Wall -Wstrict-prototypes + PROGRAMS = iscsi-iname + + all: $(PROGRAMS) + + iscsi-iname: md5.o iscsi-iname.o +- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ + + clean: +- rm -f *.o $(PROGRAMS) .depend ++ $(RM) *.o $(PROGRAMS) .depend + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(GCC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +diff --git a/utils/fwparam_ibft/Makefile b/utils/fwparam_ibft/Makefile +index c72bb7f..a36c2d2 100644 +--- a/utils/fwparam_ibft/Makefile ++++ b/utils/fwparam_ibft/Makefile +@@ -26,18 +26,18 @@ OBJS := fw_entry.o fwparam_sysfs.o $(SYSDEPS_OBJS) ../../usr/iscsi_net_util.o + OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o + CLEANFILES = $(OBJS) *.output *~ + +-OPTFLAGS ?= -O2 -g -fPIC ++OPTFLAGS ?= -O2 -g + WARNFLAGS ?= -Wall -Wstrict-prototypes +-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../../include -I../../usr -D_GNU_SOURCE ++CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fPIC -I../../include -I../../usr -D_GNU_SOURCE + + all: $(OBJS) + + clean: +- rm -f *.o $(CLEANFILES) .depend ++ $(RM) *.o $(CLEANFILES) .depend + + $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +diff --git a/utils/sysdeps/Makefile b/utils/sysdeps/Makefile +index 53c10e5..19cfe19 100644 +--- a/utils/sysdeps/Makefile ++++ b/utils/sysdeps/Makefile +@@ -1,15 +1,16 @@ + # This Makefile will work only with GNU make. + +-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g ++OPTFLAGS ?= -O2 -g ++CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-inline -Wall -Wstrict-prototypes + + SYSDEPS_OBJS=sysdeps.o + + all: $(SYSDEPS_OBJS) + + clean: +- rm -f *.o .depend ++ $(RM) *.o .depend + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/metadata.xml new file mode 100644 index 0000000000..96a2d58636 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/metadata.xml @@ -0,0 +1,5 @@ + + + +base-system + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild new file mode 100644 index 0000000000..4c0d778276 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 +inherit versionator linux-info eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720" +HOMEPAGE="http://www.open-iscsi.org/" +MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)" +SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" +IUSE="debug slp" +DEPEND="slp? ( net-libs/openslp )" +RDEPEND="${DEPEND} + sys-apps/util-linux" + +S="${WORKDIR}/${MY_PV}" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is -lt 2 6 16; then + die "Sorry, your kernel must be 2.6.16-rc5 or newer!" + fi + + # Needs to be done, as iscsid currently only starts, when having the iSCSI + # support loaded as module. Kernel builtion options don't work. See this for + # more information: + # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 + # If there's a new release, check whether this is still valid! + CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" + if linux_config_exists; then + for module in ${CONFIG_CHECK_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi +} + +src_prepare() { + export EPATCH_OPTS="-d${S}" + epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch + epatch "${FILESDIR}"/${P}-glibc212.patch + epatch "${FILESDIR}"/${P}-dont-call-configure.patch + epatch "${FILESDIR}"/${P}-ldflags.patch + epatch "${FILESDIR}"/${P}-isns-slp.patch + epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch +} + +src_configure() { + cd utils/open-isns || die + econf $(use_with slp) +} + +src_compile() { + use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI + + einfo "Building userspace" + local SLP_LIBS + use slp && SLP_LIBS="-lslp" + cd "${S}" && \ + KSRC="${KV_DIR}" CFLAGS="" \ + emake \ + OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \ + AR="$(tc-getAR)" CC="$(tc-getCC)" \ + user \ + || die "emake failed" +} + +src_install() { + einfo "Installing userspace" + dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die + + einfo "Installing utilities" + dosbin utils/iscsi-iname utils/iscsi_discovery || die + + einfo "Installing docs" + doman doc/*[1-8] || die + dodoc README THANKS || die + docinto test || die + dodoc test/* || die + + einfo "Installing configuration" + insinto /etc/iscsi + doins etc/iscsid.conf || die + newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die + insinto /etc/iscsi/ifaces + doins etc/iface.example || die + + newconfd "${FILESDIR}"/${P}-conf.d iscsid || die + newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die + + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi || die + fperms 600 /etc/iscsi/iscsid.conf || die +} + +pkg_postinst() { + in='/etc/iscsi/initiatorname.iscsi' + if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then + cp -f "${ROOT}${in}.example" "${ROOT}${in}" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild new file mode 100644 index 0000000000..28ef5a7686 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 +inherit versionator linux-info eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720" +HOMEPAGE="http://www.open-iscsi.org/" +MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)" +SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug slp" +DEPEND="slp? ( net-libs/openslp )" +RDEPEND="${DEPEND} + virtual/udev + sys-fs/lsscsi + sys-apps/util-linux" + +S="${WORKDIR}/${MY_PV}" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is -lt 2 6 16; then + die "Sorry, your kernel must be 2.6.16-rc5 or newer!" + fi + + # Needs to be done, as iscsid currently only starts, when having the iSCSI + # support loaded as module. Kernel builtion options don't work. See this for + # more information: + # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 + # If there's a new release, check whether this is still valid! + CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" + if linux_config_exists; then + for module in ${CONFIG_CHECK_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi +} + +src_prepare() { + export EPATCH_OPTS="-d${S}" + epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch + epatch "${FILESDIR}"/${P}-glibc212.patch + epatch "${FILESDIR}"/${P}-dont-call-configure.patch + epatch "${FILESDIR}"/${P}-ldflags.patch + epatch "${FILESDIR}"/${P}-isns-slp.patch + epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch +} + +src_configure() { + cd utils/open-isns || die + econf $(use_with slp) +} + +src_compile() { + use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI + + einfo "Building userspace" + local SLP_LIBS + use slp && SLP_LIBS="-lslp" + cd "${S}" && \ + KSRC="${KV_DIR}" CFLAGS="" \ + emake \ + OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \ + AR="$(tc-getAR)" CC="$(tc-getCC)" \ + user \ + || die "emake failed" +} + +src_install() { + einfo "Installing userspace" + dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die + + einfo "Installing utilities" + dosbin utils/iscsi-iname utils/iscsi_discovery || die + + einfo "Installing docs" + doman doc/*[1-8] || die + dodoc README THANKS || die + docinto test || die + dodoc test/* || die + + einfo "Installing configuration" + insinto /etc/iscsi + doins etc/iscsid.conf || die + newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die + insinto /etc/iscsi/ifaces + doins etc/iface.example || die + + newconfd "${FILESDIR}"/${P}-conf.d iscsid || die + newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die + + # udev pieces + insinto /etc/udev/scripts + doins "${FILESDIR}"/iscsidev.sh + insinto /lib/udev/rules.d + doins "${FILESDIR}"/99-iscsi.rules + + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi || die + fperms 600 /etc/iscsi/iscsid.conf || die +} + +pkg_postinst() { + in='/etc/iscsi/initiatorname.iscsi' + if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then + cp -f "${ROOT}${in}.example" "${ROOT}${in}" + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild new file mode 100644 index 0000000000..34b33e3ee4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit versionator linux-info eutils flag-o-matic toolchain-funcs + +MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)" + +DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720" +HOMEPAGE="http://www.open-iscsi.org/" +SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" +IUSE="debug slp" + +DEPEND="slp? ( net-libs/openslp )" +RDEPEND="${DEPEND} + virtual/udev + sys-fs/lsscsi + sys-apps/util-linux" + +S="${WORKDIR}/${MY_PV}" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is -lt 2 6 16; then + die "Sorry, your kernel must be 2.6.16-rc5 or newer!" + fi + + # Needs to be done, as iscsid currently only starts, when having the iSCSI + # support loaded as module. Kernel builtion options don't work. See this for + # more information: + # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 + # If there's a new release, check whether this is still valid! + CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" + if linux_config_exists; then + for module in ${CONFIG_CHECK_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-Makefiles.patch + + sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die +} + +src_configure() { + cd utils/open-isns || die + + # SSL (--with-security) is broken + econf $(use_with slp) \ + --without-security +} + +src_compile() { + use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI + + KSRC="${KV_DIR}" CFLAGS="" \ + emake \ + OPTFLAGS="${CFLAGS}" \ + AR="$(tc-getAR)" CC="$(tc-getCC)" \ + user +} + +src_install() { + emake DESTDIR="${D}" sbindir="${ROOT}usr/sbin/" install + + dodoc README THANKS + + docinto test/ + dodoc test/* + + insinto /etc/iscsi + newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example + # udev pieces + insinto /lib/udev/rules.d + doins "${FILESDIR}"/99-iscsi.rules + insopts -m0755 + insinto /etc/udev/scripts + doins "${FILESDIR}"/iscsidev.sh + insopts -m0644 + + newconfd "${FILESDIR}"/iscsid-conf.d iscsid + newinitd "${FILESDIR}"/iscsid-init.d iscsid + + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi + fperms 600 /etc/iscsi/iscsid.conf +} From f8fd7b19f82920f872ce67808a44077a99a39af1 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 17 Sep 2015 11:48:09 -0700 Subject: [PATCH 2/8] sys-block/open-iscsi: coreos-ify ebuild --- .../sys-block/open-iscsi/ChangeLog | 333 ------------------ .../sys-block/open-iscsi/Manifest | 20 -- .../sys-block/open-iscsi/files/99-iscsi.rules | 2 +- .../sys-block/open-iscsi/files/iscsid-conf.d | 18 - .../sys-block/open-iscsi/files/iscsid-init.d | 107 ------ .../files/open-iscsi-2.0.872-conf.d | 18 - ...en-iscsi-2.0.872-dont-call-configure.patch | 11 - .../files/open-iscsi-2.0.872-glibc212.patch | 10 - .../files/open-iscsi-2.0.872-init.d-r1 | 131 ------- .../files/open-iscsi-2.0.872-isns-slp.patch | 16 - .../files/open-iscsi-2.0.872-ldflags.patch | 11 - ...iscsi-2.0.872-makefile-cleanup-pass2.patch | 55 --- .../open-iscsi-2.0.872-makefile-cleanup.patch | 20 -- .../open-iscsi/open-iscsi-2.0.872-r2.ebuild | 105 ------ .../open-iscsi/open-iscsi-2.0.872-r3.ebuild | 113 ------ .../open-iscsi/open-iscsi-2.0.873.ebuild | 9 +- 16 files changed, 3 insertions(+), 976 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/ChangeLog delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-conf.d delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-init.d delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/ChangeLog deleted file mode 100644 index df860f6b5c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/ChangeLog +++ /dev/null @@ -1,333 +0,0 @@ -# ChangeLog for sys-block/open-iscsi -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.64 2015/08/08 05:42:15 prometheanfire Exp $ - - 08 Aug 2015; Matthew Thode files/iscsid-init.d, - open-iscsi-2.0.873.ebuild: - fixing bug 511064 and bug 501996 - - 06 Aug 2015; Matthew Thode files/iscsidev.sh, - open-iscsi-2.0.872-r3.ebuild: - fix the glaring bug - -*open-iscsi-2.0.872-r3 (05 Aug 2015) - - 05 Aug 2015; Matthew Thode +files/99-iscsi.rules, - +files/iscsidev.sh, +open-iscsi-2.0.872-r3.ebuild: - adding udev scripts to generate symlinks for bug 556632 - - 02 Feb 2014; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: - Stable for alpha, wrt bug #498446 - - 02 Feb 2014; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: - Stable for arm, wrt bug #498446 - - 26 Jan 2014; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: - Stable for sparc, wrt bug #498446 - - 19 Jan 2014; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: - Stable for ppc64, wrt bug #498446 - - 18 Jan 2014; Pacho Ramos open-iscsi-2.0.872-r2.ebuild: - ia64 stable, bug #498446 (thanks to Emeric Maschino for testing) - - 20 Oct 2013; Christian Ruppert files/iscsid-init.d: - Make sure iscsid starts after multipath - -*open-iscsi-2.0.873 (11 Oct 2013) - - 11 Oct 2013; Christian Ruppert +open-iscsi-2.0.873.ebuild, - +files/open-iscsi-2.0.873-Makefiles.patch, +files/iscsid-conf.d, - +files/iscsid-init.d: - Version bump, fixes bug 449830, bug 480158 and bug 456906 - - 18 Aug 2013; Samuli Suominen - -files/CVE-2009-1297.patch, -files/iscsid-2.0.871-r1.init.d, - -files/iscsid-conf.d, -files/iscsid-init.d, - -files/open-iscsi-2.0.871-makefile-cleanup.patch, - -files/open-iscsi-2.0.871.3-glibc212.patch, -files/open-iscsi-2.0.872-init.d, - -open-iscsi-2.0.870.3-r1.ebuild, -open-iscsi-2.0.871-r1.ebuild, - -open-iscsi-2.0.871.3.ebuild, -open-iscsi-2.0.871.ebuild, - -open-iscsi-2.0.872-r1.ebuild, -open-iscsi-2.0.872.ebuild, metadata.xml: - old - - 18 Aug 2013; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: - Stable for x86, wrt bug #479786 - - 10 Aug 2013; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: - Stable for ppc, wrt bug #479786 - - 07 Aug 2013; Agostino Sarubbo open-iscsi-2.0.872-r2.ebuild: - Stable for amd64, wrt bug #479786 - -*open-iscsi-2.0.872-r2 (07 Mar 2013) - - 07 Mar 2013; Samuli Suominen - +open-iscsi-2.0.872-r2.ebuild, +files/open-iscsi-2.0.872-init.d-r1: - Stop using "modprobe -l" which went away with sys-apps/kmod wrt #409931 - - 06 Jan 2013; Agostino Sarubbo open-iscsi-2.0.872-r1.ebuild: - Add ~sparc, wrt bug #449220 - - 01 Jan 2013; Agostino Sarubbo open-iscsi-2.0.872-r1.ebuild: - Add ~alpha, wrt bug #449220 - - 01 Jan 2013; Agostino Sarubbo open-iscsi-2.0.872-r1.ebuild: - Add ~ia64, wrt bug #449220 - - 31 Dec 2012; Agostino Sarubbo open-iscsi-2.0.872-r1.ebuild: - Add ~ppc64, wrt bug #449220 - - 18 Sep 2012; Tim Harder metadata.xml: - Remove redundant maintainer from metadata. - - 03 Apr 2012; Sebastian Pipping open-iscsi-2.0.872.ebuild, - open-iscsi-2.0.872-r1.ebuild: - Fix broken SRC_URI x2, reported by David Goulet - - 25 Feb 2012; Robin H. Johnson - open-iscsi-2.0.870.3-r1.ebuild, open-iscsi-2.0.871-r1.ebuild, - open-iscsi-2.0.871.3.ebuild, open-iscsi-2.0.871.ebuild, - open-iscsi-2.0.872-r1.ebuild, open-iscsi-2.0.872.ebuild: - Bug #405687: Depend on virtual/modutils instead of sys-apps/module-init-tools. - -*open-iscsi-2.0.872-r1 (09 Feb 2012) - - 09 Feb 2012; Robin H. Johnson - +open-iscsi-2.0.872-r1.ebuild: - Revbump so that all users get new init scripts per bug #307619. - - 09 Feb 2012; Robin H. Johnson - +files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch, - open-iscsi-2.0.872.ebuild: - Bug #400619: respect user CC/AR values during build. - - 09 Feb 2012; Robin H. Johnson - files/iscsid-2.0.871-r1.init.d, files/iscsid-conf.d: - Bug #307619: improve init script for BL2. - - 09 Feb 2012; Robin H. Johnson open-iscsi-2.0.872.ebuild, - +files/open-iscsi-2.0.872-isns-slp.patch: - Bug #383437: Fix iSNS SLP linking in the main binaries. - - 01 Feb 2012; Brent Baude open-iscsi-2.0.871.3.ebuild: - Marking open-iscsi-2.0.871.3 ppc for bug 370679 - - 05 Nov 2011; Robin H. Johnson open-iscsi-2.0.871.ebuild, - open-iscsi-2.0.871-r1.ebuild, open-iscsi-2.0.871.3.ebuild, - open-iscsi-2.0.872.ebuild: - Fix linux_chkconfig_module usage to be non-fatal, this package does not build - kernel modules. Verified good build with no kernel sources or kernel config - available. - - 02 Nov 2011; Mike Doty metadata.xml: - Setting maintainer to base-system - - 19 Jun 2011; Markus Meier open-iscsi-2.0.871.3.ebuild: - x86 stable, bug #370679 - - 18 Jun 2011; Markos Chandras - open-iscsi-2.0.871.3.ebuild: - Stable on amd64 wrt bug #370679 - - 13 Jun 2011; Sebastian Pipping - open-iscsi-2.0.870.3-r1.ebuild, open-iscsi-2.0.871.ebuild, - open-iscsi-2.0.871-r1.ebuild, open-iscsi-2.0.871.3.ebuild, - open-iscsi-2.0.872.ebuild: - Fix version check for Linux 3 - -*open-iscsi-2.0.872 (07 Jun 2011) - - 07 Jun 2011; Sebastian Pipping +open-iscsi-2.0.872.ebuild, - +files/open-iscsi-2.0.872-conf.d, - +files/open-iscsi-2.0.872-dont-call-configure.patch, - +files/open-iscsi-2.0.872-glibc212.patch, +files/open-iscsi-2.0.872-init.d, - +files/open-iscsi-2.0.872-ldflags.patch, - +files/open-iscsi-2.0.872-makefile-cleanup.patch: - Bump to 2.0.872 (bug #340425) - - 24 Apr 2011; Ulrich Mueller open-iscsi-2.0.870.3-r1.ebuild: - Replace dependency on virtual/modutils, bug 358891. - - 24 Aug 2010; Samuli Suominen - open-iscsi-2.0.871.3.ebuild, +files/open-iscsi-2.0.871.3-glibc212.patch: - Fix building with recent glibc wrt #334077 by "fkhp". - - 31 Mar 2010; Robin H. Johnson - open-iscsi-2.0.871-r1.ebuild, open-iscsi-2.0.871.3.ebuild: - CONFIG_CHECK_MODULES should continue to exist for the as-module sanity - check. - -*open-iscsi-2.0.871.3 (07 Mar 2010) - - 07 Mar 2010; Tobias Scherbaum - +open-iscsi-2.0.871.3.ebuild: - Version bump, proxy committing for Craig #301602 - - 08 Dec 2009; nixnut open-iscsi-2.0.871-r1.ebuild: - ppc stable #293712 - - 23 Nov 2009; Markus Meier - open-iscsi-2.0.871-r1.ebuild: - amd64/x86 stable, bug #293712 - - 19 Nov 2009; Robin H. Johnson - open-iscsi-2.0.871-r1.ebuild: - Works on ~arm (mv78100). - -*open-iscsi-2.0.871-r1 (12 Nov 2009) - - 12 Nov 2009; Robin H. Johnson - +open-iscsi-2.0.871-r1.ebuild, - +files/open-iscsi-2.0.871-makefile-cleanup.patch, - +files/iscsid-2.0.871-r1.init.d: - Cleanup remaining modules code so that kernel sources are no longer - required. Do not decide what to include in the binpkg based on $ROOT, as - it may be for use on a different machine. Always install the utils. Bug - #273321: Do not build iscsistart statically. Bug #284871: Fix init.d - return codes. Bug #291584: install initiatorname.iscsi in the correct - place. - -*open-iscsi-2.0.871 (28 Oct 2009) - - 28 Oct 2009; Tobias Scherbaum - +open-iscsi-2.0.871.ebuild: - Bump, proxy-committing for Craig (#278589) - -*open-iscsi-2.0.870.3-r1 (27 Oct 2009) - - 27 Oct 2009; Tobias Scherbaum - -open-iscsi-2.0.870.3.ebuild, +open-iscsi-2.0.870.3-r1.ebuild, - +files/CVE-2009-1297.patch: - Revbump, proxy-committing for Craig (security bug #290631) - - 23 Sep 2009; Patrick Lauer - open-iscsi-2.0.870.3.ebuild: - Remove virtual/libc - -*open-iscsi-2.0.870.3 (20 Mar 2009) - - 20 Mar 2009; Tobias Scherbaum - -files/iscsid-2.0.868_rc1.conf.d, -files/iscsid-2.0.868_rc1.init.d, - -files/iscsid-2.0.870.init.d, -files/iscsid-2.0.870.init.d-r1, - +files/iscsid-conf.d, files/iscsid-init.d, -open-iscsi-2.0.865.12.ebuild, - -open-iscsi-2.0.868_rc1.ebuild, -open-iscsi-2.0.870.ebuild, - -open-iscsi-2.0.870-r1.ebuild, +open-iscsi-2.0.870.3.ebuild: - Version bump (#196096), Cleanup - -*open-iscsi-2.0.870-r1 (06 Dec 2008) - - 06 Dec 2008; Tobias Scherbaum - +files/iscsid-2.0.870.init.d-r1, +open-iscsi-2.0.870-r1.ebuild: - Check if /etc/conf.d/iscsid exists and INITIATOR_FILENAME isn't empty. - Thanks to Marcel Pennewiß and Craig (#196096) - -*open-iscsi-2.0.870 (17 Nov 2008) - - 17 Nov 2008; Tobias Scherbaum - +files/iscsid-2.0.870.conf.d, +files/iscsid-2.0.870.init.d, - +open-iscsi-2.0.870.ebuild: - Version bump, thanks to Marcel Pennewiß, Craig and others involved in bug - #196096 - - 08 Aug 2008; Ulrich Mueller metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - -*open-iscsi-2.0.868_rc1 (25 Mar 2008) - - 25 Mar 2008; Mike Doty - +files/iscsid-2.0.868_rc1.conf.d, +files/iscsid-2.0.868_rc1.init.d, - +open-iscsi-2.0.868_rc1.ebuild: - adding open-iscsi-2.0.868_rc1.ebuild and related files thanks to Craig - Bug 196096 - - 14 Jan 2008; Robin H. Johnson metadata.xml: - Add herd per email. - - 14 Jan 2008; Robin H. Johnson - -files/r438-idbm-file-locking.diff, -files/backward-compile-2.6.13.patch, - -files/open-iscsi-485-out.state.patch, metadata.xml, - -open-iscsi-0.4.413.ebuild, -open-iscsi-0.4.413-r1.ebuild, - -open-iscsi-0.4.434.ebuild, -open-iscsi-0.4.438.ebuild, - -open-iscsi-0.5.485.ebuild, -open-iscsi-1.0.490.ebuild, - -open-iscsi-1.0.490-r1.ebuild, -open-iscsi-1.0.514.ebuild, - open-iscsi-2.0.865.12.ebuild: - Remove old ebuilds (they were for really old kernels), clean up remaining - ebuild, then remove myself from the metadata. - -*open-iscsi-2.0.865.12 (28 Aug 2007) - - 28 Aug 2007; Mike Doty metadata.xml, - +open-iscsi-2.0.865.12.ebuild: - version bump - - 22 Feb 2007; Markus Ullmann ChangeLog: - Redigest for Manifest2 - - 23 May 2006; Robin H. Johnson - open-iscsi-1.0.514.ebuild: - Add ~ppc. - - 08 Mar 2006; Robin H. Johnson - files/initiatorname.iscsi: - Include instructions for initiatorname.iscsi. - -*open-iscsi-1.0.514 (07 Mar 2006) -*open-iscsi-1.0.490-r1 (07 Mar 2006) -*open-iscsi-1.0.490 (07 Mar 2006) - - 07 Mar 2006; Robin H. Johnson - +files/open-iscsi-485-out.state.patch, files/iscsid-init.d, - +open-iscsi-1.0.490.ebuild, +open-iscsi-1.0.490-r1.ebuild, - +open-iscsi-1.0.514.ebuild: - New upstream snapshots. Not for production use at all!. - - 02 Feb 2006; Robin H. Johnson - open-iscsi-0.5.485.ebuild: - Add missing dep on berkdb. - -*open-iscsi-0.5.485 (02 Feb 2006) - - 02 Feb 2006; Robin H. Johnson - +open-iscsi-0.5.485.ebuild: - New version. - -*open-iscsi-0.4.438 (06 Nov 2005) - - 06 Nov 2005; Robin H. Johnson - +files/r438-idbm-file-locking.diff, +files/backward-compile-2.6.13.patch, - +open-iscsi-0.4.438.ebuild: - Version bump. Custom patches for compile agasinst 2.6.13 or newer, and - possible IDBM corruption fix. - -*open-iscsi-0.4.434 (03 Nov 2005) - - 03 Nov 2005; Robin H. Johnson - +open-iscsi-0.4.434.ebuild: - Version bump. - -*open-iscsi-0.4.413-r1 (23 Sep 2005) - - 23 Sep 2005; Robin H. Johnson files/iscsid-init.d, - +open-iscsi-0.4.413-r1.ebuild: - Add debug support, and improve init script to properly stop iscsid. - - 21 Sep 2005; Robin H. Johnson - files/digest-open-iscsi-0.4.413, Manifest: - Incorrect digest from duplicate tarball. - - 20 Sep 2005; Robin H. Johnson files/iscsid-init.d, - open-iscsi-0.4.413.ebuild: - Change SRC_URI to mirror://gentoo/ now that the source has spread, also - clean up install location for modules, security of config file and - databases, and clean up the init script to be gentoo-like instead of - debian-like. - -*open-iscsi-0.4.413 (20 Sep 2005) - - 20 Sep 2005; Robin H. Johnson - +files/initiatorname.iscsi, +files/iscsid-init.d, +metadata.xml, - +open-iscsi-0.4.413.ebuild: - Initial commit. Ebuild by Robin H. Johnson . A special - thanks to The Gallery Group (www.thegallerygroup.com) for helping to support - iSCSI on Gentoo. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest index 0cf84cac67..809af275c8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest @@ -1,21 +1 @@ -AUX 99-iscsi.rules 81 SHA256 35f1475f02f9447c6d1d9e5249eef2f3e34206356f7f675ebab5f1dc1bf14988 SHA512 ee4cf1776493c27f2222d118606a04021117b6176c6879c0e98626e1edea3b0731bff95ca8fee0f6bc6fe91d0ab0e7648e8014acc84831af2ab932c2a0a00692 WHIRLPOOL 852e2c0dfdcdd593eda9d571a645efd323d0671641279eecfdebd9a6d9715266cd888e8fedca1bb214ab06cd3becba51dd9efdebd18e992c14cb4111714521a7 -AUX initiatorname.iscsi 1167 SHA256 c509a0233d8348f01566b7a461c3e927d779716ac1e67ff917ecbb370e08ba62 SHA512 4a2cc669ee56592eb574bd13f40b664f2a63f82062477b30d673babd70d85e335162a8c2f0e21117c7504cc78e3e7860a0525bd4323485813fb4ddd51e6a5ffb WHIRLPOOL 314809004fe7e0b4639eca70110b7adf3c15519344d75e3113f09382fa2e117798189547d538e5f031d93bf3ad55ca80cdaea38421ab6a9e8aa09df864661e77 -AUX iscsid-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a WHIRLPOOL 19e7dc2d647a271dd67bf2f92e3c866719b1a7c978ecc86395d3586ab0c897e93ab4dce740497a6139f4fae1c5a34c455b806c627c9a9f876133d808890a85bf -AUX iscsid-init.d 2100 SHA256 f59ba37c7f00b5d65d99e4cacf329b4da85b0b0f0af6ba113c26edd23a6b0dda SHA512 107b9166828203a3a9695e08a6a5de461f5ca388459f6bbae6f061a24b8468f8af674c131d5f91626b2df92f292e59e912563de757ab54d4b797aba294f36327 WHIRLPOOL 0cca21dcb10b7fb116398a69d21e88133bfe9abfb2b4d9831a0b83998c6355ea2cb70fcf610ca5d8ab02da9627241a993ef1ca9023f95862ca930953f1f470ed -AUX iscsidev.sh 2119 SHA256 1189dc43936fa5e428ad05fe0299d2ffdffe28ccd193396213ac9d59a5c25aaf SHA512 b4ed7fad25e3f000134a77f3aea2702f03ff75e99ecf49e580085127ab58de5a64bea9c4fc2ae5b324deafd0a860494d1a8dc1223db7d3679b960552f0c00813 WHIRLPOOL 28f57226d487fc0843e571c8ceeecf3e2b0eec506efef0b7a54636b1479dfc964d405f2be7f134c0858a24d1d24c67adb6ca9153ed9aaf4955ae403b4500d845 -AUX open-iscsi-2.0.872-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a WHIRLPOOL 19e7dc2d647a271dd67bf2f92e3c866719b1a7c978ecc86395d3586ab0c897e93ab4dce740497a6139f4fae1c5a34c455b806c627c9a9f876133d808890a85bf -AUX open-iscsi-2.0.872-dont-call-configure.patch 296 SHA256 92ab247afde924a6d07643abc2cb34598a2fb13f62718684803ab44b9bce7241 SHA512 513e775695288b747b40cfb9815c9083b61637f0e3ba241f5d5f3363730059ac4a01e55c23ab3ff983da7d3a5b40448447740ac35e0748c4d5e8942946146522 WHIRLPOOL af5c1cae289cf669dcd9cc6ce02e6a7e6603dceb8f3827d79f4d7adeb35aa9c9c6e588e1e915c078c31532a9985f4fb2a74fe7270269c686be4d7f6c2083ae06 -AUX open-iscsi-2.0.872-glibc212.patch 266 SHA256 e7b299da12daed432f18a115b7a14eadb61a3db13df89af21a9078357ebf63ca SHA512 8d869642b27dc7d243cf5697858a19127e5e627dd62fd2a8879e4baf84f87aa07e7682faa5f7153ef75e8f9a78ae9b1a84e3260f449fbbb26d848064ec736630 WHIRLPOOL c501c6d8ae334974635f25060b29e326da7a6ef33062c518cd115fa7cae6a63ef3901dc7e1c421a70557b114cead6cc951a09712cf19c83c7f79ec96635fe7e4 -AUX open-iscsi-2.0.872-init.d-r1 2847 SHA256 e9669386a355a3fc96b7cf0bd95ef1249dfffc214266943cf6205dfadb4000bd SHA512 79009ffdf4fcb30737cbc92eb13e7c64b8277935621280f2e10d8c104d711242b591f31238befbdf34cd08496f0be251017c9c2b415f96202acf1b950a7ff1f5 WHIRLPOOL a0d335c736ac2c0adadee1c47278d7cc1207e5b5b2f51c7681cea68e4718619ba7964a274e55c4090aaf565e2d1948a2039e1de37595fc97d850c316650a9f9d -AUX open-iscsi-2.0.872-isns-slp.patch 871 SHA256 d83640c9a7f9d7fed2b502d0164f6f8a91adb87f45e79a793954eae536a22138 SHA512 8aa4e6897c3284b7d914b7805d37a5d21014d66514675a4878c05535c460fc5ffafb43628f4112226f116fb8d941f14fc66246f0d395f0e44c90610494546f73 WHIRLPOOL f98cb605e1311792c6c9e5e03d2508cc05a10a94fc36feeb70c0b558f65861f743bdb1896da971dc93bac67638f69b8ac4a27ff7bfc9ef3c9c735c1f4ded81af -AUX open-iscsi-2.0.872-ldflags.patch 309 SHA256 b8544087dfbc579209d326f825a251f6fc10898ca29ce46264d4a86ceac95941 SHA512 4204a615e10d52130a2fb39b81d99df45350b7f7431fa4e110e535ece2c1aab2cda0b8e787561a051c232a80f2cd99af007e94c1ca122727aac7854eee478219 WHIRLPOOL c8a6a6fad91680df09227a5ae29b2a9f7c172c0a9326e3d53ec5c16ae63fe733ab392949e777c5ca3a3c01d6a07d925f22a2dc82bbb53c3b76a7ed7b7e5010fd -AUX open-iscsi-2.0.872-makefile-cleanup-pass2.patch 2134 SHA256 8725f8aba89f86c275f9a53bfb066d392b43e6ba5496c09bc2d9543453f45122 SHA512 ee1700c010578160f2fe3bb2f5a7eca4bde900faa138445eaf6b1875a7ad89d5c13b530d25a0ac5844213fa118b4e5253180414956d4e514dae0ede936dee2c8 WHIRLPOOL ef5377ca5d95e7ce12727dca3a3547e59b37c21772799e24be0cf6725e432502bcfd7156990be98405f0382793247d3edc3cba6e85fc45261ddaa2a797180679 -AUX open-iscsi-2.0.872-makefile-cleanup.patch 839 SHA256 c0e92ba2211dd74e89dcc0c5793e02ad8ad06b41a07a0687007bba6415546dfd SHA512 bc4cae49f435a4396a88b5d238c1f72a808c5d272042ee1acfe6c27d96613b9fc03ba2ce7e40d0a0f4aef2a924a66b45fb8a1e6db131415668c5336c5a4cf720 WHIRLPOOL 4045bf2826a33460f00218a65dc1e1614aac1bf16a07f4752546df4066c9e4c0420d5fa5b235b634a4bfd1c5626ab1813b6f595ab2b71743755ac378b41e8138 -AUX open-iscsi-2.0.873-Makefiles.patch 5441 SHA256 8b12789550bef694d49a4bf89752c5bd3e60ca9c7ce63d6268f49bf672af317f SHA512 8dd3433db748f2fd0da0ab6a1059d7058eb09c527e9d039e768bc359a6b665da3e5c13463c32f35d7c630a3b901a689315ece3adb88cccabe452352658705f33 WHIRLPOOL 2115505cc80080454f810f973dd2b80ee6dd6567e2e3a9e2d1d3b4457e2bd3254958d6cdeae7bbce3e3f38c86a577d2900f11e5321b21b264658f38b171ebb8e -DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935 DIST open-iscsi-2.0-873.tar.gz 667069 SHA256 7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b WHIRLPOOL 05af106f11da9f9f02c10edd5412d0f99816349e06e192059700eb1ae24a36027c3f0d7ed423aa7bb1c0b9d8b3aa1b6aa72a2aadb00f27762edf16b7f7d08c09 -EBUILD open-iscsi-2.0.872-r2.ebuild 3014 SHA256 daf083a8158b6018fb786447e25a9ebdfc14b9ad2186837fd3fc77ffc0183c9f SHA512 0731fc9f813986c44874c672f67e654559461a57204b95817c2cc67dba1ed17531d56482ba2658f2fc660dc0be696a132ebaec2da00db69ac2d3b6cd9008e0f3 WHIRLPOOL 430be248ccb1797f764030521c2e449d86dbb3b9dd35de940989f55f2113ca9e88302aa7cbbc93618b86015a770667cfce5624b8ae675e335e73f8a65020468e -EBUILD open-iscsi-2.0.872-r3.ebuild 3190 SHA256 59fa39903f4595da38c00e8a20d3b09be5a8ac68978de7d1483b4e0fa3519f67 SHA512 86a69ad169efda6debf2715c2c5a80656bd8c966da36c53f0b5a66d25700698904c8cd590e860fc17e4660388dc4d56092254965ed63288762bd62073c39c2ae WHIRLPOOL 6899720caee31a93fa0dc7f30da1e2cce17940258949a260cc3235993dc7207792bb9335ba9150f8d947f6efd2e5842cc0d4a009d95ff6287697e5c2eb2e68f6 -EBUILD open-iscsi-2.0.873.ebuild 2435 SHA256 551779dc8f87da2b682b2c2f87fc1ca387552a983e20155ec12a89c584fdff7f SHA512 b3fabd513dc933f88a5feb3fa14aeb75c08494b157f60db2a63de8019b530d2a6673078de4c22321829c5062f1141c568a0a16965560b4a980f5dedb3e9522ca WHIRLPOOL af396a9993739be054df6bb42713e5a9f4ae2295dbdaca77ef63b2f9a24cf15ddec29a5871462f1775136041260bae9988173a7243435707428b51ea306cae4f -MISC ChangeLog 12774 SHA256 9b9181930bb9ff4372f3be4dba556ea5bd21a5ac8b0c7477f04bc487013005a2 SHA512 68fe6c69d7a6bb1ae5f130ce454428d9eef12985e9a9a92bb8231eb667dbf2b0da9dd32aa949cdaeaa1aa5c8f8eea498c47f101206b383e141f97dc7d14fd6f6 WHIRLPOOL 74d28df5ad38713c3f3b1e2dd50d95175d5580a4c95703bc4c904069a895c1c3d62f7045b4c6e3e73fea08549bc0be1b54a34a9e412705e4c0dace8bce2f31e6 -MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/99-iscsi.rules b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/99-iscsi.rules index 74c8e14bc5..ca9a81a8ff 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/99-iscsi.rules +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/99-iscsi.rules @@ -1 +1 @@ -KERNEL=="sd*", SUBSYSTEMS=="block", RUN{program}="/etc/udev/scripts/iscsidev.sh" +KERNEL=="sd*", SUBSYSTEMS=="block", RUN{program}="/usr/lib/udev/scripts/iscsidev.sh" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-conf.d b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-conf.d deleted file mode 100644 index 02e584fbce..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# /etc/conf.d/iscsid - -# config file to use -CONFIG_FILE=/etc/iscsi/iscsid.conf - -# you need to specify an initiatorname in the file -INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi - -# options to pass to iscsid -OPTS="-i ${INITIATORNAME_FILE}" - -# Start automatic targets when iscsid is started -AUTOSTARTTARGETS="yes" - -# if set to "strict", iscsid will stop, if connecting the -# autostart targets failed -# AUTOSTART="strict" - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-init.d b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-init.d deleted file mode 100644 index 6bd49ab09a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-init.d +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Id$ - -command="/usr/sbin/iscsid" -command_args="${OPTS}" -start_stop_daemon_args="-w 100" # iscsid might fail e.g. when the iSCSI kernel modules aren't available -pidfile=${PIDFILE:-/var/run/${SVCNAME}.pid} - -extra_started_commands="starttargets stoptargets" -extra_commands="restarttargets" - -ISCSIADM=/usr/sbin/iscsiadm - -depend() { - after modules multipath - use net -} - -checkconfig() { - if [ ! -e /etc/conf.d/${SVCNAME} ]; then - eerror "Config file /etc/conf.d/${SVCNAME} does not exist!" - return 1 - fi - if [ ! -e "${CONFIG_FILE}" ]; then - eerror "Config file ${CONFIG_FILE} does not exist!" - return 1 - fi - - if [ -e ${INITIATORNAME_FILE} ]; then - . ${INITIATORNAME_FILE} - fi - if [ ! -e ${INITIATORNAME_FILE} -o -z "${InitiatorName}" ]; then - ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name." - local IQN=$(/usr/sbin/iscsi-iname) - ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}" - echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}" - eend $? - fi -} - -starttargets() { - ebegin "Setting up iSCSI targets" - $ISCSIADM -m node --loginall=automatic - local ret=$? - eend $ret - return $ret -} - -stoptargets() { - ebegin "Disconnecting iSCSI targets" - sync - $ISCSIADM -m node --logoutall=all - local ret=$? - - if [ $ret -eq 21 ]; then - # See man iscsiadm(8) - einfo "No active sessions to disconnect" - eend 0 - return 0 - fi - - eend $ret - return $ret -} - -restarttargets() { - stoptargets - starttargets -} - -status() { - ebegin "Showing current active iSCSI sessions" - $ISCSIADM -m session -} - - -start_pre() { - local ret=1 - - ebegin "Checking Open-iSCSI configuration" - checkconfig - ret=$? - if [ $ret -ne 0 ]; then - eend 1 - return 1 - fi - eend 0 -} - -start_post() { - # Start automatic targets when iscsid is started - if [ "${AUTOSTARTTARGETS}" = "yes" ]; then - starttargets - local ret=$? - if [ "${AUTOSTART}" = "strict" -a $ret -ne 0 ]; then - stop - return $ret - fi - fi - return 0 -} - -stop_pre() { - stoptargets -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d deleted file mode 100644 index 02e584fbce..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# /etc/conf.d/iscsid - -# config file to use -CONFIG_FILE=/etc/iscsi/iscsid.conf - -# you need to specify an initiatorname in the file -INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi - -# options to pass to iscsid -OPTS="-i ${INITIATORNAME_FILE}" - -# Start automatic targets when iscsid is started -AUTOSTARTTARGETS="yes" - -# if set to "strict", iscsid will stop, if connecting the -# autostart targets failed -# AUTOSTART="strict" - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch deleted file mode 100644 index 185f1acd83..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- open-iscsi-2.0-872.orig/Makefile -+++ open-iscsi-2.0-872/Makefile -@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example - all: user kernel - - user: ; -- cd utils/open-isns; ./configure; $(MAKE) -+ cd utils/open-isns; $(MAKE) - $(MAKE) -C utils/sysdeps - $(MAKE) -C utils/fwparam_ibft - $(MAKE) -C usr diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch deleted file mode 100644 index 6171703294..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- usr/iscsid.c 2010-10-10 23:06:37.000000000 +0200 -+++ usr/iscsid.c 2010-10-10 23:07:55.000000000 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "iscsid.h" - #include "mgmt_ipc.h" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 deleted file mode 100644 index aa6cebf690..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 +++ /dev/null @@ -1,131 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Id$ - -opts="${opts} starttargets stoptargets restarttargets" - -depend() { - after modules - use net -} - -PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid} -BINARY="/usr/sbin/iscsid" - -checkconfig() { - if [ ! -e /etc/conf.d/${SVCNAME} ]; then - eerror "Config file /etc/conf.d/${SVCNAME} does not exist!" - return 1 - fi - if [ ! -e "${CONFIG_FILE}" ]; then - eerror "Config file ${CONFIG_FILE} does not exist!" - return 1 - fi - if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then - ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name." - IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi - IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g') - ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}" - echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}" - eend $? - fi -} - -do_modules() { - msg="$1" - shift - modules="${1}" - shift - modopts="$@" - for m in ${modules} - do - if modprobe --show --quiet "${m}" - then - ebegin "${msg} ${m}" - modprobe ${modopts} ${m} - ret=$? - eend ${ret} - if [ ${ret} -ne 0 ]; then - return ${ret} - fi - else - ebegin "${msg} ${m}: not found" - return 1 - fi - done - return 0 -} - -start() { - ebegin "Checking open-iSCSI configuration" - checkconfig - ret=$? - if [ $ret -ne 0 ]; then - eend 1 - return 1 - fi - ebegin "Loading iSCSI modules" - do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp' - ret=$? - if [ $ret -ne 0 ]; then - eend 1 - return 1 - fi - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS} - ret=$? - if [ $ret -ne 0 ]; then - eend $? - return $? - fi - - # Start automatic targets when iscsid is started - if [ "${AUTOSTARTTARGETS}" = "yes" ]; then - starttargets - ret=$? - if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then - stop - return $ret - fi - fi - return 0 -} - -stop() { - stoptargets - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE} - eend $? - - do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r' - eend $? -} - -starttargets() { - ebegin "Setting up iSCSI targets" - /usr/sbin/iscsiadm -m node --loginall=automatic - ret=$? - eend $ret - return $ret -} - -stoptargets() { - ebegin "Disconnecting iSCSI targets" - sync - /usr/sbin/iscsiadm -m node --logoutall=all - ret=$? - eend $ret - return $ret -} - -restarttargets() { - stoptargets - starttargets -} - -status() { - ebegin "Showing current active iSCSI sessions" - /usr/sbin/iscsiadm -m session -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch deleted file mode 100644 index db280a3dd8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nuar open-iscsi-2.0-872.orig/usr/Makefile open-iscsi-2.0-872/usr/Makefile ---- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:25:13.656604152 +0000 -+++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:26:28.960171260 +0000 -@@ -53,10 +53,10 @@ - - iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ - iscsid.o session_mgmt.o discoveryd.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto - - iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto - - iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch deleted file mode 100644 index fc02cbcc1e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/Makefile 2011-05-31 01:30:27.302609540 +0200 -+++ utils/Makefile 2011-05-31 01:32:50.229602790 +0200 -@@ -6,7 +6,7 @@ - all: $(PROGRAMS) - - iscsi-iname: md5.o iscsi-iname.o -- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ - - clean: - rm -f *.o $(PROGRAMS) .depend diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch deleted file mode 100644 index fb563d10e1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -NuarwbB open-iscsi-2.0-872/usr/Makefile open-iscsi-2.0-872.orig/usr/Makefile ---- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:58:04.402623915 +0000 -+++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:56:51.159070006 +0000 -@@ -65,6 +65,6 @@ - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - - depend: -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend -- gcc $(CFLAGS) -M `ls *.c` > .depend - - -include .depend -diff -NuarwbB open-iscsi-2.0-872/utils/fwparam_ibft/Makefile open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile ---- open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile 2012-02-09 08:57:58.579273051 +0000 -+++ open-iscsi-2.0-872/utils/fwparam_ibft/Makefile 2010-08-11 15:27:07.000000000 +0000 -@@ -38,6 +38,6 @@ - $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h - - depend: -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend -- gcc $(CFLAGS) -M `ls *.c` > .depend - - -include .depend -diff -NuarwbB open-iscsi-2.0-872/utils/Makefile open-iscsi-2.0-872.orig/utils/Makefile ---- open-iscsi-2.0-872.orig/utils/Makefile 2012-02-09 08:57:37.825877235 +0000 -+++ open-iscsi-2.0-872/utils/Makefile 2012-02-09 08:56:51.145736633 +0000 -@@ -12,6 +12,6 @@ - rm -f *.o $(PROGRAMS) .depend - - depend: -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend -- gcc $(CFLAGS) -M `ls *.c` > .depend - - -include .depend -diff -NuarwbB open-iscsi-2.0-872/utils/open-isns/Makefile.in open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in ---- open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in 2012-02-09 08:57:47.812573971 +0000 -+++ open-iscsi-2.0-872/utils/open-isns/Makefile.in 2010-08-11 15:27:07.000000000 +0000 -@@ -77,6 +77,6 @@ - ar cr $@ $(LIBOBJS) - - depend: -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend -- gcc $(CFLAGS) -M `ls *.c` > .depend - - -include .depend -diff -NuarwbB open-iscsi-2.0-872/utils/sysdeps/Makefile open-iscsi-2.0-872.orig/utils/sysdeps/Makefile ---- open-iscsi-2.0-872.orig/utils/sysdeps/Makefile 2012-02-09 08:57:43.459227530 +0000 -+++ open-iscsi-2.0-872/utils/sysdeps/Makefile 2010-08-11 15:27:07.000000000 +0000 -@@ -10,6 +10,6 @@ - rm -f *.o .depend - - depend: -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend -- gcc $(CFLAGS) -M `ls *.c` > .depend - - -include .depend diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch deleted file mode 100644 index b3e93f459f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- usr/Makefile 2010-10-10 22:48:04.000000000 +0200 -+++ usr/Makefile.ori 2010-10-10 22:48:34.000000000 +0200 -@@ -53,14 +53,14 @@ - - iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ - iscsid.o session_mgmt.o discoveryd.o -- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto - - iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o -- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto - - iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) -static $^ -o $@ -+ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@ - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild deleted file mode 100644 index 4c0d778276..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 -inherit versionator linux-info eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720" -HOMEPAGE="http://www.open-iscsi.org/" -MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)" -SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" -IUSE="debug slp" -DEPEND="slp? ( net-libs/openslp )" -RDEPEND="${DEPEND} - sys-apps/util-linux" - -S="${WORKDIR}/${MY_PV}" - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is -lt 2 6 16; then - die "Sorry, your kernel must be 2.6.16-rc5 or newer!" - fi - - # Needs to be done, as iscsid currently only starts, when having the iSCSI - # support loaded as module. Kernel builtion options don't work. See this for - # more information: - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 - # If there's a new release, check whether this is still valid! - CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" - done - fi -} - -src_prepare() { - export EPATCH_OPTS="-d${S}" - epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch - epatch "${FILESDIR}"/${P}-glibc212.patch - epatch "${FILESDIR}"/${P}-dont-call-configure.patch - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-isns-slp.patch - epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch -} - -src_configure() { - cd utils/open-isns || die - econf $(use_with slp) -} - -src_compile() { - use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI - - einfo "Building userspace" - local SLP_LIBS - use slp && SLP_LIBS="-lslp" - cd "${S}" && \ - KSRC="${KV_DIR}" CFLAGS="" \ - emake \ - OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \ - AR="$(tc-getAR)" CC="$(tc-getCC)" \ - user \ - || die "emake failed" -} - -src_install() { - einfo "Installing userspace" - dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die - - einfo "Installing utilities" - dosbin utils/iscsi-iname utils/iscsi_discovery || die - - einfo "Installing docs" - doman doc/*[1-8] || die - dodoc README THANKS || die - docinto test || die - dodoc test/* || die - - einfo "Installing configuration" - insinto /etc/iscsi - doins etc/iscsid.conf || die - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die - insinto /etc/iscsi/ifaces - doins etc/iface.example || die - - newconfd "${FILESDIR}"/${P}-conf.d iscsid || die - newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die - - keepdir /var/db/iscsi - fperms 700 /var/db/iscsi || die - fperms 600 /etc/iscsi/iscsid.conf || die -} - -pkg_postinst() { - in='/etc/iscsi/initiatorname.iscsi' - if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then - cp -f "${ROOT}${in}.example" "${ROOT}${in}" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild deleted file mode 100644 index 28ef5a7686..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 -inherit versionator linux-info eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720" -HOMEPAGE="http://www.open-iscsi.org/" -MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)" -SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug slp" -DEPEND="slp? ( net-libs/openslp )" -RDEPEND="${DEPEND} - virtual/udev - sys-fs/lsscsi - sys-apps/util-linux" - -S="${WORKDIR}/${MY_PV}" - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is -lt 2 6 16; then - die "Sorry, your kernel must be 2.6.16-rc5 or newer!" - fi - - # Needs to be done, as iscsid currently only starts, when having the iSCSI - # support loaded as module. Kernel builtion options don't work. See this for - # more information: - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 - # If there's a new release, check whether this is still valid! - CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" - done - fi -} - -src_prepare() { - export EPATCH_OPTS="-d${S}" - epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch - epatch "${FILESDIR}"/${P}-glibc212.patch - epatch "${FILESDIR}"/${P}-dont-call-configure.patch - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-isns-slp.patch - epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch -} - -src_configure() { - cd utils/open-isns || die - econf $(use_with slp) -} - -src_compile() { - use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI - - einfo "Building userspace" - local SLP_LIBS - use slp && SLP_LIBS="-lslp" - cd "${S}" && \ - KSRC="${KV_DIR}" CFLAGS="" \ - emake \ - OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \ - AR="$(tc-getAR)" CC="$(tc-getCC)" \ - user \ - || die "emake failed" -} - -src_install() { - einfo "Installing userspace" - dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die - - einfo "Installing utilities" - dosbin utils/iscsi-iname utils/iscsi_discovery || die - - einfo "Installing docs" - doman doc/*[1-8] || die - dodoc README THANKS || die - docinto test || die - dodoc test/* || die - - einfo "Installing configuration" - insinto /etc/iscsi - doins etc/iscsid.conf || die - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die - insinto /etc/iscsi/ifaces - doins etc/iface.example || die - - newconfd "${FILESDIR}"/${P}-conf.d iscsid || die - newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die - - # udev pieces - insinto /etc/udev/scripts - doins "${FILESDIR}"/iscsidev.sh - insinto /lib/udev/rules.d - doins "${FILESDIR}"/99-iscsi.rules - - keepdir /var/db/iscsi - fperms 700 /var/db/iscsi || die - fperms 600 /etc/iscsi/iscsid.conf || die -} - -pkg_postinst() { - in='/etc/iscsi/initiatorname.iscsi' - if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then - cp -f "${ROOT}${in}.example" "${ROOT}${in}" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild index 34b33e3ee4..f709d75523 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -77,19 +77,14 @@ src_install() { docinto test/ dodoc test/* - insinto /etc/iscsi - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example # udev pieces - insinto /lib/udev/rules.d + insinto /usr/lib/udev/rules.d doins "${FILESDIR}"/99-iscsi.rules insopts -m0755 - insinto /etc/udev/scripts + insinto /usr/lib/udev/scripts doins "${FILESDIR}"/iscsidev.sh insopts -m0644 - newconfd "${FILESDIR}"/iscsid-conf.d iscsid - newinitd "${FILESDIR}"/iscsid-init.d iscsid - keepdir /var/db/iscsi fperms 700 /var/db/iscsi fperms 600 /etc/iscsi/iscsid.conf From ae7bd0bff6efd5826f63104de2733840663ef8f1 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 17 Sep 2015 12:26:13 -0700 Subject: [PATCH 3/8] unmask open-iscsi-2.0.873 --- .../coreos-overlay/profiles/coreos/base/package.unmask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask index b4ca8272c7..097022d351 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask @@ -1,2 +1,7 @@ # masked upstream due to lua dep, but we don't enable lua support ~net-analyzer/nmap-6.40 + +# masked in portage-stable, but is unmasked in upstream. +# remove this when upstream portage-stable package.mask is sync'd. +=sys-block/open-iscsi-2.0.873 + From 76bd001974338138fda55a90685c8549c5a4a766 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 17 Sep 2015 12:27:00 -0700 Subject: [PATCH 4/8] sys-block/open-iscsi: add stable arm64 keyword --- .../sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild index f709d75523..7f6452d987 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="debug slp" DEPEND="slp? ( net-libs/openslp )" From a5d707e9df2192d988a2f21b6c9099614b2675a3 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 17 Sep 2015 12:27:22 -0700 Subject: [PATCH 5/8] sys-block/open-iscsi: fix sbin install path --- .../sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild index 7f6452d987..23b4d617ca 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -70,7 +70,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" sbindir="${ROOT}usr/sbin/" install + emake DESTDIR="${D}" sbindir="usr/sbin/" install dodoc README THANKS From d5a168f1d81db33c76d6c6d2bccff411d5c0719f Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 17 Sep 2015 15:30:03 -0700 Subject: [PATCH 6/8] sys-block/open-iscsi: patch out kernel version checks --- ...-2.0.873-remove-kernel-version-check.patch | 42 +++++++++++++++++++ .../open-iscsi/open-iscsi-2.0.873.ebuild | 3 +- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.873-remove-kernel-version-check.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.873-remove-kernel-version-check.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.873-remove-kernel-version-check.patch new file mode 100644 index 0000000000..1c7f1c0445 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.0.873-remove-kernel-version-check.patch @@ -0,0 +1,42 @@ +From d5629f76e1775550692be0d94c8e7f82a96f657d Mon Sep 17 00:00:00 2001 +From: Nick Owens +Date: Thu, 17 Sep 2015 15:27:14 -0700 +Subject: [PATCH] remove kernel version check + +--- + usr/Makefile | 18 +----------------- + 1 file changed, 1 insertion(+), 17 deletions(-) + +diff --git a/usr/Makefile b/usr/Makefile +index 5ac0726..9c436df 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -2,24 +2,8 @@ + + OSNAME=$(shell uname -s) + +-# allow users to override these +-# eg to compile for a kernel that you aren't currently running +-KERNELRELEASE ?= $(shell uname -r) +-KSRC ?= /lib/modules/$(KERNELRELEASE)/build +- +-KSUBLEVEL=$(shell cat $(KSRC)/Makefile | awk -F= '/^SUBLEVEL =/ {print $$2}' | \ +- sed 's/^[ \t]*//;s/[ \t]*$$//') +- + ifeq ($(OSNAME),Linux) +- ifeq ($(KSUBLEVEL),11) +- IPC_CFLAGS=-DNETLINK_ISCSI=12 -D_GNU_SOURCE +- else +- ifeq ($(KSUBLEVEL),12) +- IPC_CFLAGS=-DNETLINK_ISCSI=12 -D_GNU_SOURCE +- else +- IPC_CFLAGS=-DNETLINK_ISCSI=8 -D_GNU_SOURCE +- endif +- endif ++IPC_CFLAGS=-DNETLINK_ISCSI=8 -D_GNU_SOURCE + IPC_OBJ=netlink.o + else + ifeq ($(OSNAME),FreeBSD) +-- +2.4.6 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild index 23b4d617ca..7a0d87f71e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -47,6 +47,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-Makefiles.patch + epatch "${FILESDIR}"/${P}-remove-kernel-version-check.patch sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die } @@ -62,7 +63,7 @@ src_configure() { src_compile() { use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI - KSRC="${KV_DIR}" CFLAGS="" \ + CFLAGS="" \ emake \ OPTFLAGS="${CFLAGS}" \ AR="$(tc-getAR)" CC="$(tc-getCC)" \ From 58b62f0414c30050ead2895bd862f186db9b0d8e Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 17 Sep 2015 16:02:38 -0700 Subject: [PATCH 7/8] sys-block/open-iscsi: warn rather than die if kernel is too old --- .../sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild index 7a0d87f71e..4004d423b1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -29,7 +29,7 @@ pkg_setup() { linux-info_pkg_setup if kernel_is -lt 2 6 16; then - die "Sorry, your kernel must be 2.6.16-rc5 or newer!" + ewarn "Sorry, your kernel must be 2.6.16-rc5 or newer!" fi # Needs to be done, as iscsid currently only starts, when having the iSCSI From 5c0850a74aae282edbedffe6b46962f950156b94 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 17 Sep 2015 16:19:57 -0700 Subject: [PATCH 8/8] sys-block/open-iscsi: add tmpfiles conf to create /var/db/iscsi --- .../coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf | 2 ++ .../sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf new file mode 100644 index 0000000000..63f2a9cc2c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf @@ -0,0 +1,2 @@ +d /var/db/iscsi 0700 root root - - + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild index 4004d423b1..831f9b575a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -86,7 +86,7 @@ src_install() { doins "${FILESDIR}"/iscsidev.sh insopts -m0644 - keepdir /var/db/iscsi - fperms 700 /var/db/iscsi + systemd_dotmpfilesd "${FILESDIR}"/open-iscsi.conf + fperms 600 /etc/iscsi/iscsid.conf }