Merge pull request #785 from ricardosalveti/sync-dunfell

Sync recipe/append removals from the dunfell branch

6 files changed, 0 insertions, 146 deletions

diff --git a/recipes-support/gpgme/gpgme_%.bbappend b/recipes-support/gpgme/gpgme_%.bbappend
deleted file mode 100644
index fccb949..0000000
--- a/recipes-support/gpgme/gpgme_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND_append_sota = " native"
diff --git a/recipes-support/libssh2/libssh2_%.bbappend b/recipes-support/libssh2/libssh2_%.bbappend
deleted file mode 100644
index bebaf84..0000000
--- a/recipes-support/libssh2/libssh2_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# meta-oe/recipes-support/libssh2
-BBCLASSEXTEND_append_sota = " native"
diff --git a/recipes-support/lshw/files/cross-compile.patch b/recipes-support/lshw/files/cross-compile.patch
deleted file mode 100644
index 221b7e5..0000000
--- a/recipes-support/lshw/files/cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
----
- src/Makefile      |    2 +-
- src/core/Makefile |    2 +-
- src/gui/Makefile  |    4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,7 +18,7 @@ export MANDIR
- export DATADIR
- export SQLITE
- 
--CXX?=c++
-+CXX?=$(CROSS_COMPILE)c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
---- a/src/core/Makefile
-+++ b/src/core/Makefile
-@@ -1,6 +1,6 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=$(CROSS_COMPILE)c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
---- a/src/gui/Makefile
-+++ b/src/gui/Makefile
-@@ -1,7 +1,7 @@
- PACKAGENAME?=lshw
- 
--CXX?=c++
--CC?=cc
-+CXX?=$(CROSS_COMPILE)c++
-+CC?=$(CROSS_COMPILE)cc
- STRIP?=strip
- OBJCOPY?=objcopy
- 
diff --git a/recipes-support/lshw/files/ldflags.patch b/recipes-support/lshw/files/ldflags.patch
deleted file mode 100644
index d95699d..0000000
--- a/recipes-support/lshw/files/ldflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur /home/anton/lshw-old/src/Makefile lshw-B.02.17/src/Makefile
---- /home/anton/lshw-old/src/Makefile   2017-02-07 16:21:52.554738182 +0100
-+++ lshw-B.02.17/src/Makefile   2017-02-07 16:22:45.578588072 +0100
-@@ -25,9 +25,9 @@
- ifeq ($(SQLITE), 1)
-        CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDEXTRAS=-L./core/ -g
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
--       LDFLAGS+= -Wl,--as-needed
-+       LDEXTRAS+= -Wl,--as-needed
- endif
- LDSTATIC=-static
- LIBS=-llshw -lresolv
-@@ -37,7 +37,7 @@
- 
- export CXXFLAGS
- export LIBS
--export LDFLAGS
-+export LDEXTRAS
- 
- DATAFILES = pci.ids usb.ids oui.txt manuf.txt
- 
-@@ -51,7 +51,7 @@
-        +make -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
--       $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-+       $(CXX) $(LDFLAGS) ${LDEXTRAS} -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
-@@ -69,7 +69,7 @@
- static: $(PACKAGENAME)-static
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
--       $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-+       $(CXX) $(LDSTATIC) $(LDFLAGS) ${LDEXTRAS} -o $@ $(PACKAGENAME).o $(LIBS)
-        $(STRIP) $@
- 
- .PHONY: compressed
diff --git a/recipes-support/lshw/lshw_02.17.bb b/recipes-support/lshw/lshw_02.17.bb
deleted file mode 100644
index 1ecc4c1..0000000
--- a/recipes-support/lshw/lshw_02.17.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-# From meta-linaro
-# http://git.linaro.org/openembedded/meta-linaro.git
-
-DESCRIPTION = "A small tool to provide detailed information on the hardware \
-configuration of the machine. It can report exact memory configuration, \
-firmware version, mainboard configuration, CPU version and speed, cache \
-configuration, bus speed, etc. on DMI-capable or EFI systems."
-SUMMARY = "Hardware lister"
-HOMEPAGE = "http://ezix.org/project/wiki/HardwareLiSter"
-SECTION = "console/tools"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "pciutils \
-    usbutils"
-COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
-
-SRC_URI="http://ezix.org/software/files/lshw-B.${PV}.tar.gz \
-    file://cross-compile.patch \
-    file://ldflags.patch \
-    "
-
-SRC_URI[md5sum] = "a5feb796cb302850eaf5b4530888e3ed"
-SRC_URI[sha256sum] = "eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c"
-
-S="${WORKDIR}/lshw-B.${PV}"
-
-do_compile() {
-    # build core only - don't ship gui
-    oe_runmake -C src core
-}
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-    # data files provided by dependencies
-    rm -rf ${D}/usr/share/lshw
-}
diff --git a/recipes-support/softhsm/softhsm_git.bb b/recipes-support/softhsm/softhsm_git.bb
deleted file mode 100644
index 4dcfe7d..0000000
--- a/recipes-support/softhsm/softhsm_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "HSM emulator"
-HOMEPAGE = "https://www.opendnssec.org/softhsm/"
-LICENSE = "BSD-2-Clause & ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210"
-
-DEPENDS = "openssl"
-
-SRC_URI = "git://github.com/opendnssec/SoftHSMv2.git;branch=master"
-SRCREV = "369df0383d101bc8952692c2a368ac8bc887d1b4"
-
-PV = "2.5.0"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-# EdDSA requires OpenSSL >= 1.1.1
-EXTRA_OECONF = "--enable-eddsa --disable-gost"
-
-do_configure_prepend() {
-    (
-        cd ${S}
-        unset docdir
-        sh ./autogen.sh
-    )
-}