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