diff options
Diffstat (limited to 'meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb')
-rw-r--r-- | meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 3a6319c314..48be8dfa96 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb @@ -1,18 +1,18 @@ SUMMARY = "lio-utils" DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)" HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df" PV = "4.1+git${SRCPV}" -SRC_URI = "git://risingtidesystems.com/lio-utils.git \ +SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \ file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \ " -SRCREV = "28bd928655bdc7bd3cf380f0196630690c51e05f" +SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" S = "${WORKDIR}/git" -inherit distutils +inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)} EXTRA_OEMAKE += "DESTDIR=${D}" @@ -55,8 +55,21 @@ do_install() { install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh } -RDEPENDS_${PN} += "python-stringold python-subprocess python-shell \ +SKIP_RECIPE[lio-utils] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}" + +RDEPENDS:${PN} += "python-stringold python-subprocess python-shell \ python-datetime python-textutils python-crypt python-netclient python-email \ bash" -FILES_${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" +FILES:${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" + +# http://errors.yoctoproject.org/Errors/Details/184712/ +# python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory +CLEANBROKEN = "1" + +python() { + if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') +} + + |