Skip to content
This repository has been archived by the owner on Oct 26, 2021. It is now read-only.

Update RVI SOTA Client #48

Merged
merged 4 commits into from Dec 13, 2016
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions meta-genivi-dev/recipes-support/libgit2/libgit2-release.inc
@@ -0,0 +1,2 @@
require libgit2.inc
SRC_URI = "https://github.com/libgit2/libgit2/archive/v${PV}.tar.gz"
19 changes: 19 additions & 0 deletions meta-genivi-dev/recipes-support/libgit2/libgit2.inc
@@ -0,0 +1,19 @@
SUMMARY = "the Git linkable library"
HOMEPAGE = "http://libgit2.github.com/"
LICENSE = "GPL-2.0-with-GCC-exception"

DEPENDS = "openssl zlib"

inherit cmake

# CLAR = tests, needs python-native
EXTRA_OECMAKE = "\
-DTHREADSAFE=ON \
-DBUILD_CLAR=OFF \
-DSHA1_TYPE="builtin" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_SHARED_LIBS=OFF \
-DBUILD_EXAMPLES=OFF \
"

BBCLASSEXTEND = "native"
4 changes: 4 additions & 0 deletions meta-genivi-dev/recipes-support/libgit2/libgit2_0.24.1.bb
@@ -0,0 +1,4 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=34197a479f637beb9e09e56893f48bc2"
SRC_URI[md5sum] = "3674ca2d40388b1175e25b6f5a3a82ad"
SRC_URI[sha256sum] = "60198cbb34066b9b5c1613d15c0479f6cd25f4aef42f7ec515cd1cc13a77fede"
require libgit2-release.inc
2 changes: 2 additions & 0 deletions meta-genivi-dev/recipes-support/libssh2/libssh2_%.bbappend
@@ -0,0 +1,2 @@
# meta-oe/recipes-support/libssh2
BBCLASSEXTEND = "native"
39 changes: 39 additions & 0 deletions meta-genivi-dev/recipes-support/lshw/files/cross-compile.patch
@@ -0,0 +1,39 @@
---
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++
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are not part of this logical change (addition of lshw) even if they are required by lshw recipe. It's OK for now but for future reference, each logical change goes into it's own patch with it's own description and rationale.

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

36 changes: 36 additions & 0 deletions meta-genivi-dev/recipes-support/lshw/lshw_02.16.bb
@@ -0,0 +1,36 @@
# 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"

PR="r1"

SRC_URI="http://ezix.org/software/files/lshw-B.${PV}.tar.gz \
file://cross-compile.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
}