diff options
author | Anton Gerasimov <anton@advancedtelematic.com> | 2017-04-24 13:59:21 +0200 |
---|---|---|
committer | Anton Gerasimov <anton@advancedtelematic.com> | 2017-04-24 13:59:21 +0200 |
commit | abe6250af91c4b3193511f4dd5fbfb7ee40d76d5 (patch) | |
tree | 040bcd7509accf453145b2c0c77b06d8e35a13e9 /meta-sota/recipes-support/lshw | |
parent | e4bc8c7058fbf27969a967a5e30f15fcf22544bd (diff) |
Wipe out sota-related codeeel_4.99.3eel_4.99.2eel_4.99.1eel/4.99.3eel/4.99.2eel/4.99.1dab_3.99.1dab/3.99.14.99.34.99.24.99.13.99.1
Moved to meta-updater@github.com/advancedtelenmatic
Change-Id: I7c89d373e43a88a89155c72de87c0b4b5238bc52
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Diffstat (limited to 'meta-sota/recipes-support/lshw')
-rw-r--r-- | meta-sota/recipes-support/lshw/files/cross-compile.patch | 39 | ||||
-rw-r--r-- | meta-sota/recipes-support/lshw/files/ldflags.patch | 42 | ||||
-rw-r--r-- | meta-sota/recipes-support/lshw/lshw_02.16.bb | 36 |
3 files changed, 0 insertions, 117 deletions
diff --git a/meta-sota/recipes-support/lshw/files/cross-compile.patch b/meta-sota/recipes-support/lshw/files/cross-compile.patch deleted file mode 100644 index 221b7e5..0000000 --- a/meta-sota/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/meta-sota/recipes-support/lshw/files/ldflags.patch b/meta-sota/recipes-support/lshw/files/ldflags.patch deleted file mode 100644 index 83e0410..0000000 --- a/meta-sota/recipes-support/lshw/files/ldflags.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur /home/anton/lshw-old/src/Makefile lshw-B.02.16/src/Makefile ---- /home/anton/lshw-old/src/Makefile 2017-02-07 16:21:52.554738182 +0100 -+++ lshw-B.02.16/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/meta-sota/recipes-support/lshw/lshw_02.16.bb b/meta-sota/recipes-support/lshw/lshw_02.16.bb deleted file mode 100644 index 99901ff..0000000 --- a/meta-sota/recipes-support/lshw/lshw_02.16.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=94d55d512a9ba36caa9b7df079bae19f" -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] = "67479167add605e8f001097c30e96d0d" -SRC_URI[sha256sum] = "809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb" - -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 -} |