From efbbb8dfffc65cbcc6e1ca5c502b5b6a08c7433e Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Tue, 25 Jun 2024 12:20:48 -0400 Subject: [PATCH] libee: remove recipe since libee is obsolete libee had been used by rsyslog but the library never relly panned out. It has been declared to be obsolete: Early versions of rsyslog and liblognorm used it for representing structured content. However, this is long gone. We do not know of any other user. So libee should be of no further interest and is provided here solely for historical reasons. https://github.com/rsyslog/libee Also remove references to libee in: meta-oe/conf/include/ptest-packagelists-meta-oe.inc meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb Signed-off-by: Randy MacLeod Signed-off-by: Khem Raj --- .../include/ptest-packagelists-meta-oe.inc | 1 - .../packagegroups/packagegroup-meta-oe.bb | 2 - meta-oe/recipes-support/libee/libee.inc | 39 ------------------- meta-oe/recipes-support/libee/libee/ezapi1.sh | 14 ------- .../libee/libee/libee-parallel-make.patch | 20 ---------- meta-oe/recipes-support/libee/libee/run-ptest | 3 -- meta-oe/recipes-support/libee/libee_0.4.1.bb | 4 -- 7 files changed, 83 deletions(-) delete mode 100644 meta-oe/recipes-support/libee/libee.inc delete mode 100755 meta-oe/recipes-support/libee/libee/ezapi1.sh delete mode 100644 meta-oe/recipes-support/libee/libee/libee-parallel-make.patch delete mode 100755 meta-oe/recipes-support/libee/libee/run-ptest delete mode 100644 meta-oe/recipes-support/libee/libee_0.4.1.bb diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index eaa86c411b..01bf975a15 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -17,7 +17,6 @@ PTESTS_FAST_META_OE = "\ jq \ leveldb \ libcereal \ - libee \ libgpiod \ libio-pty-perl \ libmanette \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index bc40f56b99..e11afcd4e5 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -811,7 +811,6 @@ RDEPENDS:packagegroup-meta-oe-support ="\ libcanberra \ libssh \ libssh2 \ - libee \ libusbgx-config \ libusbgx \ lockdev \ @@ -972,7 +971,6 @@ RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ oprofile-ptest \ libteam-ptest \ uthash-ptest \ - libee-ptest \ poco-ptest \ cmocka-ptest \ minicoredumper-ptest \ diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc deleted file mode 100644 index 592109b951..0000000000 --- a/meta-oe/recipes-support/libee/libee.inc +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "An Event Expression Library inspired by CEE" -DESCRIPTION = "The core idea of libee is to provide a small \ -but hopefully convenient API layer above the CEE standard." - -HOMEPAGE = "http://www.libee.org" -SECTION = "base" - -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6" - -SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\ - file://libee-parallel-make.patch \ - file://run-ptest \ - file://ezapi1.sh \ -" - -inherit autotools ptest pkgconfig - -DEPENDS += "libestr" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}" - -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," -PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," - -TESTDIR = "tests" - -# We presume the tests we are going to install so just build them directly. -# -do_compile_ptest() { - oe_runmake -C ${TESTDIR} genfile ezapi1 -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} - install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} - install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH} -} diff --git a/meta-oe/recipes-support/libee/libee/ezapi1.sh b/meta-oe/recipes-support/libee/libee/ezapi1.sh deleted file mode 100755 index e9db5e614b..0000000000 --- a/meta-oe/recipes-support/libee/libee/ezapi1.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -echo --------------------------------------------------------------------------- -echo A very basic test for the event class -echo --------------------------------------------------------------------------- -rm -f infile -./genfile 100 > infile -./ezapi1 -iinfile -if [ $? -ne 0 ] ; then - echo "FAIL: $0" - exit 1 -fi -echo "PASS: $0" -rm -f infile diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch deleted file mode 100644 index 8bb23aafca..0000000000 --- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix parallel compiling problem - -without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert -can't find libee.la when linking as libee is not generated yet. - -Upstream-Status: Pending - -Signed-off-by: Yao Zhao ---- -diff --git a/src/Makefile.am b/src/Makefile.am -index 08aaa9e..f0c78f7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -46,5 +46,6 @@ libee_la_LDFLAGS = -version-info 0:0:0 - libee_convert_SOURCES = convert.c - libee_convert_CPPFLAGS = -I$(top_srcdir) $(LIBEE_CFLAGS) $(LIBESTR_CFLAGS) $(LIBXML2_CFLAGS) - libee_convert_LDADD = $(LIBEE_LIBS) $(LIBXML2_LIBS) $(LIBESTR_LIBS) -+libee_convert_DEPENDENCIES = libee.la - - include_HEADERS = diff --git a/meta-oe/recipes-support/libee/libee/run-ptest b/meta-oe/recipes-support/libee/libee/run-ptest deleted file mode 100755 index 3cb6607645..0000000000 --- a/meta-oe/recipes-support/libee/libee/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# -./ezapi1.sh diff --git a/meta-oe/recipes-support/libee/libee_0.4.1.bb b/meta-oe/recipes-support/libee/libee_0.4.1.bb deleted file mode 100644 index ef2c20db5a..0000000000 --- a/meta-oe/recipes-support/libee/libee_0.4.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${BPN}.inc - -SRC_URI[md5sum] = "7bbf4160876c12db6193c06e2badedb2" -SRC_URI[sha256sum] = "c0dac01938593deee06c3d161e4eda4ecc0fd7317e1321bd96e301aceb7fb027"