Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb
index a6a3024..8fec89c 100644
--- a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb
+++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb
@@ -4,24 +4,34 @@
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d"
-SRCREV = "803d69203a62faf50f1b77897310a3a1fcae712b"
-PV = "1.18+git${SRCPV}"
+SRCREV = "a53934a3ae1244679f812d998a4f16f2c7f309a6"
+PV = "1.20+git${SRCPV}"
SRC_URI = "git://github.com/google/${BPN}.git \
- file://0001-Explicitly-disable-tcmalloc.patch \
-"
+ file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \
+ file://0002-makefile-build-SHARED_MEMENVLIB.patch \
+ file://0001-Makefile-Fix-parallel-build.patch \
+ "
S = "${WORKDIR}/git"
+inherit utils
+
do_compile() {
# do not use oe_runmake. oe_runmake pass to make compilation arguments and override
# leveldb makefile variable CFLAGS and broke leveldb build.
- CFLAGS="${CFLAGS}" make || die
+ CFLAGS="${CFLAGS}" make ${PARALLEL_MAKE}|| die
}
do_install() {
- install -d ${D}${libdir}
- oe_libinstall -C ${S} -so libleveldb ${D}${libdir}
- install -d ${D}${includedir}/leveldb
+ install -d ${D}${libdir} ${D}${bindir} ${D}${includedir}/leveldb
+ oe_libinstall -C ${B}/out-shared libleveldb ${D}${libdir}
+ oe_libinstall -C ${S}/out-static libleveldb ${D}${libdir}
+ oe_libinstall -C ${S}/out-static libmemenv ${D}${libdir}
+ install -m 0755 ${B}/out-shared/db_bench ${D}${bindir}
+ install -m 0755 ${B}/out-static/*_test ${D}${bindir}
install -m 644 ${S}/include/leveldb/*.h ${D}${includedir}/leveldb/
}
+
+PACKAGES =+ "${PN}-ptest"
+FILES_${PN}-ptest = "${bindir}"