summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorNiko Mauno <niko.mauno@vaisala.com>2024-10-01 04:58:20 +0000
committerKhem Raj <raj.khem@gmail.com>2024-09-30 23:54:17 -0700
commit07f0143386d5791b099b0279b4acd5b64349ce27 (patch)
tree84d48a8a362b04e3b3f2b5b0ac7a947e4b3912f1 /meta-oe
parent63898499aca03b2b92639e663bfd23e2b1705ab7 (diff)
downloadmeta-openembedded-07f0143386d5791b099b0279b4acd5b64349ce27.tar.gz
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>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb6
-rw-r--r--meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch63
-rw-r--r--meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb75
3 files changed, 0 insertions, 144 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 163061ca7..b29b86d45 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -22,7 +22,6 @@ PACKAGES = "\
22 packagegroup-meta-oe-shells \ 22 packagegroup-meta-oe-shells \
23 packagegroup-meta-oe-security \ 23 packagegroup-meta-oe-security \
24 packagegroup-meta-oe-support \ 24 packagegroup-meta-oe-support \
25 packagegroup-meta-oe-support-python2 \
26 packagegroup-meta-oe-test \ 25 packagegroup-meta-oe-test \
27 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ 26 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
28 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ 27 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
@@ -47,7 +46,6 @@ RDEPENDS:packagegroup-meta-oe = "\
47 packagegroup-meta-oe-security \ 46 packagegroup-meta-oe-security \
48 packagegroup-meta-oe-shells \ 47 packagegroup-meta-oe-shells \
49 packagegroup-meta-oe-support \ 48 packagegroup-meta-oe-support \
50 ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-support-python2", "", d)} \
51 packagegroup-meta-oe-test \ 49 packagegroup-meta-oe-test \
52 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ 50 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
53 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ 51 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
@@ -914,10 +912,6 @@ RDEPENDS:packagegroup-meta-oe-support:append:aarch64 = " ne10"
914RDEPENDS:packagegroup-meta-oe-support:append:x86 = " mcelog mce-inject mce-test vboxguestdrivers" 912RDEPENDS:packagegroup-meta-oe-support:append:x86 = " mcelog mce-inject mce-test vboxguestdrivers"
915RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = " mcelog mce-inject mce-test vboxguestdrivers" 913RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = " mcelog mce-inject mce-test vboxguestdrivers"
916 914
917RDEPENDS:packagegroup-meta-oe-support-python2 ="\
918 ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'lio-utils', '', d), "", d)} \
919"
920
921RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl" 915RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl"
922RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools" 916RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools"
923RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim" 917RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim"
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
deleted file mode 100644
index 86edcc2e4..000000000
--- a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 2cc2315eecaa48fd24792aaa889dc7d9fb96978b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 20 Mar 2017 22:18:44 -0700
4Subject: [PATCH] Makefiles: Respect environment variables and add LDFLAGS to
5 linker cmdline
6
7Fixes QA errors about GNU_HASH
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 mib-modules/Makefile | 10 +++++-----
14 tools/Makefile | 2 +-
15 2 files changed, 6 insertions(+), 6 deletions(-)
16
17diff --git a/mib-modules/Makefile b/mib-modules/Makefile
18index 0d54c9b..051d4d2 100644
19--- a/mib-modules/Makefile
20+++ b/mib-modules/Makefile
21@@ -17,13 +17,13 @@ TARG = iscsiTargetMib.so
22 OBJS = iscsiTargetMib.o iscsiMib.o scsiMib.o ipsAuthMib.o \
23 iscsiAuthData.o
24
25-CC = gcc
26-CFLAGS = -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
27+CC ?= gcc
28+CFLAGS += -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
29 CFLAGS += -I../include -Wall -Werror
30 #CFLAGS +=$(AUTO_CFLAGS)
31
32-LD = gcc -shared
33-
34+LD ?= gcc
35+LDFLAGS += -shared
36 INSTALL = install
37
38 all: $(TARG)
39@@ -32,7 +32,7 @@ all: $(TARG)
40 $(CC) $(CFLAGS) -o $@ -c $<
41
42 $(TARG): $(OBJS)
43- $(LD) -o $@ $(OBJS)
44+ $(LD) -o $@ $(OBJS) $(LDFLAGS)
45
46 clean:
47 rm -f $(OBJS) $(TARG)
48diff --git a/tools/Makefile b/tools/Makefile
49index 79ed3cd..ffd9bf3 100644
50--- a/tools/Makefile
51+++ b/tools/Makefile
52@@ -6,7 +6,7 @@ ISCSI_NAME_OBJS = $(ISCSI_NAME_SRCS:.c=.o)
53 all:: $(ISCSI_NAME)
54
55 $(ISCSI_NAME): $(ISCSI_NAME_OBJS)
56- $(CC) -o $@ $(CFLAGS) $(ISCSI_NAME_OBJS)
57+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(ISCSI_NAME_OBJS)
58
59 clean:
60 rm -f $(ISCSI_NAME_OBJS) $(ISCSI_NAME)
61--
622.12.0
63
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
deleted file mode 100644
index 844e5acf9..000000000
--- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
+++ /dev/null
@@ -1,75 +0,0 @@
1SUMMARY = "lio-utils"
2DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)"
3HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df"
6
7PV = "4.1+git"
8
9SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \
10 file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \
11 "
12SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e"
13S = "${WORKDIR}/git"
14
15inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)}
16
17EXTRA_OEMAKE += "DESTDIR=${D}"
18
19do_compile() {
20 cd ${S}/tcm-py
21 distutils_do_compile
22
23 cd ${S}/lio-py
24 distutils_do_compile
25
26 if test -d ${S}/tools; then
27 oe_runmake -C ${S}/tools
28 fi
29}
30
31do_install() {
32 cd ${S}/tcm-py
33 distutils_do_install
34
35 cd ${S}/lio-py
36 distutils_do_install
37
38 SITE_PACKAGES=${D}/${PYTHON_SITEPACKAGES_DIR}
39 install -d ${D}/${sbindir}
40 for var in tcm_node tcm_dump tcm_loop tcm_fabric lio_dump lio_node; do
41 if [ ! -h ${D}/${sbindir}/${var} ];then
42 chmod a+x ${SITE_PACKAGES}/${var}.py
43 ln -s ${PYTHON_SITEPACKAGES_DIR}/${var}.py ${D}/${sbindir}/${var}
44 fi
45 done
46
47 if test -d ${S}/tools; then
48 oe_runmake -C ${S}/tools install
49 fi
50
51 install -d ${D}/etc/target/
52 install -d ${D}/etc/init.d/
53 install -m 755 ${S}/scripts/rc.target ${D}/etc/init.d/
54 install -m 755 ${S}/conf/tcm_start.default ${D}/etc/target/tcm_start.sh
55 install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh
56}
57
58SKIP_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)}"
59
60RDEPENDS:${PN} += "python-stringold python-subprocess python-shell \
61 python-datetime python-textutils python-crypt python-netclient python-email \
62 bash"
63
64FILES:${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*"
65
66# http://errors.yoctoproject.org/Errors/Details/184712/
67# python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory
68CLEANBROKEN = "1"
69
70python() {
71 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
72 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
73}
74
75