Skip to contentSkip to conversation

bitbake.conf: add --enable-new-dtags to linker

PATCH New Alexander Kanavin 1 participant 3 messages Jan 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 bitbake.conf: add --enable-new-dtags to linker

Various versions of ld have different defaults for this (even between e.g. Ubuntu 16.04 and 18.04). This has the consequence of putting either RPATH or RUNPATH into the binary, depending on the linker, which have different priorities vs LD_LIBRARY_PATH env var. Also, I think, the original executable binary is looked up for the tags when resolving a dependency of a shared library when using RPATH, but not RUNPATH.

Let's make this deterministic.

---
 meta/conf/bitbake.conf | 1 +
 1 file changed, 1 insertion(+)
meta/conf/bitbake.conf +1 -0
index e64ce6a6dab..68700e9e7cb 100644
@@ -573,6 +573,7 @@ export TARGET_CXXFLAGS = "${TARGET_CFLAGS}"
 
 export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
                         -L${STAGING_BASE_LIBDIR_NATIVE} \
+                        -Wl,--enable-new-dtags \
                         -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} \
                         -Wl,-rpath,${STAGING_LIBDIR_NATIVE} \
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 selftest/distrodata: un-break the upstream version check test

And fix the reported upstream check failures.

---
 meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb | 1 -
 meta/lib/oeqa/selftest/cases/distrodata.py                    | 2 +-
 meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb              | 3 ++-
 meta/recipes-support/libatomic-ops/libatomic-ops_7.6.8.bb     | 1 +
 meta/recipes-support/libpsl/libpsl_0.20.2.bb                  | 2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)
meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb +0 -1
index b377cb76051..6bfc557060a 100644
@@ -9,7 +9,6 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/syslinux-${PV}.tar.x
 
 SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13"
 SRC_URI[sha256sum] = "26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e"
-UPSTREAM_VERSION_UNKNOWN = "1"
 
 S = "${WORKDIR}/syslinux-${PV}"
 
meta/lib/oeqa/selftest/cases/distrodata.py +1 -1
index 248bc7c6a21..0b454714e95 100644
@@ -16,7 +16,7 @@ class Distrodata(OESelftestTestCase):
         Product:     oe-core
         Author:      Alexander Kanavin <[email protected]>
         """
-        feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
+        feature = 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
         self.write_config(feature)
 
         pkgs = oe.recipeutils.get_recipe_upgrade_status()
meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb +2 -1
index 17bc038d671..f978c8c8ab0 100644
@@ -13,7 +13,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
            file://libtirpc-1.0.4-rc1.patch \
            file://musl.patch \
            "
-
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 SRC_URI[md5sum] = "f8403a10695348854e71d525c4db5931"
 SRC_URI[sha256sum] = "86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e"
 
meta/recipes-support/libatomic-ops/libatomic-ops_7.6.8.bb +1 -0
index b40e5671426..8292c3b3120 100644
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     "
 
 SRC_URI = "https://github.com/ivmai/libatomic_ops/releases/download/v${PV}/libatomic_ops-${PV}.tar.gz"
+UPSTREAM_CHECK_URI = "https://github.com/ivmai/libatomic_ops/releases"
 
 SRC_URI[md5sum] = "99128f05e3e3f4e0cd39aa23f23bbe0c"
 SRC_URI[sha256sum] = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"
meta/recipes-support/libpsl/libpsl_0.20.2.bb +2 -0
index b3b0d78a8e3..89a87b67c74 100644
@@ -8,6 +8,8 @@ SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${BP}/${BP}.ta
 SRC_URI[md5sum] = "f604f7d30d64bc673870ecf84b860a1e"
 SRC_URI[sha256sum] = "f8fd0aeb66252dfcc638f14d9be1e2362fdaf2ca86bde0444ff4d5cc961b560f"
 
+UPSTREAM_CHECK_URI = "https://github.com/rockdaboot/libpsl/releases"
+
 DEPENDS = "libidn2"
 
 inherit autotools gettext gtk-doc manpages pkgconfig lib_package
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/3 openssh: use tarballs instead of git

In reply to Alexander Kanavin

This was change to git recently to obtain openssl 1.1 compatible pre-release code (before 7.9 was out), however tarballs are preferred, and with them upstream version checks work (openssh uses a weird git tag scheme).

---
 .../openssh/{openssh_7.9p1+git.bb => openssh_7.9p1.bb}    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
 rename meta/recipes-connectivity/openssh/{openssh_7.9p1+git.bb => openssh_7.9p1.bb} (96%)
meta/recipes-connectivity/openssh/openssh_7.9p1.bb renamed from meta/recipes-connectivity/openssh/openssh_7.9p1+git.bb +3 -5
similarity index 96%
rename from meta/recipes-connectivity/openssh/openssh_7.9p1+git.bb
rename to meta/recipes-connectivity/openssh/openssh_7.9p1.bb
index d79ffe19710..2a23f64b894 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=429658c6612f3a9b1293782366ab29d8"
 DEPENDS = "zlib openssl"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-SRC_URI = "git://github.com/openssh/openssh-portable;branch=master \
+SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://sshd_config \
            file://ssh_config \
            file://init \
@@ -25,13 +25,11 @@ SRC_URI = "git://github.com/openssh/openssh-portable;branch=master \
            file://sshd_check_keys \
            file://add-test-support-for-busybox.patch \
            "
+SRC_URI[md5sum] = "c6af50b7a474d04726a5aa747a5dce8f"
+SRC_URI[sha256sum] = "6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad"
 
 PAM_SRC_URI = "file://sshd"
 
-SRCREV = "aede1c34243a6f7feae2fb2cb686ade5f9be6f3d"
-
-S = "${WORKDIR}/git"
-
 inherit useradd update-rc.d update-alternatives systemd
 
 USERADD_PACKAGES = "${PN}-sshd"
Signature · 1 line
2.17.1