From eca87bf2b427e98179d09d131306b9ca4047bd4f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 8 Jan 2019 16:25:28 +0100 Subject: selftest/distrodata: un-break the upstream version check test And fix the reported upstream check failures. (From OE-Core rev: 63af0edcd954fac530ba17b04e5df5837cddc0a4) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- 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(-) diff --git a/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb b/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb index b377cb7605..6bfc557060 100644 --- a/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb +++ b/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb @@ -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}" diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py index 248bc7c6a2..0b454714e9 100644 --- a/meta/lib/oeqa/selftest/cases/distrodata.py +++ b/meta/lib/oeqa/selftest/cases/distrodata.py @@ -16,7 +16,7 @@ class Distrodata(OESelftestTestCase): Product: oe-core Author: Alexander Kanavin """ - feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n' + feature = 'LICENSE_FLAGS_WHITELIST += " commercial"\n' self.write_config(feature) pkgs = oe.recipeutils.get_recipe_upgrade_status() diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb index 17bc038d67..f978c8c8ab 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.3.bb @@ -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\d+(\.\d+)+)/" SRC_URI[md5sum] = "f8403a10695348854e71d525c4db5931" SRC_URI[sha256sum] = "86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e" diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.8.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.8.bb index b40e567142..8292c3b312 100644 --- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.8.bb +++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.8.bb @@ -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" diff --git a/meta/recipes-support/libpsl/libpsl_0.20.2.bb b/meta/recipes-support/libpsl/libpsl_0.20.2.bb index b3b0d78a8e..89a87b67c7 100644 --- a/meta/recipes-support/libpsl/libpsl_0.20.2.bb +++ b/meta/recipes-support/libpsl/libpsl_0.20.2.bb @@ -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 -- cgit v1.2.3-54-g00ecf