Skip to contentSkip to conversation

add sqlite-orm v1.5

PATCH New Khem Raj 1 participant 5 messages Jan 9, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 add sqlite-orm v1.5

From: hmenn <[email protected]>

---
 .../sqlite-orm/sqlite-orm_1.5.bb              | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb new file +22 -0
new file mode 100644
index 0000000000..4a27e4b2a5
@@ -0,0 +1,22 @@
+SUMMARY = "SQLite ORM light header only library for modern C++"
+HOMEPAGE = "https://github.com/fnc12/sqlite_orm"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5bf5ee8bb16d8e19359efe11bdc3f2"
+
+inherit cmake
+
+DEPENDS += "sqlite3"
+
+SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b"
+SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF"
+
+BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN}-dev += "${libdir}/cmake/${BPN}"
+
+# Header-only library
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
\ No newline at end of file
Signature · 1 line
2.24.1
author
#1 lore raw

PATCH 2/5 cmpi-bindings: Remove the patch to append 'm' suffix to libpython soname

This otherwise fails to build with py3.8

Cc Alexander Kanavin <[email protected]>
---
 ...BI-suffix-to-the-python-library-name.patch | 27 -------------------
 .../cmpi-bindings/cmpi-bindings_1.0.1.bb      |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch deleted +0 -27
deleted file mode 100644
index b2a149b0f4..0000000000
@@ -1,27 +0,0 @@
-From a701ed30ac1bc2f77d063c237d6ae040a2d53f6b Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 16 May 2016 16:52:24 +0300
-Subject: [PATCH] Add 'm' suffix to the python library name.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- swig/python/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
-index 128798b..391cef7 100644
---- a/swig/python/CMakeLists.txt
-+++ b/swig/python/CMakeLists.txt
-@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GENERIC_GNU -DCMPI_VERSION=200)
- SET( NAME pyCmpiProvider )
- ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT})
- #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} )
--TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} )
-+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}m )
- TARGET_LINK_LIBRARIES( ${NAME} pthread )
- TARGET_LINK_LIBRARIES( ${NAME} dl )
- TARGET_LINK_LIBRARIES( ${NAME} util )
--- 
-2.8.1
-
meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +0 -1
index 251c5d0f5a..6e387ae453 100644
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http \
            file://0001-Modify-cmakelist.patch \
            file://0001-Fix-error.patch \
            file://0001-fix-the-build-error-when-python-3.0.patch \
-           file://0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch \
           "
 
 SRCREV = "62f60e065aa1b901f826e4f530c0573ae32d065e"
Signature · 1 line
2.24.1
author
#2 lore raw

PATCH 3/5 python3-jsonrpcserver: Use PYTHON_BASEVERSION instead of hardcoding py version

In reply to Khem Raj
Cc Alexander Kanavin <[email protected]>
---
 .../recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb +1 -1
index ceae6abd8c..a6dcef81de 100644
@@ -23,5 +23,5 @@ RDEPENDS_${PN} += "\
 BBCLASSEXTEND = "native nativesdk"
 
 do_install_append() {
-    chmod 0644 ${D}${PYTHON_SITEPACKAGES_DIR}/jsonrpcserver-4.1.0-py3.7.egg-info/*
+    chmod 0644 ${D}${PYTHON_SITEPACKAGES_DIR}/jsonrpcserver-4.1.0-py${PYTHON_BASEVERSION}.egg-info/*
 }
Signature · 1 line
2.24.1
author
#3 lore raw

PATCH 4/5 smbnetfs: Update to latest 0.6.2 rev

In reply to Khem Raj

Brings in fixes to build with latest xattr
Forward port configure.ac patch
Drop using gitpkgv

Cc Alexander Kanavin <[email protected]>
---
 .../smbnetfs/smbnetfs/configure.patch                    | 8 +++-----
 .../recipes-filesystems/smbnetfs/smbnetfs_git.bb         | 9 ++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)
meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch +3 -5
index 55275669b1..f22b389b1c 100644
@@ -1,9 +1,7 @@
-Index: git/configure.in
-===================================================================
---- git.orig/configure.ac	2014-06-18 16:06:16.040721349 +0000
-+++ git/configure.ac	2014-07-18 07:49:17.085552256 +0000
+--- a/configure.ac
++++ b/configure.ac
 @@ -1,5 +1,5 @@
- AC_INIT([SMBNetFS],[0.6.1])
+ AC_INIT([SMBNetFS],[0.6.2])
 -AM_INIT_AUTOMAKE
 +AM_INIT_AUTOMAKE([foreign])
  AC_CONFIG_HEADERS([src/config.h])
meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +4 -5
index ddb2cc805f..d94603b404 100644
@@ -11,15 +11,14 @@ HOMEPAGE ="http://sourceforge.net/projects/smbnetfs"
 DEPENDS = "fuse samba"
 DEPENDS_append_libc-musl = " libexecinfo"
 
+inherit autotools pkgconfig features_check
+
 # samba depends on libpam
-inherit features_check
 REQUIRED_DISTRO_FEATURES = "pam"
 
-inherit autotools gitpkgv pkgconfig
-
-PKGV = "${GITPKGVTAG}"
+PV = "0.6.1+git${SRCPV}"
 
-SRCREV = "bc6b94b015fdaf7c4dab56ccb996eecea8bc4373"
+SRCREV = "a117eec8de7ed7249871da73dcc350283ce72069"
 
 SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \
            file://configure.patch \
Signature · 1 line
2.24.1
author
#4 lore raw

PATCH 5/5 makedumpfile: Drop linking with libebl

In reply to Khem Raj

This seems to be not needed as link succeeds without this library, moreover this is static-only library in latest elfutils

Cc Alexander Kanavin <[email protected]>
---
 ...ebl-from-required-libraries-during-l.patch | 34 +++++++++++++++++++
 .../makedumpfile/makedumpfile_1.6.6.bb        |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch
meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch new file +34 -0
new file mode 100644
index 0000000000..40956434de
@@ -0,0 +1,34 @@
+From 460851c15e807d1a2515dfb985423f8a6624f4aa Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 8 Jan 2020 19:14:19 -0800
+Subject: [PATCH 3/3] build: Delete libebl from required libraries during link
+
+This is a static library from elfutils, which is not made available when
+static archives are disabled, this can result in link failures e.g.
+
+aarch64-yoe-linux-musl/9.2.0/ld: cannot find -lebl
+collect2: error: ld returned 1 exit status
+Makefile:93: recipe for target 'makedumpfile' failed
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 5dce589..c3a4054 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,7 +51,7 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
+ SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c arch/sparc64.c
+ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
+ 
+-LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
++LIBS = -ldw -lbz2 -ldl -lelf -lz
+ ifneq ($(LINKTYPE), dynamic)
+ LIBS := $(LIBS)
+ endif
+-- 
+2.24.1
+
meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb +1 -0
index 9c357bf6e6..6924e39d60 100644
@@ -24,6 +24,7 @@ SRC_URI = "\
     ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \
     file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
     file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \
+    file://0003-build-Delete-libebl-from-required-libraries-during-l.patch \
 "
 SRC_URI[md5sum] = "6fd632b97ad78d9a0a3b0f0989094064"
 SRC_URI[sha256sum] = "d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324"
Signature · 1 line
2.24.1