libgnome-keyring: Force ARM ISA on arm arches <= v5

PATCH New Khem Raj 1 participant 5 messages Jul 17, 2018

Share & tools

Khem Raj

author

2018-07-17 01:51 UTC #0 lore raw

PATCH 1/1 libgnome-keyring: Force ARM ISA on arm arches <= v5

when global ISA is selected to be thumb then the build fails since it will use thumb1 on these machines and fails to compile, it however compiles fine with armv7+ with thumb2 hence limit the fix to armv4/armv5

Signed-off-by Khem Raj <[email protected]>

---
 .../gnome-keyring/libgnome-keyring_3.12.0.bb         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb +12 -0

index 82abe33491..ba69e2e0cd 100644
@@ -15,3 +15,15 @@ DEPENDS = "dbus libgcrypt glib-2.0 glib-2.0-native intltool-native"
 
 SRC_URI[archive.md5sum] = "6696e4f2e9aed4625cdc3af30bd8c238"
 SRC_URI[archive.sha256sum] = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"
+
+
+# Fails to build with thumb-1 (qemuarm)
+#| {standard input}: Assembler messages:
+#| {standard input}:823: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#3'
+#| {standard input}:823: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#13'
+#| {standard input}:824: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#29'
+#| {standard input}:824: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#19'
+#| {standard input}:825: Error: lo register required -- `orr r10,r10,r10'
+ARM_INSTRUCTION_SET_armv5 = "arm"
+ARM_INSTRUCTION_SET_armv4 = "arm"
+

Signature · 1 line

2.18.0

Khem Raj

author

2018-07-17 01:51 UTC #1 lore raw

PATCH 1/4 volume-key: Upgrade to 0.3.10

Add dependency on swig-native which was missing

Signed-off-by Khem Raj <[email protected]>

---
 ...icitly-support-python3-by-pkg-config.patch | 26 +++++++++----------
 ...lume-key_0.3.9.bb => volume-key_0.3.10.bb} |  5 ++--
 2 files changed, 15 insertions(+), 16 deletions(-)
 rename meta-oe/recipes-extended/volume_key/{volume-key_0.3.9.bb => volume-key_0.3.10.bb} (84%)

meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch +12 ~~-14~~

index 03edb13909..7fc76ab2f9 100644
@@ -1,4 +1,4 @@
-From 18415c0b4c6e50ed9b99dfdae8d210590d0ab72e Mon Sep 17 00:00:00 2001
+From 968c7506bea3b8d66e18a562d8b8491172631b37 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Fri, 28 Apr 2017 04:50:30 -0400
 Subject: [PATCH] explicitly support python3 by pkg-config

@@ -9,13 +9,14 @@ use pkg-config to replace
 Upstream-Status: Inappropriate [wr-installer specific]
 
 Signed-off-by: Hongxu Jia <[email protected]>
+
 ---
  Makefile.am  | 5 ++---
  configure.ac | 2 ++
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 4569bbf..7a8daf4 100644
+index 68560b1..ee2b4dc 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -20,7 +20,6 @@ ACLOCAL_AMFLAGS = -I m4

@@ -39,18 +40,15 @@ index 4569bbf..7a8daf4 100644
  
  src_volume_key_SOURCES = src/volume_key.c
 diff --git a/configure.ac b/configure.ac
-index ff35dd0..0928a6c 100644
+index 40c3906..16c067d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -27,6 +27,8 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz no-define subdir-objects -Wall])
- AC_PROG_CC
- AM_PROG_CC_C_O
- LT_INIT([disable-static])
-+
-+PKG_CHECK_MODULES(python3, [python3])
- AM_PATH_PYTHON
+@@ -31,6 +31,8 @@ LT_INIT([disable-static])
+ AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2 python, [Python is required])
+ AM_PATH_PYTHON([2.6], [], AC_MSG_ERROR([Python 2.6 or 2.7 is required]))
  
- dnl Not gpg2, it cannot receive passphrases from gpgme
--- 
-2.8.1
-
++PKG_CHECK_MODULES(python3, [python3])
++
+ AC_PATH_PROG([GPG], [gpg2])
+ AC_ARG_VAR([GPG])
+ AC_DEFINE_UNQUOTED([GPG_PATH], "$GPG", [Path to the gpg2 executable])

meta-oe/recipes-extended/volume_key/volume-key_0.3.10.bb renamed from meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb +3 -2

similarity index 84%
rename from meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb
rename to meta-oe/recipes-extended/volume_key/volume-key_0.3.10.bb
index febf3f256d..e8d20553fb 100644
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \
            file://0001-explicitly-support-python3-by-pkg-config.patch \
 "
-SRC_URI[md5sum] = "a2d14931177c660e1f3ebbcf5f47d8e2"
-SRC_URI[sha256sum] = "450a54fe9bf56acec6850c1e71371d3e4913c9ca1ef0cdc3a517b4b6910412a6"
+SRC_URI[md5sum] = "605fd99a6e42916728020562a6edee78"
+SRC_URI[sha256sum] = "c5729de7e33e39c8674e9aae2337d2719f9298d6499f1656d0d25a065a7e98a7"
 
 SRCNAME = "volume_key"
 S = "${WORKDIR}/${SRCNAME}-${PV}"

@@ -25,6 +25,7 @@ DEPENDS += " \
     cryptsetup \
     nss \
     gpgme \
+    swig-native \
 "
 
 RDEPENDS_python3-${PN} += "${PN}"

Signature · 1 line

2.18.0

Khem Raj

author

2018-07-17 01:51 UTC #2 lore raw

PATCH 2/4 mbedtls: Upgrade to 2.11.0

In reply to Khem Raj

- Use libs section, libdevel is not common

Signed-off-by Khem Raj <[email protected]>

---
 .../mbedtls/{mbedtls_2.9.0.bb => mbedtls_2.11.0.bb}         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-networking/recipes-connectivity/mbedtls/{mbedtls_2.9.0.bb => mbedtls_2.11.0.bb} (91%)

meta-networking/recipes-connectivity/mbedtls/mbedtls_2.11.0.bb renamed from meta-networking/recipes-connectivity/mbedtls/mbedtls_2.9.0.bb +3 -3

similarity index 91%
rename from meta-networking/recipes-connectivity/mbedtls/mbedtls_2.9.0.bb
rename to meta-networking/recipes-connectivity/mbedtls/mbedtls_2.11.0.bb
index ee4f164a4b..71b1f80238 100644
@@ -20,12 +20,12 @@ HOMEPAGE = "https://tls.mbed.org/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=302d50a6369f5f22efdb674db908167a"
 
-SECTION = "libdevel"
+SECTION = "libs"
 
 SRC_URI = "https://tls.mbed.org/download/mbedtls-${PV}-apache.tgz"
 
-SRC_URI[md5sum] = "31dcf56cb92da5d7ec2dbb7a3cc5dff3"
-SRC_URI[sha256sum] = "a06a9b43e583b7e6707becfeeb13d88ed00f25fee31a5386cb3a3014c454bad8"
+SRC_URI[md5sum] = "3b133b9b4cf0ccf3ac1c91436771bfa5"
+SRC_URI[sha256sum] = "2a87061ad770e6d019b3b9cd27ea42a58bd0affccc4c6bfe4f5f0eee9ebf8aa8"
 
 inherit cmake

Signature · 1 line

2.18.0

Khem Raj

author

2018-07-17 01:51 UTC #3 lore raw

PATCH 3/4 blueman: Package orphan'ed files when systemd is enabled

In reply to Khem Raj

Fixes

ERROR: blueman-2.0.5+gitAUTOINC+c4a03417e8-r0 do_package: QA Issue: blueman: Files/directories were installed but not shipped in any package:
/usr/lib/systemd/system
/usr/lib/systemd/system/blueman-mechanism.service

Signed-off-by Khem Raj <[email protected]>

---
 meta-oe/recipes-connectivity/blueman/blueman_git.bb | 1 +
 1 file changed, 1 insertion(+)

meta-oe/recipes-connectivity/blueman/blueman_git.bb +1 -0

index 884e9859a1..f479386c14 100644
@@ -34,6 +34,7 @@ FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/Thunar \
     ${systemd_user_unitdir} \
+    ${exec_prefix}${systemd_system_unitdir} \
     ${PYTHON_SITEPACKAGES_DIR} \
 "

Signature · 1 line

2.18.0

Khem Raj

author

2018-07-17 01:51 UTC #4 lore raw

PATCH 4/4 rsyslog: Disable valgrind support on risv64

In reply to Khem Raj

valgrind is not yet working on risc-v arch

Signed-off-by Khem Raj <[email protected]>

---
 meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | 1 +
 1 file changed, 1 insertion(+)

meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb +1 -0

index d65a2be889..386ad32101 100644
@@ -149,5 +149,6 @@ VALGRIND_mips64 = ""
 VALGRIND_mips64n32 = ""
 VALGRIND_arm = ""
 VALGRIND_aarch64 = ""
+VALGRIND_riscv64 = ""
 RDEPENDS_${PN}-ptest += "make diffutils gzip bash gawk coreutils procps"
 RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}"

Signature · 1 line

2.18.0