mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-06 16:58:24 +00:00
lio-utils: Remove obsolete recipe
This recipe depends on meta-python2, master branch of which has not been updated sine February 2022, see https://git.openembedded.org/meta-python2/log/?h=master Also, master branch of lio-utils has not been updated since May 2014, see https://github.com/Datera/lio-utils/commits/master/ Thus, remove the obsolete recipe, along with associated packagegroup declarations/references. Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -22,7 +22,6 @@ PACKAGES = "\
|
|||||||
packagegroup-meta-oe-shells \
|
packagegroup-meta-oe-shells \
|
||||||
packagegroup-meta-oe-security \
|
packagegroup-meta-oe-security \
|
||||||
packagegroup-meta-oe-support \
|
packagegroup-meta-oe-support \
|
||||||
packagegroup-meta-oe-support-python2 \
|
|
||||||
packagegroup-meta-oe-test \
|
packagegroup-meta-oe-test \
|
||||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
|
${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
|
||||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
|
${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
|
||||||
@@ -47,7 +46,6 @@ RDEPENDS:packagegroup-meta-oe = "\
|
|||||||
packagegroup-meta-oe-security \
|
packagegroup-meta-oe-security \
|
||||||
packagegroup-meta-oe-shells \
|
packagegroup-meta-oe-shells \
|
||||||
packagegroup-meta-oe-support \
|
packagegroup-meta-oe-support \
|
||||||
${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-support-python2", "", d)} \
|
|
||||||
packagegroup-meta-oe-test \
|
packagegroup-meta-oe-test \
|
||||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
|
${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
|
||||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
|
${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
|
||||||
@@ -914,10 +912,6 @@ RDEPENDS:packagegroup-meta-oe-support:append:aarch64 = " ne10"
|
|||||||
RDEPENDS:packagegroup-meta-oe-support:append:x86 = " mcelog mce-inject mce-test vboxguestdrivers"
|
RDEPENDS:packagegroup-meta-oe-support:append:x86 = " mcelog mce-inject mce-test vboxguestdrivers"
|
||||||
RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = " mcelog mce-inject mce-test vboxguestdrivers"
|
RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = " mcelog mce-inject mce-test vboxguestdrivers"
|
||||||
|
|
||||||
RDEPENDS:packagegroup-meta-oe-support-python2 ="\
|
|
||||||
${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'lio-utils', '', d), "", d)} \
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl"
|
RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl"
|
||||||
RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools"
|
RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools"
|
||||||
RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim"
|
RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim"
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
From 2cc2315eecaa48fd24792aaa889dc7d9fb96978b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Mon, 20 Mar 2017 22:18:44 -0700
|
|
||||||
Subject: [PATCH] Makefiles: Respect environment variables and add LDFLAGS to
|
|
||||||
linker cmdline
|
|
||||||
|
|
||||||
Fixes QA errors about GNU_HASH
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
mib-modules/Makefile | 10 +++++-----
|
|
||||||
tools/Makefile | 2 +-
|
|
||||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mib-modules/Makefile b/mib-modules/Makefile
|
|
||||||
index 0d54c9b..051d4d2 100644
|
|
||||||
--- a/mib-modules/Makefile
|
|
||||||
+++ b/mib-modules/Makefile
|
|
||||||
@@ -17,13 +17,13 @@ TARG = iscsiTargetMib.so
|
|
||||||
OBJS = iscsiTargetMib.o iscsiMib.o scsiMib.o ipsAuthMib.o \
|
|
||||||
iscsiAuthData.o
|
|
||||||
|
|
||||||
-CC = gcc
|
|
||||||
-CFLAGS = -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
|
|
||||||
+CC ?= gcc
|
|
||||||
+CFLAGS += -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
|
|
||||||
CFLAGS += -I../include -Wall -Werror
|
|
||||||
#CFLAGS +=$(AUTO_CFLAGS)
|
|
||||||
|
|
||||||
-LD = gcc -shared
|
|
||||||
-
|
|
||||||
+LD ?= gcc
|
|
||||||
+LDFLAGS += -shared
|
|
||||||
INSTALL = install
|
|
||||||
|
|
||||||
all: $(TARG)
|
|
||||||
@@ -32,7 +32,7 @@ all: $(TARG)
|
|
||||||
$(CC) $(CFLAGS) -o $@ -c $<
|
|
||||||
|
|
||||||
$(TARG): $(OBJS)
|
|
||||||
- $(LD) -o $@ $(OBJS)
|
|
||||||
+ $(LD) -o $@ $(OBJS) $(LDFLAGS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f $(OBJS) $(TARG)
|
|
||||||
diff --git a/tools/Makefile b/tools/Makefile
|
|
||||||
index 79ed3cd..ffd9bf3 100644
|
|
||||||
--- a/tools/Makefile
|
|
||||||
+++ b/tools/Makefile
|
|
||||||
@@ -6,7 +6,7 @@ ISCSI_NAME_OBJS = $(ISCSI_NAME_SRCS:.c=.o)
|
|
||||||
all:: $(ISCSI_NAME)
|
|
||||||
|
|
||||||
$(ISCSI_NAME): $(ISCSI_NAME_OBJS)
|
|
||||||
- $(CC) -o $@ $(CFLAGS) $(ISCSI_NAME_OBJS)
|
|
||||||
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(ISCSI_NAME_OBJS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f $(ISCSI_NAME_OBJS) $(ISCSI_NAME)
|
|
||||||
--
|
|
||||||
2.12.0
|
|
||||||
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
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 = "GPL-2.0-only"
|
|
||||||
LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df"
|
|
||||||
|
|
||||||
PV = "4.1+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 = "0ac9091c1ff7a52d5435a4f4449e82637142e06e"
|
|
||||||
S = "${WORKDIR}/git"
|
|
||||||
|
|
||||||
inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)}
|
|
||||||
|
|
||||||
EXTRA_OEMAKE += "DESTDIR=${D}"
|
|
||||||
|
|
||||||
do_compile() {
|
|
||||||
cd ${S}/tcm-py
|
|
||||||
distutils_do_compile
|
|
||||||
|
|
||||||
cd ${S}/lio-py
|
|
||||||
distutils_do_compile
|
|
||||||
|
|
||||||
if test -d ${S}/tools; then
|
|
||||||
oe_runmake -C ${S}/tools
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install() {
|
|
||||||
cd ${S}/tcm-py
|
|
||||||
distutils_do_install
|
|
||||||
|
|
||||||
cd ${S}/lio-py
|
|
||||||
distutils_do_install
|
|
||||||
|
|
||||||
SITE_PACKAGES=${D}/${PYTHON_SITEPACKAGES_DIR}
|
|
||||||
install -d ${D}/${sbindir}
|
|
||||||
for var in tcm_node tcm_dump tcm_loop tcm_fabric lio_dump lio_node; do
|
|
||||||
if [ ! -h ${D}/${sbindir}/${var} ];then
|
|
||||||
chmod a+x ${SITE_PACKAGES}/${var}.py
|
|
||||||
ln -s ${PYTHON_SITEPACKAGES_DIR}/${var}.py ${D}/${sbindir}/${var}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if test -d ${S}/tools; then
|
|
||||||
oe_runmake -C ${S}/tools install
|
|
||||||
fi
|
|
||||||
|
|
||||||
install -d ${D}/etc/target/
|
|
||||||
install -d ${D}/etc/init.d/
|
|
||||||
install -m 755 ${S}/scripts/rc.target ${D}/etc/init.d/
|
|
||||||
install -m 755 ${S}/conf/tcm_start.default ${D}/etc/target/tcm_start.sh
|
|
||||||
install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh
|
|
||||||
}
|
|
||||||
|
|
||||||
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/*"
|
|
||||||
|
|
||||||
# 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.')
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user