[PATCH 1/8] db: fix upstream version check

[PATCH 1/8] db: fix upstream version check

[Alexander Kanavin]

The new regex excludes the 5.3.28+dfsg1 which is a Debian
repackaging of the original tarball:

* Repack the .orig tarball to eliminate prebuilt binaries that need a
    Visual Studio plugin to build from source. (Closes: #898215)

https://metadata.ftp-master.debian.org/changelogs/main/d/db5.3/unstable_changelog

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-support/db/db_5.3.28.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb
index 46536efe86f..8975647daf4 100644
--- a/meta/recipes-support/db/db_5.3.28.bb
+++ b/meta/recipes-support/db/db_5.3.28.bb
@@ -30,7 +30,7 @@ SRC_URI += "file://fix-parallel-build.patch \
 # We are not interested in official latest 6.x versions;
 # let's track what debian is using.
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/db5.3/"
-UPSTREAM_CHECK_REGEX = "db5\.3_(?P<pver>.+)\.orig"
+UPSTREAM_CHECK_REGEX = "db5\.3_(?P<pver>\d+(\.\d+)+).+\.orig"
 
 SRC_URI[md5sum] = "b99454564d5b4479750567031d66fe24"
 SRC_URI[sha256sum] = "e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628"
-- 
2.17.1

[PATCH 2/8] syslinux: fix upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
index a7fc21e2fc1..67e5d57d48e 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
@@ -26,6 +26,10 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz
 SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec"
 SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94"
 
+UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/"
+UPSTREAM_CHECK_REGEX = "syslinux-(?P<pver>.+)\.tar"
+UPSTREAM_VERSION_UNKNOWN = "1"
+
 COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
 # Don't let the sanity checker trip on the 32 bit real mode BIOS binaries
 INSANE_SKIP_${PN}-misc = "arch"
-- 
2.17.1

[PATCH 3/8] blktool: update to 4-7.1

[Alexander Kanavin]

This update adds a patch from Debian to match the latest version there.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../blktool/0004-fix-ftbfs-glibc-2.28.patch   | 19 +++++++++++++++++++
 .../{blktool_4-7.bb => blktool_4-7.1.bb}      |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
 rename meta/recipes-extended/blktool/{blktool_4-7.bb => blktool_4-7.1.bb} (96%)

diff --git a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
new file mode 100644
index 00000000000..65bca651000
--- /dev/null
+++ b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
@@ -0,0 +1,19 @@
+Description: Fix FTBFS with glibc 2.28
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/917055
+
+This patch is taken from
+http://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.1.debian.tar.xz
+
+Upstream-Status: Inappropriate [upstream is dead]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+--- blktool-4.orig/blktool.c
++++ blktool-4/blktool.c
+@@ -18,6 +18,7 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <getopt.h>
diff --git a/meta/recipes-extended/blktool/blktool_4-7.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb
similarity index 96%
rename from meta/recipes-extended/blktool/blktool_4-7.bb
rename to meta/recipes-extended/blktool/blktool_4-7.1.bb
index 0e6f7ee6df1..cc24d3cdb24 100644
--- a/meta/recipes-extended/blktool/blktool_4-7.bb
+++ b/meta/recipes-extended/blktool/blktool_4-7.1.bb
@@ -13,6 +13,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/
            file://0001-fix-typos-in-manpage.patch \
            file://0002-fix-string-error.patch \
            file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
+           file://0004-fix-ftbfs-glibc-2.28.patch \
            file://blktool-gnulib-makedev.patch \
           "
 
-- 
2.17.1

Re: [PATCH 3/8] blktool: update to 4-7.1

[Adrian Bunk]

On Wed, Mar 27, 2019 at 03:09:17PM +0100, Alexander Kanavin wrote:
> This update adds a patch from Debian to match the latest version there.
>...
> +           file://0004-fix-ftbfs-glibc-2.28.patch \
>             file://blktool-gnulib-makedev.patch \
>...

That's 2 patches adding the same #include.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [PATCH 3/8] blktool: update to 4-7.1

[Alexander Kanavin]

Right, I have sent a followup removing the duplicate.

Alex


On Wed, 27 Mar 2019 at 15:51, Adrian Bunk <bunk@stusta.de> wrote:
>
> On Wed, Mar 27, 2019 at 03:09:17PM +0100, Alexander Kanavin wrote:
> > This update adds a patch from Debian to match the latest version there.
> >...
> > +           file://0004-fix-ftbfs-glibc-2.28.patch \
> >             file://blktool-gnulib-makedev.patch \
> >...
>
> That's 2 patches adding the same #include.
>
> cu
> Adrian
>
> --
>
>        "Is there not promise of rain?" Ling Tan asked suddenly out
>         of the darkness. There had been need of rain for many days.
>        "Only a promise," Lao Er said.
>                                        Pearl S. Buck - Dragon Seed
>

[PATCH 4/8] bmap-tools: fix upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-support/bmap-tools/bmap-tools_3.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb b/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
index a3f77d374f7..7c4db85b32c 100644
--- a/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
+++ b/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
@@ -15,7 +15,7 @@ SRCREV = "db7087b883bf52cbff063ad17a41cc1cbb85104d"
 S = "${WORKDIR}/git"
 PV .= "+git${SRCPV}"
 
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six"
 
-- 
2.17.1

[PATCH 5/8] sysklogd: switch SRC_URI to the new, maintained location

[Alexander Kanavin]

The previous SRC_URI seems to be gone, and sysklogd hasn't received
any updates there for a long time.

The new location says:

Origin & References

This is the continuation of the original sysklogd by Martin Schulze.
Now maintained by Joachim Nilsson. Please file bug reports, or send
pull requests for bug fixes and proposed extensions at GitHub.

and generally seems credible: http://troglobit.com/

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-extended/sysklogd/sysklogd.inc      | 3 ++-
 meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index f151dd87f78..749026f8533 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
 
 inherit update-rc.d update-alternatives systemd
 
-SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
+SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
            file://no-strip-install.patch \
            file://0001-Fix-build-with-musl.patch \
            file://0001-fix-problems-that-causes-a-segmentation-fault-under-.patch \
@@ -24,6 +24,7 @@ SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar
            file://klogd.service \
            file://tmpfiles.sysklogd.conf \
            "
+S = "${WORKDIR}/git"
 
 SRC_URI_append_e500v2 = " file://no-vectorization.patch"
 
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
index 975ecc2b633..88bcfd9e4a0 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
@@ -1,4 +1,3 @@
 require sysklogd.inc
 
-SRC_URI[md5sum] = "c70599ab0d037fde724f7210c2c8d7f8"
-SRC_URI[sha256sum] = "5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201"
+SRCREV = "930a2b1c0d15b14309a49f14e3f30e905456af4d"
-- 
2.17.1

[PATCH 6/8] binutils: fix upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/binutils/binutils-2.32.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-devtools/binutils/binutils-2.32.inc b/meta/recipes-devtools/binutils/binutils-2.32.inc
index 74239868151..15406441241 100644
--- a/meta/recipes-devtools/binutils/binutils-2.32.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.32.inc
@@ -14,6 +14,11 @@ def binutils_branch_version(d):
     pvsplit = d.getVar('PV').split('.')
     return pvsplit[0] + "_" + pvsplit[1]
 
+# Actual upstream version is 2.32 (without the .0), so we have to set
+# UPSTREAM_VERSION_UNKNOWN to avoid the version check failure. The line can
+# be removed when a new version of binutils is released (if the PV is then
+# correctly set to match the upstream version tag).
+UPSTREAM_VERSION_UNKNOWN = "1"
 PV = "2.32.0"
 BINUPV = "${@binutils_branch_version(d)}"
 #BRANCH = "binutils-${BINUPV}-branch"
-- 
2.17.1

Re: [PATCH 6/8] binutils: fix upstream version check

[ChenQi]

Hi Alexander,

I just sent out a patch to change the PV to "2.32".
If it's 2.32, does this var still needs to be set?

Best Regards,
Chen Qi

On 03/27/2019 10:09 PM, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>   meta/recipes-devtools/binutils/binutils-2.32.inc | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/meta/recipes-devtools/binutils/binutils-2.32.inc b/meta/recipes-devtools/binutils/binutils-2.32.inc
> index 74239868151..15406441241 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.32.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.32.inc
> @@ -14,6 +14,11 @@ def binutils_branch_version(d):
>       pvsplit = d.getVar('PV').split('.')
>       return pvsplit[0] + "_" + pvsplit[1]
>   
> +# Actual upstream version is 2.32 (without the .0), so we have to set
> +# UPSTREAM_VERSION_UNKNOWN to avoid the version check failure. The line can
> +# be removed when a new version of binutils is released (if the PV is then
> +# correctly set to match the upstream version tag).
> +UPSTREAM_VERSION_UNKNOWN = "1"
>   PV = "2.32.0"
>   BINUPV = "${@binutils_branch_version(d)}"
>   #BRANCH = "binutils-${BINUPV}-branch"

Re: [PATCH 6/8] binutils: fix upstream version check

[Alexander Kanavin]

On Thu, 28 Mar 2019 at 13:06, ChenQi <Qi.Chen@windriver.com> wrote:
> I just sent out a patch to change the PV to "2.32".
> If it's 2.32, does this var still needs to be set?

No, it does not need to be set then, but changing PV to 2.32 is
otherwise problematic - see my other email I just sent.

Alex

[PATCH 7/8] llvm: update from 8.0.0rc2 to 8.0.0 final release

[Alexander Kanavin]

Also, update PV to match the version scheme used by upstream
to tag releases (e.g. major.minor.patch).

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/llvm/llvm_git.bb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index d2ea927651d..d1832e03f71 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,18 +19,14 @@ PROVIDES += "llvm${PV}"
 LLVM_RELEASE = "${PV}"
 LLVM_DIR = "llvm${LLVM_RELEASE}"
 
-# SRCREV is set to the revision of 8.0.0-rc2 tag, while latest release
-# tag is 7.0.1 as of Feb 18 2019, hence the need for UPSTREAM_CHECK_UNKNOWN
-# Remove the UPSTREAM_VERSION_UNKNOWN line once 8.0.0 final is tagged
-UPSTREAM_VERSION_UNKNOWN = "1"
-SRCREV = "98ebe7460199b9cd79eb562b5e8705ad28f5513f"
+SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59"
 
 BRANCH = "release/${MAJOR_VERSION}.x"
 MAJOR_VERSION = "8"
 MINOR_VERSION = "0"
 PATCH_VERSION = "0"
 SOLIBVER = "1"
-PV = "${MAJOR_VERSION}.${MINOR_VERSION}"
+PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
 SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
            file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
            file://0002-llvm-allow-env-override-of-exe-path.patch \
-- 
2.17.1

Re: [PATCH 7/8] llvm: update from 8.0.0rc2 to 8.0.0 final release

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2345 bytes --]

On Wed, Mar 27, 2019 at 03:09:21PM +0100, Alexander Kanavin wrote:
> Also, update PV to match the version scheme used by upstream
> to tag releases (e.g. major.minor.patch).
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/recipes-devtools/llvm/llvm_git.bb | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
> index d2ea927651d..d1832e03f71 100644
> --- a/meta/recipes-devtools/llvm/llvm_git.bb
> +++ b/meta/recipes-devtools/llvm/llvm_git.bb
> @@ -19,18 +19,14 @@ PROVIDES += "llvm${PV}"
>  LLVM_RELEASE = "${PV}"
>  LLVM_DIR = "llvm${LLVM_RELEASE}"
>  
> -# SRCREV is set to the revision of 8.0.0-rc2 tag, while latest release
> -# tag is 7.0.1 as of Feb 18 2019, hence the need for UPSTREAM_CHECK_UNKNOWN
> -# Remove the UPSTREAM_VERSION_UNKNOWN line once 8.0.0 final is tagged
> -UPSTREAM_VERSION_UNKNOWN = "1"
> -SRCREV = "98ebe7460199b9cd79eb562b5e8705ad28f5513f"
> +SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59"

Are you intentionally using d2298e74235598f15594fe2c99bbac870a507c59
instead of the SRCREV of the annotated tag llvmorg-8.0.0?

llvm-project $ git show-ref -d llvmorg-8.0.0
8474bc915331b2b7851fcad74f510803f0989b8b refs/tags/llvmorg-8.0.0
d2298e74235598f15594fe2c99bbac870a507c59 refs/tags/llvmorg-8.0.0^{}

I know that many projects don't use annotated tags, but if there is one
it would be nice to use that (so that it's easier to verify that the
SRCREV really matches with the tag).

>  BRANCH = "release/${MAJOR_VERSION}.x"
>  MAJOR_VERSION = "8"
>  MINOR_VERSION = "0"
>  PATCH_VERSION = "0"
>  SOLIBVER = "1"
> -PV = "${MAJOR_VERSION}.${MINOR_VERSION}"
> +PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
>  SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
>             file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
>             file://0002-llvm-allow-env-override-of-exe-path.patch \
> -- 
> 2.17.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [PATCH 7/8] llvm: update from 8.0.0rc2 to 8.0.0 final release

[Alexander Kanavin]

On Wed, 27 Mar 2019 at 15:43, Martin Jansa <martin.jansa@gmail.com> wrote:
> Are you intentionally using d2298e74235598f15594fe2c99bbac870a507c59
> instead of the SRCREV of the annotated tag llvmorg-8.0.0?
>
> llvm-project $ git show-ref -d llvmorg-8.0.0
> 8474bc915331b2b7851fcad74f510803f0989b8b refs/tags/llvmorg-8.0.0
> d2298e74235598f15594fe2c99bbac870a507c59 refs/tags/llvmorg-8.0.0^{}
>
> I know that many projects don't use annotated tags, but if there is one
> it would be nice to use that (so that it's easier to verify that the
> SRCREV really matches with the tag).

I took the SRCREV from the github web interface:
https://github.com/llvm/llvm-project/releases

I'm not able to find the annotated tag ids there anywhere, so I simply
had no idea they exist.

Alex

[PATCH 8/8] sysprof: drop obsolete no-update reason

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-kernel/sysprof/sysprof_3.30.2.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb b/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
index 27f37f808e8..24e49cb0d58 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
@@ -15,7 +15,6 @@ SRC_URI += " \
            file://define-NT_GNU_BUILD_ID.patch \
            file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
            "
-RECIPE_NO_UPDATE_REASON = "Waiting for resolution of https://bugzilla.gnome.org/show_bug.cgi?id=794625"
 
 PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
 PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
-- 
2.17.1