Skip to contentSkip to conversation

oe-selftest: add a test for recipes without maintainers

PATCH In review Alexander Kanavin 5 participants 29 messages Feb 1, 2018 – Feb 5, 2018 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/20 oe-selftest: add a test for recipes without maintainers

'bitbake -c checkpkg world' is moved to class initializer to avoid it being run twice in a row.

---
 meta/lib/oeqa/selftest/cases/distrodata.py | 32 +++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)
meta/lib/oeqa/selftest/cases/distrodata.py +27 -5
index 12540adc7d8..dd0760cce93 100644
@@ -9,6 +9,12 @@ class Distrodata(OESelftestTestCase):
     @classmethod
     def setUpClass(cls):
         super(Distrodata, cls).setUpClass()
+        feature = 'INHERIT += "distrodata"\n'
+        feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
+
+        cls.write_config(cls, feature)
+        bitbake('-c checkpkg world')
+
 
     @OETestID(1902)
     def test_checkpkg(self):
@@ -18,11 +24,6 @@ class Distrodata(OESelftestTestCase):
         Product:     oe-core
         Author:      Alexander Kanavin <[email protected]>
         """
-        feature = 'INHERIT += "distrodata"\n'
-        feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
-
-        self.write_config(feature)
-        bitbake('-c checkpkg world')
         checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"), "checkpkg.csv")).readlines()[1:]
         regressed_failures = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == 'UNKNOWN_BROKEN']
         regressed_successes = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == 'KNOWN_BROKEN']
@@ -40,3 +41,24 @@ The following packages have been checked successfully for upstream versions,
 but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please remove that line from the recipes.
 """ + "\n".join(regressed_successes)
         self.assertTrue(len(regressed_failures) == 0 and len(regressed_successes) == 0, msg)
+
+    def test_maintainers(self):
+        """
+        Summary:     Test that recipes have a maintainer
+        Expected:    All recipes (except a few special static/testing ones) should have a maintainer listed in maintainers.inc file.
+        Product:     oe-core
+        Author:      Alexander Kanavin <[email protected]>
+        """
+        def is_exception(pkg):
+            exceptions = ["packagegroup-", "initramfs-", "systemd-machine-units", "container-image-testpkg", "postinst", "devtool-test-", "selftest-ed", "target-sdk-provides-dummy"]
+            for i in exceptions:
+                 if i in pkg:
+                     return True
+            return False
+
+        checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"), "checkpkg.csv")).readlines()[1:]
+        no_maintainer_list = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[14] == '' and not is_exception(pkg_data[0])]
+        msg = """
+The following packages do not have a maintainer assigned to them. Please add an entry to meta/conf/distro/include/maintainers.inc file.
+""" + "\n".join(no_maintainer_list)
+        self.assertTrue(len(no_maintainer_list) == 0, msg)
Signature · 1 line
2.15.1
#1 lore raw

PATCH 2/20 rpm: update to 4.14.1

Drop two upstreamed patches.

License-Update: grammar fixes

---
 ...code-lib-rpm-as-the-installation-path-for.patch |  16 +--
 ...ure-cope-with-multiple-users-groups-with-.patch |  43 ------
 .../0013-Add-a-new-option-alldeps-to-rpmdeps.patch | 153 ---------------------
 .../rpm/{rpm_4.14.0.bb => rpm_4.14.1.bb}           |   9 +-
 4 files changed, 12 insertions(+), 209 deletions(-)
 delete mode 100644 meta/recipes-devtools/rpm/files/0001-Make-configure-cope-with-multiple-users-groups-with-.patch
 delete mode 100644 meta/recipes-devtools/rpm/files/0013-Add-a-new-option-alldeps-to-rpmdeps.patch
 rename meta/recipes-devtools/rpm/{rpm_4.14.0.bb => rpm_4.14.1.bb} (94%)
meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +8 -8
index d7b1145bc5b..5604cb90373 100644
@@ -1,7 +1,7 @@
-From 2b1a3f900f15034943fc41661eaab41bcc0d4d84 Mon Sep 17 00:00:00 2001
+From c82c19dc583843b1a975f2e3f2e151656a6f377c Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 27 Feb 2017 09:43:30 +0200
-Subject: [PATCH 06/15] Do not hardcode "lib/rpm" as the installation path for
+Subject: [PATCH 06/14] Do not hardcode "lib/rpm" as the installation path for
  default configuration and macros.
 
 Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263]
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 373d69484..c04a2e8d1 100644
+index 7155d9f00..21b95ae5f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1038,7 +1038,7 @@ else
+@@ -1047,7 +1047,7 @@ else
      usrprefix=$prefix
  fi
  
@@ -27,7 +27,7 @@ index 373d69484..c04a2e8d1 100644
  
  AC_SUBST(OBJDUMP)
 diff --git a/macros.in b/macros.in
-index 3f8dbba61..da4812540 100644
+index d08624856..68a972f1e 100644
 --- a/macros.in
 +++ b/macros.in
 @@ -954,7 +954,7 @@ package or when debugging this package.\
@@ -40,7 +40,7 @@ index 3f8dbba61..da4812540 100644
  %_infodir		%{_datadir}/info
  %_mandir		%{_datadir}/man
 diff --git a/rpm.am b/rpm.am
-index f0df0202f..37205a5eb 100644
+index 51225892d..e0c834d37 100644
 --- a/rpm.am
 +++ b/rpm.am
 @@ -1,10 +1,10 @@
@@ -55,7 +55,7 @@ index f0df0202f..37205a5eb 100644
 +rpmconfigdir = $(libdir)/rpm
  
  # Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 8:0:0
+ rpm_version_info = 8:1:0
 -- 
-2.14.2
+2.15.1
 
meta/recipes-devtools/rpm/files/0001-Make-configure-cope-with-multiple-users-groups-with-.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-devtools/rpm/files/0013-Add-a-new-option-alldeps-to-rpmdeps.patch deleted +0 -153

153 lines not on this page · raw message

meta/recipes-devtools/rpm/rpm_4.14.1.bb renamed from meta/recipes-devtools/rpm/rpm_4.14.0.bb +4 -5
similarity index 94%
rename from meta/recipes-devtools/rpm/rpm_4.14.0.bb
rename to meta/recipes-devtools/rpm/rpm_4.14.1.bb
index aa2579e3bfd..d75902788e4 100644
@@ -22,7 +22,7 @@ HOMEPAGE = "http://www.rpm.org"
 
 # libraries are also LGPL - how to express this?
 LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f5259151d26ff18e78023450a5ac8d96"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a"
 
 SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
            file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
@@ -34,17 +34,15 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
            file://0001-Fix-build-with-musl-C-library.patch \
            file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \
            file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \
-           file://0013-Add-a-new-option-alldeps-to-rpmdeps.patch \
            file://0001-Split-binary-package-building-into-a-separate-functi.patch \
            file://0002-Run-binary-package-creation-via-thread-pools.patch \
            file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \
            file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
            file://0001-perl-disable-auto-reqs.patch \
-           file://0001-Make-configure-cope-with-multiple-users-groups-with-.patch \
            "
 
 PE = "1"
-SRCREV = "da3720f62e57648fb1dc2a632744d38866139971"
+SRCREV = "bfee1410af51c1cc9724791fb8d985260a62102b"
 
 S = "${WORKDIR}/git"
 
@@ -107,7 +105,8 @@ do_install_append () {
 	    ${D}/${libdir}/rpm/macros
 
 	sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \
-	    ${D}${libdir}/rpm/pythondistdeps.py
+	    ${D}${libdir}/rpm/pythondistdeps.py \
+	    ${D}${libdir}/rpm/python-macro-helper
 }
 
 FILES_${PN} += "${libdir}/rpm-plugins/*.so \
Signature · 1 line
2.15.1
#2 lore raw

PATCH 3/20 rpm: add a patch to help with Docker performance issues

In reply to Alexander Kanavin
---
 ...FD_CLOEXEC-on-opened-files-before-exec-fr.patch | 49 ++++++++++++++++++++++
 meta/recipes-devtools/rpm/rpm_4.14.1.bb            |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 meta/recipes-devtools/rpm/files/0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch
meta/recipes-devtools/rpm/files/0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch new file +49 -0
new file mode 100644
index 00000000000..4651409a651
@@ -0,0 +1,49 @@
+From 982e47df7b82c5ffe3c414cf5641f08dba0f0e64 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 26 Jan 2018 16:32:04 +0200
+Subject: [PATCH] Revert "Set FD_CLOEXEC on opened files before exec from lua
+ script is called"
+
+This reverts commit 7a7c31f551ff167f8718aea6d5048f6288d60205.
+The reason is that when _SC_OPEN_MAX is much higher than the usual 1024
+(for example inside docker), the performance drops sharply.
+
+Upstream has been notified:
+https://bugzilla.redhat.com/show_bug.cgi?id=1537564
+
+Upstream-Status: Inappropriate [upstream needs to come up with a better fix]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ luaext/lposix.c | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/luaext/lposix.c b/luaext/lposix.c
+index 0a7c26c71..c578c5a11 100644
+--- a/luaext/lposix.c
++++ b/luaext/lposix.c
+@@ -335,22 +335,10 @@ static int Pexec(lua_State *L)			/** exec(path,[args]) */
+ 	const char *path = luaL_checkstring(L, 1);
+ 	int i,n=lua_gettop(L);
+ 	char **argv;
+-	int flag, fdno, open_max;
+ 
+ 	if (!have_forked)
+ 	    return luaL_error(L, "exec not permitted in this context");
+ 
+-	open_max = sysconf(_SC_OPEN_MAX);
+-	if (open_max == -1) {
+-	    open_max = 1024;
+-	}
+-	for (fdno = 3; fdno < open_max; fdno++) {
+-	    flag = fcntl(fdno, F_GETFD);
+-	    if (flag == -1 || (flag & FD_CLOEXEC))
+-		continue;
+-	    fcntl(fdno, F_SETFD, FD_CLOEXEC);
+-	}
+-
+ 	argv = malloc((n+1)*sizeof(char*));
+ 	if (argv==NULL) return luaL_error(L,"not enough memory");
+ 	argv[0] = (char*)path;
+-- 
+2.15.1
+
meta/recipes-devtools/rpm/rpm_4.14.1.bb +1 -0
index d75902788e4..7b8ea46a75d 100644
@@ -39,6 +39,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
            file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \
            file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
            file://0001-perl-disable-auto-reqs.patch \
+           file://0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch \
            "
 
 PE = "1"
Signature · 1 line
2.15.1
#3 lore raw

PATCH 4/20 openssl: update to 1.0.2n

In reply to Alexander Kanavin

Drop upstreamed 0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch

Rebase a couple more patches (via devtool upgrade).

---
 ...saes-armv7-sha256-armv4-.pl-make-it-work-.patch | 100 ------------
 ...build-with-clang-using-external-assembler.patch |   0
 ...penssl-force-soft-link-to-avoid-rare-race.patch |   0
 .../Makefiles-ptest.patch                          |  46 ++++--
 .../Use-SHA256-not-MD5-as-default-digest.patch     |   0
 .../configure-musl-target.patch                    |   0
 .../configure-targets.patch                        |   0
 .../debian/c_rehash-compat.patch                   |   0
 .../debian/ca.patch                                |   0
 .../debian/debian-targets.patch                    |   0
 .../debian/man-dir.patch                           |   0
 .../debian/man-section.patch                       |   0
 .../debian/no-rpath.patch                          |   0
 .../debian/no-symbolic.patch                       |   0
 .../debian/pic.patch                               |   0
 .../debian1.0.2/block_digicert_malaysia.patch      |   0
 .../debian1.0.2/block_diginotar.patch              |   0
 .../debian1.0.2/soname.patch                       |   0
 .../debian1.0.2/version-script.patch               |   0
 .../engines-install-in-libdir-ssl.patch            |   0
 .../{openssl-1.0.2m => openssl-1.0.2n}/find.pl     |   0
 .../oe-ldflags.patch                               |   0
 .../openssl-1.0.2a-x32-asm.patch                   |   0
 .../openssl-c_rehash.sh                            |   0
 .../openssl-fix-des.pod-error.patch                |   0
 .../openssl-util-perlpath.pl-cwd.patch             |   0
 .../openssl_fix_for_x32.patch                      |   0
 .../parallel.patch                                 | 177 ++++++++++++---------
 .../ptest-deps.patch                               |   0
 .../ptest_makefile_deps.patch                      |   0
 .../{openssl-1.0.2m => openssl-1.0.2n}/run-ptest   |   0
 .../shared-libs.patch                              |   0
 .../recipes-connectivity/openssl/openssl_1.0.2m.bb |  61 -------
 .../recipes-connectivity/openssl/openssl_1.0.2n.bb |  60 +++++++
 34 files changed, 196 insertions(+), 248 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/0001-Fix-build-with-clang-using-external-assembler.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/0001-openssl-force-soft-link-to-avoid-rare-race.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/Makefiles-ptest.patch (61%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/Use-SHA256-not-MD5-as-default-digest.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/configure-musl-target.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/configure-targets.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian/c_rehash-compat.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian/ca.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian/debian-targets.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian/man-dir.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian/man-section.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian/no-rpath.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian/no-symbolic.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian/pic.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian1.0.2/block_digicert_malaysia.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian1.0.2/block_diginotar.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian1.0.2/soname.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/debian1.0.2/version-script.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/engines-install-in-libdir-ssl.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/find.pl (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/oe-ldflags.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/openssl-1.0.2a-x32-asm.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/openssl-c_rehash.sh (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/openssl-fix-des.pod-error.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/openssl-util-perlpath.pl-cwd.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/openssl_fix_for_x32.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/parallel.patch (80%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/ptest-deps.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/ptest_makefile_deps.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/run-ptest (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.2m => openssl-1.0.2n}/shared-libs.patch (100%)
 delete mode 100644 meta/recipes-connectivity/openssl/openssl_1.0.2m.bb
 create mode 100644 meta/recipes-connectivity/openssl/openssl_1.0.2n.bb
meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch deleted +0 -100
deleted file mode 100644
index 2ce0320c49c..00000000000
@@ -1,100 +0,0 @@
-From d1d6c69b6fd25e71dbae67fad17b2c7737f6b2dc Mon Sep 17 00:00:00 2001
-From: Andy Polyakov <[email protected]>
-Date: Sun, 5 Nov 2017 17:08:16 +0100
-Subject: [PATCH] {aes-armv4|bsaes-armv7|sha256-armv4}.pl: make it work with
- binutils-2.29
-
-It's not clear if it's a feature or bug, but binutils-2.29[.1]
-interprets 'adr' instruction with Thumb2 code reference differently,
-in a way that affects calculation of addresses of constants' tables.
-
-Upstream-Status: Backport
-
-Reviewed-by: Bernd Edlinger <[email protected]>
-Reviewed-by: Kurt Roeckx <[email protected]>
-Signed-off-by: Stefan Agner <[email protected]>
-(Merged from https://github.com/openssl/openssl/pull/4673)
----
- crypto/aes/asm/aes-armv4.pl    | 6 +++---
- crypto/aes/asm/bsaes-armv7.pl  | 6 +++---
- crypto/sha/asm/sha256-armv4.pl | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
-index 4f8917089f..c1b5e352d7 100644
---- a/crypto/aes/asm/aes-armv4.pl
-+++ b/crypto/aes/asm/aes-armv4.pl
-@@ -184,7 +184,7 @@ AES_encrypt:
- #if __ARM_ARCH__<7
- 	sub	r3,pc,#8		@ AES_encrypt
- #else
--	adr	r3,AES_encrypt
-+	adr	r3,.
- #endif
- 	stmdb   sp!,{r1,r4-r12,lr}
- 	mov	$rounds,r0		@ inp
-@@ -430,7 +430,7 @@ _armv4_AES_set_encrypt_key:
- #if __ARM_ARCH__<7
- 	sub	r3,pc,#8		@ AES_set_encrypt_key
- #else
--	adr	r3,private_AES_set_encrypt_key
-+	adr	r3,.
- #endif
- 	teq	r0,#0
- #if __ARM_ARCH__>=7
-@@ -952,7 +952,7 @@ AES_decrypt:
- #if __ARM_ARCH__<7
- 	sub	r3,pc,#8		@ AES_decrypt
- #else
--	adr	r3,AES_decrypt
-+	adr	r3,.
- #endif
- 	stmdb   sp!,{r1,r4-r12,lr}
- 	mov	$rounds,r0		@ inp
-diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
-index 70b3f9656f..ec66b0502a 100644
---- a/crypto/aes/asm/bsaes-armv7.pl
-+++ b/crypto/aes/asm/bsaes-armv7.pl
-@@ -724,7 +724,7 @@ $code.=<<___;
- .type	_bsaes_decrypt8,%function
- .align	4
- _bsaes_decrypt8:
--	adr	$const,_bsaes_decrypt8
-+	adr	$const,.
- 	vldmia	$key!, {@XMM[9]}		@ round 0 key
- 	add	$const,$const,#.LM0ISR-_bsaes_decrypt8
- 
-@@ -819,7 +819,7 @@ _bsaes_const:
- .type	_bsaes_encrypt8,%function
- .align	4
- _bsaes_encrypt8:
--	adr	$const,_bsaes_encrypt8
-+	adr	$const,.
- 	vldmia	$key!, {@XMM[9]}		@ round 0 key
- 	sub	$const,$const,#_bsaes_encrypt8-.LM0SR
- 
-@@ -923,7 +923,7 @@ $code.=<<___;
- .type	_bsaes_key_convert,%function
- .align	4
- _bsaes_key_convert:
--	adr	$const,_bsaes_key_convert
-+	adr	$const,.
- 	vld1.8	{@XMM[7]},  [$inp]!		@ load round 0 key
- 	sub	$const,$const,#_bsaes_key_convert-.LM0
- 	vld1.8	{@XMM[15]}, [$inp]!		@ load round 1 key
-diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
-index 4fee74d832..750216eb42 100644
---- a/crypto/sha/asm/sha256-armv4.pl
-+++ b/crypto/sha/asm/sha256-armv4.pl
-@@ -205,7 +205,7 @@ sha256_block_data_order:
- #if __ARM_ARCH__<7
- 	sub	r3,pc,#8		@ sha256_block_data_order
- #else
--	adr	r3,sha256_block_data_order
-+	adr	r3,.
- #endif
- #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
- 	ldr	r12,.LOPENSSL_armcap
--- 
-2.15.0
-
meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-Fix-build-with-clang-using-external-assembler.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-Fix-build-with-clang-using-external-assembler.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-Fix-build-with-clang-using-external-assembler.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-Fix-build-with-clang-using-external-assembler.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-openssl-force-soft-link-to-avoid-rare-race.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-openssl-force-soft-link-to-avoid-rare-race.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-openssl-force-soft-link-to-avoid-rare-race.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-openssl-force-soft-link-to-avoid-rare-race.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/Makefiles-ptest.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/Makefiles-ptest.patch +31 -15

83 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl-1.0.2n/Use-SHA256-not-MD5-as-default-digest.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/Use-SHA256-not-MD5-as-default-digest.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/Use-SHA256-not-MD5-as-default-digest.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/Use-SHA256-not-MD5-as-default-digest.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-musl-target.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-musl-target.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-musl-target.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-musl-target.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-targets.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-targets.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-targets.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/c_rehash-compat.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/c_rehash-compat.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/ca.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/ca.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/ca.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/ca.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/debian-targets.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/debian-targets.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-dir.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-dir.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-dir.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-dir.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-section.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-section.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-section.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-section.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-rpath.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-rpath.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-rpath.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-rpath.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-symbolic.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-symbolic.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-symbolic.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-symbolic.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/pic.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/pic.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/pic.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/pic.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_digicert_malaysia.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_digicert_malaysia.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_digicert_malaysia.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_digicert_malaysia.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_diginotar.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_diginotar.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_diginotar.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_diginotar.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/soname.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/soname.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/soname.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/soname.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/version-script.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/version-script.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/version-script.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/version-script.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/engines-install-in-libdir-ssl.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/engines-install-in-libdir-ssl.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/engines-install-in-libdir-ssl.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/engines-install-in-libdir-ssl.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/find.pl renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/find.pl +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/find.pl
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/find.pl
meta/recipes-connectivity/openssl/openssl-1.0.2n/oe-ldflags.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/oe-ldflags.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/oe-ldflags.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/oe-ldflags.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-1.0.2a-x32-asm.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-1.0.2a-x32-asm.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-c_rehash.sh renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-c_rehash.sh +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-c_rehash.sh
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-c_rehash.sh
meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-fix-des.pod-error.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-fix-des.pod-error.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-fix-des.pod-error.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-fix-des.pod-error.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-util-perlpath.pl-cwd.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-util-perlpath.pl-cwd.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-util-perlpath.pl-cwd.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-util-perlpath.pl-cwd.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl_fix_for_x32.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl_fix_for_x32.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl_fix_for_x32.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl_fix_for_x32.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/parallel.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/parallel.patch +105 -72

250 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest-deps.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest-deps.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest-deps.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest-deps.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest_makefile_deps.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest_makefile_deps.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest_makefile_deps.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest_makefile_deps.patch
meta/recipes-connectivity/openssl/openssl-1.0.2n/run-ptest renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/run-ptest +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/run-ptest
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/run-ptest
meta/recipes-connectivity/openssl/openssl-1.0.2n/shared-libs.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/shared-libs.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2m/shared-libs.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2n/shared-libs.patch
meta/recipes-connectivity/openssl/openssl_1.0.2m.bb deleted +0 -61

61 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl_1.0.2n.bb new file +60 -0

60 lines not on this page · raw message

Signature · 1 line
2.15.1
#4 lore raw

PATCH 5/20 webkitgtk: update to 2.18.6

In reply to Alexander Kanavin
---
 meta/recipes-sato/webkit/{webkitgtk_2.18.5.bb => webkitgtk_2.18.6.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.18.5.bb => webkitgtk_2.18.6.bb} (97%)
meta/recipes-sato/webkit/webkitgtk_2.18.6.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.18.5.bb +2 -2
similarity index 97%
rename from meta/recipes-sato/webkit/webkitgtk_2.18.5.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
index a64aee22e68..ff0ff8fce9c 100644
@@ -22,8 +22,8 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-Fix-build-with-musl.patch \
            "
 
-SRC_URI[md5sum] = "af18c2cfa00cadfd0b4d8db21cab011d"
-SRC_URI[sha256sum] = "0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8"
+SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112"
+SRC_URI[sha256sum] = "93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c"
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
 
Signature · 1 line
2.15.1
#5 lore raw

PATCH 6/20 epiphany: update to 3.26.5.1

In reply to Alexander Kanavin

Upstream has replaced autotools with meson, so the recipe has been adjusted accordingly.

0001-bookmarks-Check-for-return-value-of-fread.patch deleted as the file was completely refactored

0001-yelp.m4-drop-the-check-for-itstool.patch replaced with a patch for meson equivalent

---
 .../{epiphany_3.24.3.bb => epiphany_3.26.5.1.bb}   | 15 ++++------
 ...bookmarks-Check-for-return-value-of-fread.patch | 32 --------------------
 .../0001-yelp.m4-drop-the-check-for-itstool.patch  | 33 ---------------------
 ...-help-meson.build-disable-the-use-of-yelp.patch | 34 ++++++++++++++++++++++
 4 files changed, 40 insertions(+), 74 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.24.3.bb => epiphany_3.26.5.1.bb} (56%)
 delete mode 100644 meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch
 delete mode 100644 meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch
 create mode 100644 meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
meta/recipes-gnome/epiphany/epiphany_3.26.5.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.24.3.bb +6 -9
similarity index 56%
rename from meta/recipes-gnome/epiphany/epiphany_3.24.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.26.5.1.bb
index c507d23ae93..eee53c6015e 100644
@@ -6,20 +6,17 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \
 	   gsettings-desktop-schemas gnome-desktop3 libxml2-native \
 	   glib-2.0 glib-2.0-native json-glib"
 
+GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch \
-            file://0001-bookmarks-Check-for-return-value-of-fread.patch \
+SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
+           file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "c0221aec6a08935e6854eaa9de9451ef"
-SRC_URI[archive.sha256sum] = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154"
+SRC_URI[archive.md5sum] = "8c2062debde6377320596e2685bb1732"
+SRC_URI[archive.sha256sum] = "4b2f1c48e6f50793ff205d9215add5596ab5c7ebf4cef76907868fcd5a029221"
 
-EXTRA_OECONF += " --with-distributor-name=${DISTRO} --enable-debug=no"
-
-do_configure_prepend() {
-    sed -i -e s:help::g ${S}/Makefile.am
-}
+EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch deleted +0 -32
deleted file mode 100644
index ddcd39400c3..00000000000
@@ -1,32 +0,0 @@
-From aa2176be32eed2578da82f34d31148f934c11c34 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 28 Jun 2017 17:03:45 -0700
-Subject: [PATCH] bookmarks: Check for return value of fread()
-
-Fixes below compiler error
-ignoring return value of 'fread', declared with attribute warn_unused_result
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- src/bookmarks/ephy-bookmark.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c
-index ff0239b..8633ce4 100644
---- a/src/bookmarks/ephy-bookmark.c
-+++ b/src/bookmarks/ephy-bookmark.c
-@@ -217,7 +217,8 @@ ephy_bookmark_init (EphyBookmark *self)
-   bytes = g_malloc (num_bytes);
- 
-   fp = fopen ("/dev/urandom", "r");
--  fread (bytes, sizeof (guint8), num_bytes, fp);
-+  if (fread (bytes, sizeof (guint8), num_bytes, fp) != num_bytes)
-+    g_warning("Unable to read data from /dev/urandom\n");
- 
-   self->id = g_malloc0 (ID_LEN + 1);
-   for (gsize i = 0; i < num_bytes; i++) {
--- 
-2.13.2
-
meta/recipes-gnome/epiphany/files/0001-yelp.m4-drop-the-check-for-itstool.patch deleted +0 -33
deleted file mode 100644
index 2585d7f7413..00000000000
@@ -1,33 +0,0 @@
-From 30f03a256efe375a4d5c3a24bf4168ebf380e3ab Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Thu, 30 Jul 2015 15:13:23 +0300
-Subject: [PATCH] yelp.m4: drop the check for itstool
-
-It isn't used for anything during build, so there's no need to provide
-it as a recipe.
-
-Upstream-Status: Inappropriate [tarball-specific issue]
----
- m4/yelp.m4 | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/m4/yelp.m4 b/m4/yelp.m4
-index 5db847f..1b6ede4 100644
---- a/m4/yelp.m4
-+++ b/m4/yelp.m4
-@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir],
- HELP_DIR="$with_help_dir"
- AC_SUBST(HELP_DIR)
- 
--AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
--AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
--if test x"$ITSTOOL" = x; then
--  AC_MSG_ERROR([itstool not found])
--fi
--
- AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
- AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
- if test x"$XMLLINT" = x; then
--- 
-2.1.4
-
meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch new file +34 -0
new file mode 100644
index 00000000000..249517d8f90
@@ -0,0 +1,34 @@
+From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 31 Jan 2018 15:50:38 +0200
+Subject: [PATCH 2/2] help/meson.build: disable the use of yelp
+
+In particular this avoids calling itstool which oe-core doesn't provide.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ help/meson.build | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/help/meson.build b/help/meson.build
+index f720add..cbfeb1e 100644
+--- a/help/meson.build
++++ b/help/meson.build
+@@ -46,8 +46,8 @@ help_linguas = [
+   'sv'
+ ]
+ 
+-gnome.yelp(meson.project_name(),
+-  sources: help_files,
+-  media: help_media,
+-  languages: help_linguas,
+-)
++#gnome.yelp(meson.project_name(),
++#  sources: help_files,
++#  media: help_media,
++#  languages: help_linguas,
++#)
+-- 
+2.15.1
+
Signature · 1 line
2.15.1
#6 lore raw

PATCH 7/20 p11-kit: take source code from official git

In reply to Alexander Kanavin

The previous tarball URI seems to be gone.

Also, adjust a few things to make it actually build; handling autotools-based projects from git checkouts is always harder than taking them from tarballs :-(

---
 ...p-the-languages-for-which-upstream-does-n.patch | 32 ++++++++++++++++++++++
 meta/recipes-support/p11-kit/p11-kit_0.22.1.bb     | 13 ++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch new file +32 -0
new file mode 100644
index 00000000000..2fda9dfbb89
@@ -0,0 +1,32 @@
+From c3aa4aae5e9f4adafd9e10d9466f1bc481e0aae6 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 31 Jan 2018 16:47:44 +0200
+Subject: [PATCH] LINGUAS: drop the languages for which upstream does not
+ supply .po files
+
+Regenerating them proved to be too painful.
+Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127
+
+Upstream-Status: Inappropriate [missing upstream distribution files]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ po/LINGUAS | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index 1fc4d53..e9cc5a7 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -11,9 +11,7 @@ cy
+ da
+ de
+ el
+-en@boldquot
+ en_GB
+-en@quot
+ eo
+ es
+ es_CL
+-- 
+2.15.1
+
meta/recipes-support/p11-kit/p11-kit_0.22.1.bb +9 -4
index 38fa09bf9aa..57798f40201 100644
@@ -2,14 +2,19 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50"
 
-inherit autotools gettext pkgconfig upstream-version-is-even gtk-doc
+inherit autotools gettext pkgconfig gtk-doc
 
 DEPENDS = "libtasn1 libffi"
 
-SRC_URI = "http://p11-glue.freedesktop.org/releases/${BP}.tar.gz"
-SRC_URI[md5sum] = "4e9bea1106628ffb820bdad24a819fac"
-SRC_URI[sha256sum] = "ef3a339fcf6aa0e32c8c23f79ba7191e57312be2bda8b24e6d121c2670539a5c"
+SRC_URI = "git://github.com/p11-glue/p11-kit \
+           file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \
+           "
+SRCREV = "bfb3bd47aa48983f5349479bca598403097ff81c"
+S = "${WORKDIR}/git"
+# exclude odd minor versions, which are development releases
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
 
+AUTOTOOLS_AUXDIR = "${S}/build/litter"
 EXTRA_OECONF = "--without-trust-paths"
 
 # This recipe does not use the standard gtk-doc m4 macros, and so the ./configure flags
Signature · 1 line
2.15.1
#7 lore raw

PATCH 8/20 libnl: 3.2.29 -> 3.4.0

In reply to Alexander Kanavin

From: Huang Qiyu <[email protected]>

1) Upgrade libnl from 3.2.29 to 3.4.0.
2) Add one patch "0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch", for musl compile.
3) Delete one patch "fix-pktloc_syntax_h-race.patch", since upstream has refactored the makefiles, and the problematic code is now absent.

---
 ...ATCH-fix-libnl-3.4.0-musl-compile-problem.patch | 38 ++++++++++++++++++++++
 .../libnl/libnl/fix-pktloc_syntax_h-race.patch     | 36 --------------------
 .../libnl/{libnl_3.2.29.bb => libnl_3.4.0.bb}      |  7 ++--
 3 files changed, 42 insertions(+), 39 deletions(-)
 create mode 100644 meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
 delete mode 100644 meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
 rename meta/recipes-support/libnl/{libnl_3.2.29.bb => libnl_3.4.0.bb} (87%)
meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch new file +38 -0
new file mode 100644
index 00000000000..b20a2996234
@@ -0,0 +1,38 @@
+Subject: [PATCH] fix libnl-3.4.0 musl compile problem  
+Avoid in6_addr redefinition
+
+Upstream-Status: Pending
+
+Signed-off-by: Huang Qiyu <[email protected]>
+---
+ include/linux-private/linux/if_bridge.h | 1 -
+ include/linux-private/linux/ipv6.h      | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h
+index f24050b..8f7490c 100644
+--- a/include/linux-private/linux/if_bridge.h
++++ b/include/linux-private/linux/if_bridge.h
+@@ -15,7 +15,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/in6.h>
+ 
+ #define SYSFS_BRIDGE_ATTR	"bridge"
+ #define SYSFS_BRIDGE_FDB	"brforward"
+diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h
+index e05e684..f16349d 100644
+--- a/include/linux-private/linux/ipv6.h
++++ b/include/linux-private/linux/ipv6.h
+@@ -2,7 +2,6 @@
+ #define _IPV6_H
+ 
+ #include <asm/byteorder.h>
+-#include <linux/in6.h>
+ 
+ /* The latest drafts declared increase in minimal mtu up to 1280. */
+ 
+-- 
+2.7.4
+
meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch deleted +0 -36
deleted file mode 100644
index 79aa0bdf115..00000000000
@@ -1,36 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-libnl has progressed to 0.3.2 and there does not appear to be any
-"make -j" issues with this build after my limited testing on that
-newer version so we can assume this issue is fixed upstream
-
-Signed-off-by: Martin Jansa <[email protected]>
-
-Index: libnl-3.2.25/lib/Makefile.am
-===================================================================
---- libnl-3.2.25.orig/lib/Makefile.am
-+++ libnl-3.2.25/lib/Makefile.am
-@@ -46,9 +46,12 @@ CLEANFILES = \
- 
- # Hack to avoid using ylwrap. It does not function correctly in combination
- # with --header-file=
-+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
-+route/pktloc_grammar.h: route/pktloc_grammar.c
- route/pktloc_grammar.c: route/pktloc_grammar.l
- 	$(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
- 
-+route/pktloc_syntax.h: route/pktloc_syntax.c
- route/pktloc_syntax.c: route/pktloc_syntax.y
- 	$(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^
- 
-@@ -102,7 +105,9 @@ BUILT_SOURCES = \
- 	route/cls/ematch_grammar.c \
- 	route/cls/ematch_syntax.c \
- 	route/pktloc_grammar.c \
--	route/pktloc_syntax.c
-+   route/pktloc_syntax.c \
-+   route/pktloc_syntax.h \
-+   route/pktloc_grammar.h
- 
- EXTRA_DIST = \
- 	route/pktloc_grammar.l \
meta/recipes-support/libnl/libnl_3.4.0.bb renamed from meta/recipes-support/libnl/libnl_3.2.29.bb +4 -3
similarity index 87%
rename from meta/recipes-support/libnl/libnl_3.2.29.bb
rename to meta/recipes-support/libnl/libnl_3.4.0.bb
index 7d4839ba506..90dc644be4a 100644
@@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 DEPENDS = "flex-native bison-native"
 
 SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \
-           file://fix-pktloc_syntax_h-race.patch \
            file://fix-pc-file.patch \
+           file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \
 "
+
 UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"
 
-SRC_URI[md5sum] = "a8ba62a5c4f883f4e493a46d1f3733fe"
-SRC_URI[sha256sum] = "0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922"
+SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311"
+SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf"
 
 inherit autotools pkgconfig
 
Signature · 1 line
2.15.1
#8 lore raw

PATCH 9/20 vala: update to 0.38.6

In reply to Alexander Kanavin
---
 meta/recipes-devtools/vala/{vala_0.38.2.bb => vala_0.38.6.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.38.2.bb => vala_0.38.6.bb} (64%)
meta/recipes-devtools/vala/vala_0.38.6.bb renamed from meta/recipes-devtools/vala/vala_0.38.2.bb +2 -2
similarity index 64%
rename from meta/recipes-devtools/vala/vala_0.38.2.bb
rename to meta/recipes-devtools/vala/vala_0.38.6.bb
index 18751fe81a7..b0b8e00824f 100644
@@ -6,5 +6,5 @@ SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pa
 	     file://0001-Disable-valadoc.patch \
 "
 
-SRC_URI[md5sum] = "720846116448fc20b0ab3c0921e19798"
-SRC_URI[sha256sum] = "20d5d9c4fbd17877969dbce27e6428da67138e116b1717cc07b5b75fd6ab78a7"
+SRC_URI[md5sum] = "e0e834869f636fde981ba63d46f31c9c"
+SRC_URI[sha256sum] = "8c676b8307a12fba3420f861463c7e40b2743b0d6fef91f9516a3441ea25029a"
Signature · 1 line
2.15.1
#9 lore raw

PATCH 10/20 mpg123: update to 1.25.8

In reply to Alexander Kanavin
---
 meta/recipes-multimedia/mpg123/{mpg123_1.25.7.bb => mpg123_1.25.8.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.25.7.bb => mpg123_1.25.8.bb} (94%)
meta/recipes-multimedia/mpg123/mpg123_1.25.8.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.25.7.bb +2 -2
similarity index 94%
rename from meta/recipes-multimedia/mpg123/mpg123_1.25.7.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.25.8.bb
index 1d2b875d18f..45f3538d70a 100644
@@ -11,8 +11,8 @@ LICENSE_FLAGS = "commercial"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
-SRC_URI[md5sum] = "710f2d8689b24e86376bd64a05d7888b"
-SRC_URI[sha256sum] = "31b15ebcf26111b874732e07c8e60de5053ee555eea15fb70c657a4f9f0344f3"
+SRC_URI[md5sum] = "62ef1e417eb50f82bf241866d9e6e19b"
+SRC_URI[sha256sum] = "79da51efae011814491f07c95cb5e46de0476aca7a0bf240ba61cfc27af8499b"
 
 inherit autotools pkgconfig
 
Signature · 1 line
2.15.1
#10 lore raw

PATCH 11/20 boost: update to 1.66.0

In reply to Alexander Kanavin

Rework 0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch to remove the offending bits from the function instead of removing calls to the function all over the place.

---
 ...bjam-native_1.65.1.bb => bjam-native_1.66.0.bb} |   0
 .../boost/{boost-1.65.1.inc => boost-1.66.0.inc}   |   4 +-
 ...or-which-appeared-when-compiling-non-c-co.patch |  28 -----
 ...Don-t-set-up-m32-m64-we-do-that-ourselves.patch | 138 ++++++++-------------
 ...p-arch-instruction-set-flags-we-do-that-o.patch |  22 ++--
 .../boost/{boost_1.65.1.bb => boost_1.66.0.bb}     |   1 -
 6 files changed, 70 insertions(+), 123 deletions(-)
 rename meta/recipes-support/boost/{bjam-native_1.65.1.bb => bjam-native_1.66.0.bb} (100%)
 rename meta/recipes-support/boost/{boost-1.65.1.inc => boost-1.66.0.inc} (85%)
 delete mode 100644 meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch
 rename meta/recipes-support/boost/{boost_1.65.1.bb => boost_1.66.0.bb} (83%)
meta/recipes-support/boost/bjam-native_1.66.0.bb renamed from meta/recipes-support/boost/bjam-native_1.65.1.bb +0 -0
similarity index 100%
rename from meta/recipes-support/boost/bjam-native_1.65.1.bb
rename to meta/recipes-support/boost/bjam-native_1.66.0.bb
meta/recipes-support/boost/boost-1.66.0.inc renamed from meta/recipes-support/boost/boost-1.65.1.inc +2 -2
similarity index 85%
rename from meta/recipes-support/boost/boost-1.65.1.inc
rename to meta/recipes-support/boost/boost-1.66.0.inc
index f0ca88ca3e9..fe2b8639f79 100644
@@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2"
-SRC_URI[md5sum] = "41d7542ce40e171f3f7982aff008ff0d"
-SRC_URI[sha256sum] = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"
+SRC_URI[md5sum] = "b2dfbd6c717be4a7bb2d88018eaccf75"
+SRC_URI[sha256sum] = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
 
 UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
 UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch deleted +0 -28
deleted file mode 100644
index f96005ebc75..00000000000
@@ -1,28 +0,0 @@
-From 02fa5cee1b8d0321787113e2dc10b162c657f333 Mon Sep 17 00:00:00 2001
-From: Robert Ramey <[email protected]>
-Date: Wed, 1 Feb 2017 16:43:59 -0800
-Subject: [PATCH] correct error which appeared when compiling non c++ compliant
- code for arrays
-
-Upstream-Status: Backport [expected to be released in v1.65]
-
----
- boost/serialization/array.hpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/boost/serialization/array.hpp b/boost/serialization/array.hpp
-index 61708b3..612d1a6 100644
---- a/boost/serialization/array.hpp
-+++ b/boost/serialization/array.hpp
-@@ -23,6 +23,8 @@ namespace std{
- } // namespace std
- #endif
- 
-+#include <boost/serialization/array_wrapper.hpp>
-+
- #ifndef BOOST_NO_CXX11_HDR_ARRAY
- 
- #include <array>
--- 
-2.9.3
-
meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch +53 -85

150 lines not on this page · raw message

meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +15 -7
index 6bb25f885c5..fb6d9711b96 100644
@@ -1,20 +1,21 @@
-From 7c49525812567f1219706c4ed330b3bd2cc8e94a Mon Sep 17 00:00:00 2001
+From 0868761e7d2d75d472090e3ef96f3d2f9ced27f3 Mon Sep 17 00:00:00 2001
 From: Christopher Larson <[email protected]>
 Date: Tue, 13 Dec 2016 10:29:32 -0700
-Subject: [PATCH 3/3] Don't set up arch/instruction-set flags, we do that
+Subject: [PATCH 5/6] Don't set up arch/instruction-set flags, we do that
  ourselves
 
 Upstream-Status: Inappropriate
 Signed-off-by: Christopher Larson <[email protected]>
+
 ---
- tools/build/src/tools/gcc.jam | 121 ------------------------------------------
- 1 file changed, 121 deletions(-)
+ tools/build/src/tools/gcc.jam | 127 ------------------------------------------
+ 1 file changed, 127 deletions(-)
 
 diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
-index 942f141..d062c20 100644
+index e3b1b952..e4fc6c32 100644
 --- a/tools/build/src/tools/gcc.jam
 +++ b/tools/build/src/tools/gcc.jam
-@@ -1068,124 +1068,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
+@@ -1276,130 +1276,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
          <architecture>$(architecture)/<instruction-set>$(instruction-set)
          : $(values) ;
  }
@@ -60,6 +61,10 @@ index 942f141..d062c20 100644
 -cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
 -cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
 -cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
+-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
+-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
+-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
+-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
 -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
 -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
 -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
@@ -81,8 +86,10 @@ index 942f141..d062c20 100644
 -cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
 -cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
 -cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
+-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
 -cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
 -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
+-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
 -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
 -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
 -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
@@ -140,4 +147,5 @@ index 942f141..d062c20 100644
 -# AIX variant of RS/6000 & PowerPC
 -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
 -- 
-2.8.0
+2.15.1
+
meta/recipes-support/boost/boost_1.66.0.bb renamed from meta/recipes-support/boost/boost_1.65.1.bb +0 -1
similarity index 83%
rename from meta/recipes-support/boost/boost_1.65.1.bb
rename to meta/recipes-support/boost/boost_1.66.0.bb
index 9ba56703a5c..63b82a5995c 100644
@@ -8,5 +8,4 @@ SRC_URI += "\
     file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
     file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
     file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \
-    file://0001-correct-error-which-appeared-when-compiling-non-c-co.patch \
 "
Signature · 1 line
2.15.1
#11 lore raw

PATCH 12/20 liburcu: update to 0.10.1

In reply to Alexander Kanavin
---
 meta/recipes-support/liburcu/{liburcu_0.10.0.bb => liburcu_0.10.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/liburcu/{liburcu_0.10.0.bb => liburcu_0.10.1.bb} (80%)
meta/recipes-support/liburcu/liburcu_0.10.1.bb renamed from meta/recipes-support/liburcu/liburcu_0.10.0.bb +2 -2
similarity index 80%
rename from meta/recipes-support/liburcu/liburcu_0.10.0.bb
rename to meta/recipes-support/liburcu/liburcu_0.10.1.bb
index 4ecb20b75c0..0c8cd3571af 100644
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \
 SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \
            "
 
-SRC_URI[md5sum] = "69dab85b6929c378338b9504adc6aea7"
-SRC_URI[sha256sum] = "7cb58a7ba5151198087f025dc8d19d8918e9c6d56772f039696c111d9aad3190"
+SRC_URI[md5sum] = "281a2f92fdc39c40ad6b76f6631fdbd7"
+SRC_URI[sha256sum] = "9c09220be4435dc27fcd22d291707b94b97f159e0c442fbcd60c168f8f79eb06"
 
 S = "${WORKDIR}/userspace-rcu-${PV}"
 inherit autotools
Signature · 1 line
2.15.1
#12 lore raw

PATCH 13/20 btrfs-tools: update to 4.14.1

In reply to Alexander Kanavin

Drop upstreamed 0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch

Add --disable-zstd as libzstd isn't provided in oe-core.

---
 ...ith-musl-missing-header-include-for-dev_t.patch | 26 ----------------------
 ...btrfs-tools_4.13.3.bb => btrfs-tools_4.14.1.bb} |  4 ++--
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.13.3.bb => btrfs-tools_4.14.1.bb} (90%)
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch deleted +0 -26
deleted file mode 100644
index 790676b9cbf..00000000000
@@ -1,26 +0,0 @@
-From bc35c4caebb57cc8b96c30c25432b12ca8dc18d5 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Fri, 6 Oct 2017 15:03:49 +0300
-Subject: [PATCH] Fix build with musl (missing header include for dev_t).
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- convert/source-fs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/convert/source-fs.h b/convert/source-fs.h
-index 23f3356..6fd770f 100644
---- a/convert/source-fs.h
-+++ b/convert/source-fs.h
-@@ -20,6 +20,7 @@
- #include "kerncompat.h"
- #include <linux/kdev_t.h>
- #include <pthread.h>
-+#include <sys/types.h>
- 
- #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
- 
--- 
-2.14.1
-
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.14.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb +2 -2
similarity index 90%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.14.1.bb
index 263fc657550..da76db415f3 100644
@@ -14,15 +14,15 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "a7a1ea0f4f2a1d6eeeb3d106e062c7f1034f16d4"
+SRCREV = "4de1e5cd4902d588ef673f17e6ba5130aab62bf7"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Makefile-build-mktables-using-native-gcc.patch \
-           file://0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch \
            "
 
 inherit autotools-brokensep pkgconfig manpages
 
 PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"
+EXTRA_OECONF = " --disable-zstd"
 EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
 
 do_configure_prepend() {
Signature · 1 line
2.15.1
#13 lore raw

PATCH 14/20 libwebp: update to 0.6.1

In reply to Alexander Kanavin
---
 meta/recipes-multimedia/webp/{libwebp_0.6.0.bb => libwebp_0.6.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/webp/{libwebp_0.6.0.bb => libwebp_0.6.1.bb} (93%)
meta/recipes-multimedia/webp/libwebp_0.6.1.bb renamed from meta/recipes-multimedia/webp/libwebp_0.6.0.bb +2 -2
similarity index 93%
rename from meta/recipes-multimedia/webp/libwebp_0.6.0.bb
rename to meta/recipes-multimedia/webp/libwebp_0.6.1.bb
index bc565e90196..e9d4d783041 100644
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
                     file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
 
 SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
-SRC_URI[md5sum] = "19a6e926ab1721268df03161b84bb4a0"
-SRC_URI[sha256sum] = "c928119229d4f8f35e20113ffb61f281eda267634a8dc2285af4b0ee27cf2b40"
+SRC_URI[md5sum] = "b49ce9c3e3e9acae4d91bca44bb85a72"
+SRC_URI[sha256sum] = "06503c782d9f151baa325591c3579c68ed700ffc62d4f5a32feead0ff017d8ab"
 
 UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html"
 
Signature · 1 line
2.15.1
#14 lore raw

PATCH 15/20 iso-codes: update to 3.77

In reply to Alexander Kanavin
---
 .../iso-codes/{iso-codes_3.76.bb => iso-codes_3.77.bb}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/iso-codes/{iso-codes_3.76.bb => iso-codes_3.77.bb} (76%)
meta/recipes-support/iso-codes/iso-codes_3.77.bb renamed from meta/recipes-support/iso-codes/iso-codes_3.76.bb +2 -2
similarity index 76%
rename from meta/recipes-support/iso-codes/iso-codes_3.76.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.77.bb
index e3a57f7b0ca..bd613ac573d 100644
@@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz"
-SRC_URI[md5sum] = "6a3ed31227002f3e40abd793868e78b6"
-SRC_URI[sha256sum] = "38ea8c1de7c07d5b4c9603ec65c238c155992a2e2ab0b02725d0926d1ad480c4"
+SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a"
+SRC_URI[sha256sum] = "21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90"
 
 # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which
 # are inhibited by allarch
Signature · 1 line
2.15.1
#15 lore raw

PATCH 16/20 dtc: upgrade to 1.4.6

In reply to Alexander Kanavin

Drop upstreamed patch.

---
 meta/recipes-kernel/dtc/dtc.inc                    |  1 -
 ...cks-Use-proper-format-modifier-for-size_t.patch | 43 ----------------------
 .../dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb}             |  2 +-
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
 rename meta/recipes-kernel/dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb} (81%)
meta/recipes-kernel/dtc/dtc.inc +0 -1
index d259c57e8d9..925cca92fac 100644
@@ -7,7 +7,6 @@ DEPENDS = "flex-native bison-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
            file://make_install.patch \
-           file://0001-checks-Use-proper-format-modifier-for-size_t.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-kernel/dtc/dtc_1.4.6.bb renamed from meta/recipes-kernel/dtc/dtc_1.4.5.bb +1 -1
similarity index 81%
rename from meta/recipes-kernel/dtc/dtc_1.4.5.bb
rename to meta/recipes-kernel/dtc/dtc_1.4.6.bb
index 0e46cfbeb4f..78c57363926 100644
@@ -3,7 +3,7 @@ require dtc.inc
 LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
 
-SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
+SRCREV = "e54388015af1fb4bf04d0bca99caba1074d9cc42"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.15.1
#21 lore raw

PATCH 17/20 ffmpeg: update to 3.4.1

In reply to Alexander Kanavin
---
 meta/recipes-multimedia/ffmpeg/{ffmpeg_3.4.bb => ffmpeg_3.4.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.4.bb => ffmpeg_3.4.1.bb} (97%)
meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.1.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb +2 -2
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.1.bb
index 42dbe5582f3..1837956904d 100644
@@ -26,8 +26,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
            file://mips64_cpu_detection.patch \
            "
-SRC_URI[md5sum] = "c64ba7247bb91e516f6a5789348fd5b5"
-SRC_URI[sha256sum] = "aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef"
+SRC_URI[md5sum] = "726212db1b8a7eff6c25a2bc2e6fa75c"
+SRC_URI[sha256sum] = "5a77278a63741efa74e26bf197b9bb09ac6381b9757391b922407210f0f991c0"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
2.15.1
#22 lore raw

PATCH 18/20 iputils: update to 20161105

In reply to Alexander Kanavin

We've been using obsolete upstream URI for quite a while; meanwhile a lot of development has happened

Drop all the patches: they are either changing the code that has been refactored, or are backports.

Add a new musl fix patch from gentoo.

ping6 and tracepath6 variants have been folded into standard versions.

---
 .../iputils/files/0001-Fix-build-on-MUSL.patch     | 93 ++++++++++++++++++++++
 .../files/0001-Fix-header-inclusion-for-musl.patch | 92 ---------------------
 .../0001-Intialize-struct-elements-by-name.patch   | 52 ------------
 ...ing-fix-arping-hang-if-SIGALRM-is-blocked.patch | 44 ----------
 .../iputils/files/debian/targets.diff              | 15 ----
 .../iputils/files/debian/use_gethostbyname2.diff   | 31 --------
 .../iputils/files/nsgmls-path-fix.patch            | 27 -------
 .../{iputils_s20151218.bb => iputils_s20161105.bb} | 33 +++-----
 8 files changed, 103 insertions(+), 284 deletions(-)
 create mode 100644 meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch
 delete mode 100644 meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch
 delete mode 100644 meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch
 delete mode 100644 meta/recipes-extended/iputils/files/arping-fix-arping-hang-if-SIGALRM-is-blocked.patch
 delete mode 100644 meta/recipes-extended/iputils/files/debian/targets.diff
 delete mode 100644 meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
 delete mode 100644 meta/recipes-extended/iputils/files/nsgmls-path-fix.patch
 rename meta/recipes-extended/iputils/{iputils_s20151218.bb => iputils_s20161105.bb} (56%)
meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch new file +93 -0
new file mode 100644
index 00000000000..c86dafc0380
@@ -0,0 +1,93 @@
+From c6c5966d9fae27bc2f0a34ab59b999555111bd2d Mon Sep 17 00:00:00 2001
+From: Aric Belsito <[email protected]>
+Date: Sun, 29 Oct 2017 23:17:03 +0100
+Subject: [PATCH] Fix build on MUSL
+
+Add missing AI_IDN and NI_IDN declarations.
+
+Bug: https://bugs.gentoo.org/503914
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ arping.c      |  7 +++++++
+ ping.h        | 11 +++++++++++
+ tracepath.c   |  8 ++++++++
+ traceroute6.c |  4 ++++
+ 4 files changed, 30 insertions(+)
+
+diff --git a/arping.c b/arping.c
+index 1a3f40b..531d29d 100644
+--- a/arping.c
++++ b/arping.c
+@@ -45,6 +45,13 @@ struct sysfs_devattr_values;
+ #ifdef USE_IDN
+ #include <idna.h>
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
+ #endif
+ 
+ #include "SNAPSHOT.h"
+diff --git a/ping.h b/ping.h
+index 749f3ff..227315f 100644
+--- a/ping.h
++++ b/ping.h
+@@ -38,6 +38,17 @@
+ #include <locale.h>
+ #include <idna.h>
+ #include <stringprep.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
+ #define getnameinfo_flags NI_IDN
+ #else
+diff --git a/tracepath.c b/tracepath.c
+index 74a829d..dcec5b9 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -30,6 +30,14 @@
+ #ifdef USE_IDN
+ #include <idna.h>
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags	NI_IDN
+ #else
+ #define getnameinfo_flags	0
+diff --git a/traceroute6.c b/traceroute6.c
+index 48fc5c5..8d1eebf 100644
+--- a/traceroute6.c
++++ b/traceroute6.c
+@@ -251,6 +251,10 @@
+ #include <idna.h>
+ #include <locale.h>
+ 
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags	NI_IDN
+ #else
+ #define getnameinfo_flags	0
+-- 
+2.15.1
+
meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch deleted +0 -92

92 lines not on this page · raw message

meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch deleted +0 -52

52 lines not on this page · raw message

meta/recipes-extended/iputils/files/arping-fix-arping-hang-if-SIGALRM-is-blocked.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-extended/iputils/files/debian/targets.diff deleted +0 -15
deleted file mode 100644
index 2cb5576c628..00000000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Index: iputils-s20121221/Makefile
-===================================================================
---- iputils-s20121221.orig/Makefile
-+++ iputils-s20121221/Makefile
-@@ -106,7 +106,7 @@ endif
- endif
- 
- # -------------------------------------
--IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
-+IPV4_TARGETS=tracepath ping clockdiff arping
- IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
- 
meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff deleted +0 -31
deleted file mode 100644
index d3b18868c0c..00000000000
@@ -1,31 +0,0 @@
-Upstream-Status: Pending [from other distro Debian]
-
-Index: iputils-s20121221/tracepath.c
-===================================================================
---- iputils-s20121221.orig/tracepath.c
-+++ iputils-s20121221/tracepath.c
-@@ -370,9 +370,9 @@ main(int argc, char **argv)
- 	}
- #endif
- 
--	he = gethostbyname(p);
-+	he = gethostbyname2(argv[0], AF_INET);
- 	if (he == NULL) {
--		herror("gethostbyname");
-+		herror("gethostbyname2");
- 		exit(1);
- 	}
- 
-Index: iputils-s20121221/ping.c
-===================================================================
---- iputils-s20121221.orig/ping.c
-+++ iputils-s20121221/ping.c
-@@ -279,7 +279,7 @@ main(int argc, char **argv)
- #else
- 			idn = target;
- #endif
--			hp = gethostbyname(idn);
-+			hp = gethostbyname2(idn, AF_INET);
- 			if (!hp) {
- 				fprintf(stderr, "ping: unknown host %s\n", target);
- 				exit(2);
meta/recipes-extended/iputils/files/nsgmls-path-fix.patch deleted +0 -27
deleted file mode 100644
index 92bf946f2ab..00000000000
@@ -1,27 +0,0 @@
-Fix nsgmls path issue
-
-Upstream-Status: Pending
-
-Signed-off-by: Zhai Edwin <[email protected]>
-
-Index: iputils-s20101006/doc/Makefile
-===================================================================
---- iputils-s20101006.orig/doc/Makefile	2011-09-13 20:42:27.000000000 +0800
-+++ iputils-s20101006/doc/Makefile	2011-09-13 21:01:52.000000000 +0800
-@@ -27,10 +27,15 @@
- # docbook2man produces utterly ugly output and I did not find
- # any way to customize this but hacking backend perl script a little.
- # Well, hence...
-+# nsgmls seems append path to search directory according to the sysid path.
-+# e.g. if input ../index.db, it would search $search_directory/../ rather than
-+# $search_directory, which leads searching failure. Fixing nsgmls probably
-+# introduce some side effects, so use this ugly hack: running nsgmls in current
-+# directory, and running docbook2man in tmp directory.
- 
- $(MANFILES): index.db
- 	@-mkdir tmp.db2man
--	@set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ;	mv $@ ..
-+	@set -e; nsgmls $< >tmp.db2man/output; cd tmp.db2man; cat output | sgmlspl ../docbook2man-spec.pl ;	mv $@ ..
- 	@-rm -rf tmp.db2man
- 
- clean:
meta/recipes-extended/iputils/iputils_s20161105.bb renamed from meta/recipes-extended/iputils/iputils_s20151218.bb +10 -23
similarity index 56%
rename from meta/recipes-extended/iputils/iputils_s20151218.bb
rename to meta/recipes-extended/iputils/iputils_s20161105.bb
index 46de6fc4446..ad7dbc4d4ad 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Network monitoring tools"
 DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
 tracepath, tracepath6, ping, ping6 and arping."
-HOMEPAGE = "http://www.skbuff.net/iputils"
+HOMEPAGE = "https://github.com/iputils/iputils"
 SECTION = "console/network"
 
 LICENSE = "BSD & GPLv2+"
@@ -13,20 +13,13 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f
 
 DEPENDS = "gnutls libcap libgcrypt"
 
+SRC_URI = "git://github.com/iputils/iputils \
+           file://0001-Fix-build-on-MUSL.patch \
+           "
+S = "${WORKDIR}/git"
+SRCREV = "bffc0e957b98d626ab4cea218c89251201425442"
 
-SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
-           file://debian/use_gethostbyname2.diff \
-           file://debian/targets.diff \
-           file://nsgmls-path-fix.patch \
-           file://0001-Fix-header-inclusion-for-musl.patch \
-           file://0001-Intialize-struct-elements-by-name.patch \
-           file://arping-fix-arping-hang-if-SIGALRM-is-blocked.patch \
-          "
-
-SRC_URI[md5sum] = "8aaa7395f27dff9f57ae016d4bc753ce"
-SRC_URI[sha256sum] = "549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1"
-
-UPSTREAM_CHECK_REGEX = "iputils-(?P<pver>s\d+).tar"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
@@ -38,11 +31,10 @@ do_install () {
 	install -m 0755 -d ${D}${base_bindir}
 	# SUID root programs
 	install -m 4555 ping ${D}${base_bindir}/ping
-	install -m 4555 ping6 ${D}${base_bindir}/ping6
 	install -m 4555 traceroute6 ${D}${base_bindir}/
 	install -m 4555 clockdiff ${D}${base_bindir}/
 	# Other programgs
-	for i in arping tracepath tracepath6; do
+	for i in arping tracepath; do
 	  install -m 0755 $i ${D}${base_bindir}/
 	done
 }
@@ -54,19 +46,14 @@ ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN}-ping = "ping"
 ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
 
-ALTERNATIVE_${PN}-ping6 = "ping6"
-ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6"
-
-PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff"
+PACKAGES += "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff"
 
 ALLOW_EMPTY_${PN} = "1"
-RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff"
+RDEPENDS_${PN} += "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff"
 
 FILES_${PN}	= ""
 FILES_${PN}-ping = "${base_bindir}/ping.${BPN}"
-FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}"
 FILES_${PN}-arping = "${base_bindir}/arping"
 FILES_${PN}-tracepath = "${base_bindir}/tracepath"
-FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6"
 FILES_${PN}-traceroute6	= "${base_bindir}/traceroute6"
 FILES_${PN}-clockdiff = "${base_bindir}/clockdiff"
Signature · 1 line
2.15.1
#23 lore raw

PATCH 19/20 babeltrace: update to 1.5.4

In reply to Alexander Kanavin
---
 .../recipes-kernel/lttng/{babeltrace_1.5.3.bb => babeltrace_1.5.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/lttng/{babeltrace_1.5.3.bb => babeltrace_1.5.4.bb} (82%)
meta/recipes-kernel/lttng/babeltrace_1.5.4.bb renamed from meta/recipes-kernel/lttng/babeltrace_1.5.3.bb +2 -2
similarity index 82%
rename from meta/recipes-kernel/lttng/babeltrace_1.5.3.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.5.4.bb
index 4d81da0160d..a29402adb16 100644
@@ -15,5 +15,5 @@ SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \
 
 EXTRA_OECONF = "--disable-debug-info"
 
-SRC_URI[md5sum] = "0cec2745ac316649791c43f416d71ea1"
-SRC_URI[sha256sum] = "2249fee5beba657731f5d6a84c5296c6517f544bfbe7571bd1fd7af23726137c"
+SRC_URI[md5sum] = "3e8cdafec3ac0346a389870e87bf1344"
+SRC_URI[sha256sum] = "9643039923a0abc75a25b3d594cee0017423b57f10d2b625e96ed1e8d4891fc1"
Signature · 1 line
2.15.1
#24 lore raw

PATCH 20/20 libmpc: fix upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-support/libmpc/libmpc_1.0.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libmpc/libmpc_1.0.3.bb +1 -1
index 4f1f5242fb1..9c8c5f643f7 100644
@@ -8,7 +8,7 @@ SRC_URI = "http://www.multiprecision.org/mpc/download/mpc-${PV}.tar.gz"
 SRC_URI[md5sum] = "d6a1d5f8ddea3abd2cc3e98f58352d26"
 SRC_URI[sha256sum] = "617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3"
 
-UPSTREAM_CHECK_URI = "http://www.multiprecision.org/index.php?prog=mpc&page=download"
+UPSTREAM_CHECK_URI = "http://www.multiprecision.org/mpc/download.html"
 
 S = "${WORKDIR}/mpc-${PV}"
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.15.1
#25 lore raw

✗ patchtest: failure for "oe-selftest: add a test for re..." and 19 more

In reply to Alexander Kanavin

== Series Details ==

Series: "oe-selftest: add a test for re..." and 19 more
Revision: 1
URL : https://patchwork.openembedded.org/series/10815/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue LIC_FILES_CHKSUM changed on target rpm but there is no "License-Update" tag in commit message [test_lic_files_chksum_modified_not_mentioned]
Suggested fix Include "License-Update: <description>" into the commit message with a brief description
Current checksum file://COPYING;md5=f5259151d26ff18e78023450a5ac8d96
New checksum file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a

* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]

  Suggested fix    Add Upstream-Status: <Valid status> to the header of meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#26 lore raw

Re: ✗ patchtest: failure for "oe-selftest: add a test for re..." and 19 more

Quoted 4 lines · Patchwork

* Issue LIC_FILES_CHKSUM changed on target rpm but there is no "License-Update" tag in commit message [test_lic_files_chksum_modified_not_mentioned]
Suggested fix Include "License-Update: <description>" into the commit message with a brief description
Current checksum file://COPYING;md5=f5259151d26ff18e78023450a5ac8d96
New checksum file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a

Actually, there is :) I just sent Leo a fix for this.

Quoted 4 lines
* Issue             Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]
   Suggested fix    Add Upstream-Status: <Valid status> to the header of meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch
   Standard format  Upstream-Status: <Valid status>
   Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]

Fixed in branch:
https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates

Alex

#27 lore raw
In reply to Alexander Kanavin

Hi Alex,

Quoted 60 lines · NZDT Alexander Kanavin

'bitbake -c checkpkg world' is moved to class initializer to avoid it being run twice in a row.

---
 meta/lib/oeqa/selftest/cases/distrodata.py | 32 +++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)
meta/lib/oeqa/selftest/cases/distrodata.py +25 -5
index 12540adc7d8..dd0760cce93 100644
@@ -9,6 +9,12 @@ class Distrodata(OESelftestTestCase):
     @classmethod
     def setUpClass(cls):
         super(Distrodata, cls).setUpClass()
+        feature = 'INHERIT += "distrodata"\n'
+        feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
+
+        cls.write_config(cls, feature)
+        bitbake('-c checkpkg world')
+
 
     @OETestID(1902)
     def test_checkpkg(self):
@@ -18,11 +24,6 @@ class Distrodata(OESelftestTestCase):
         Product:     oe-core
         Author:      Alexander Kanavin <[email protected]>
         """
-        feature = 'INHERIT += "distrodata"\n'
-        feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
-
-        self.write_config(feature)
-        bitbake('-c checkpkg world')
         checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"), "checkpkg.csv")).readlines()[1:]
         regressed_failures = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == 'UNKNOWN_BROKEN']
         regressed_successes = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == 'KNOWN_BROKEN']
@@ -40,3 +41,24 @@ The following packages have been checked successfully for upstream versions,
 but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please remove that line from the recipes.
 """ + "\n".join(regressed_successes)
         self.assertTrue(len(regressed_failures) == 0 and len(regressed_successes) == 0, msg)
+
+    def test_maintainers(self):
+        """
+        Summary:     Test that recipes have a maintainer
+        Expected:    All recipes (except a few special static/testing ones) should have a maintainer listed in maintainers.inc file.
+        Product:     oe-core
+        Author:      Alexander Kanavin <[email protected]>
+        """
+        def is_exception(pkg):
+            exceptions = ["packagegroup-", "initramfs-", "systemd-machine-units", "container-image-testpkg", "postinst", "devtool-test-", "selftest-ed", "target-sdk-provides-dummy"]
+            for i in exceptions:
+                 if i in pkg:
+                     return True
+            return False
+
+        checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"), "checkpkg.csv")).readlines()[1:]
+        no_maintainer_list = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[14] == '' and not is_exception(pkg_data[0])]
+        msg = """
+The following packages do not have a maintainer assigned to them. Please
Quoted 4 lines

add an entry to meta/conf/distro/include/maintainers.inc file. +""" + "\n".join(no_maintainer_list)
+ self.assertTrue(len(no_maintainer_list) == 0, msg)

I understand the intention, but I don't think oe-selftest is the right place to be doing this. It's going to fail for sure if you have any non-OE-Core layers in your configuration.

One thing I have continued to campaign for (and I'm aware that not everyone completely agrees) is that oe-selftest should be able to be run with people's own configurations, we shouldn't necessarily assume that it's only our default being tested - that way we maximise oe-selftest's utility and audience. Of course there's a limit to that, if someone's esoteric configuration breaks it they get to keep the pieces - but this will definitely break with anyone's custom configuration, esoteric or otherwise.

By all means let's have a script that does this - it's even trivial to write one with tinfoil.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#28 lore raw
Quoted 11 lines · Paul Eggleton

I understand the intention, but I don't think oe-selftest is the right place to be doing this. It's going to fail for sure if you have any non-OE-Core layers in your configuration.

One thing I have continued to campaign for (and I'm aware that not everyone completely agrees) is that oe-selftest should be able to be run with people's own configurations, we shouldn't necessarily assume that it's only our default being tested - that way we maximise oe-selftest's utility and audience. Of course there's a limit to that, if someone's esoteric configuration breaks it they get to keep the pieces - but this will definitely break with anyone's custom configuration, esoteric or otherwise.

I do agree with this. We've had this exact conversation with Ross a few weeks back, and he promised to fix the test so that it's limited to recipes in oe-core. Take me re-sending the patch as a gentle reminder for that. :)

Quoted 2 lines

By all means let's have a script that does this - it's even trivial to write one with tinfoil.

No manual scripts (that no one except me even knows about) please. I really do want to automate this, and have it run regularly on the autobuilder. Otherwise, one can just issue:

bitbake -c checkpkg world && grep -v @ tmp/log/checkpkg.csv

Alex

#16 lore raw

Re: [PATCH 16/20] dtc: upgrade to 1.4.6

In reply to Alexander Kanavin

This breaks u-boot builds:

| /data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/recipe-sysroot-native/usr/include/libfdt_env.h:70:30:
error: conflicting types for 'fdt64_t'

|  typedef uint64_t FDT_BITWISE fdt64_t;
|                               ^~~~~~~
| In file included from <command-line>:0:0:
|

/data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/git/include/libfdt_env.h:19:16:
note: previous declaration of 'fdt64_t' was here
| typedef __be64 fdt64_t;
| ^~~~~~~

Ross

Quoted 113 lines · Alexander Kanavin

Drop upstreamed patch.

---
 meta/recipes-kernel/dtc/dtc.inc                    |  1 -
 ...cks-Use-proper-format-modifier-for-size_t.patch | 43
----------------------
 .../dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb}             |  2 +-
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 meta/recipes-kernel/dtc/dtc/
0001-checks-Use-proper-format-modifier-for-size_t.patch
 rename meta/recipes-kernel/dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb} (81%)
meta/recipes-kernel/dtc/dtc.inc +0 -1
index d259c57e8d9..925cca92fac 100644
@@ -7,7 +7,6 @@ DEPENDS = "flex-native bison-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
            file://make_install.patch \
-           file://0001-checks-Use-proper-format-modifier-for-size_t.patch
 \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format- renamed from meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch +0 -0

modifier-for-size_t.patch
deleted file mode 100644
index cab384dd99a..00000000000
--- a/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format- modifier-for-size_t.patch
+++ /dev/null

meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format- renamed from meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch +0 -23
@@ -1,43 +0,0 @@
-From c7a4c3817796107bb824a1f173faf90fae45396b Mon Sep 17 00:00:00 2001
-From: Thierry Reding <[email protected]>
-Date: Wed, 27 Sep 2017 15:04:09 +0200
-Subject: [PATCH] checks: Use proper format modifier for size_t
-
-The size of size_t can vary between architectures, so using %ld isn't
-going to work on 32-bit builds. Use the %zu modifier to make sure it is
-always correct.
-
-Upstream-Status: Backport
-Signed-off-by: Thierry Reding <[email protected]>
-Acked-by: Rob Herring <[email protected]>
-Signed-off-by: David Gibson <[email protected]>
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- checks.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/checks.c b/checks.c
-index 902f2e3..08a3a29 100644
---- a/checks.c
-+++ b/checks.c
-@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check

*c,

meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format- renamed from meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch +0 -4
-       int cell, cellsize = 0;
-
-       if (prop->val.len % sizeof(cell_t)) {
--              FAIL(c, dti, "property '%s' size (%d) is invalid, expected

multiple of %ld in node %s",
-+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected
multiple of %zu in node %s",
- prop->name, prop->val.len, sizeof(cell_t),
node->fullpath);

meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format- renamed from meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch +0 -3
-               return;
-       }
-@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check

*c,

meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format- renamed from meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch +0 -4
-               return;
-
-       if (irq_prop->val.len % sizeof(cell_t))
--              FAIL(c, dti, "property '%s' size (%d) is invalid, expected

multiple of %ld in node %s",
-+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected
multiple of %zu in node %s",

meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format- renamed from meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch +0 -6
-                    irq_prop->name, irq_prop->val.len, sizeof(cell_t),
-                    node->fullpath);
-
---
-2.15.0
-
meta/recipes-kernel/dtc/dtc_1.4.6.bb renamed from meta/recipes-kernel/dtc/dtc_1.4.5.bb +0 -0
similarity index 81%
rename from meta/recipes-kernel/dtc/dtc_1.4.5.bb
rename to meta/recipes-kernel/dtc/dtc_1.4.6.bb
index 0e46cfbeb4f..78c57363926 100644
@@ -3,7 +3,7 @@ require dtc.inc
 LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
                    file://libfdt/libfdt.h;beginline=3;endline=52;md5=

fb360963151f8ec2d6c06b055bcbb68c"

meta/recipes-kernel/dtc/dtc_1.4.6.bb renamed from meta/recipes-kernel/dtc/dtc_1.4.5.bb +1 -2
-SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
+SRCREV = "e54388015af1fb4bf04d0bca99caba1074d9cc42"
 
 S = "${WORKDIR}/git"
 
--

2.15.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#17 lore raw

Re: [PATCH 16/20] dtc: upgrade to 1.4.6

Quoted 5 lines · Ross

This breaks u-boot builds:

| /data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/recipe-sysroot-native/usr/include/libfdt_env.h:70:30:
error: conflicting types for 'fdt64_t'

Quoted 9 lines
|  typedef uint64_t FDT_BITWISE fdt64_t;
|                               ^~~~~~~
| In file included from <command-line>:0:0:
|

/data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/git/include/libfdt_env.h:19:16:
note: previous declaration of 'fdt64_t' was here
| typedef __be64 fdt64_t;
| ^~~~~~~

I have a patch to u-boot which is fixing similar issue. see see if this helps.

https://gist.github.com/kraj/70d613d1ead4be98a5787928d8518434

Quoted 126 lines

Ross

Quoted 108 lines · Alexander Kanavin

Drop upstreamed patch.

---
 meta/recipes-kernel/dtc/dtc.inc                    |  1 -
 ...cks-Use-proper-format-modifier-for-size_t.patch | 43
----------------------
 .../dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb}             |  2 +-
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644
meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
 rename meta/recipes-kernel/dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb} (81%)
meta/recipes-kernel/dtc/dtc.inc +0 -1
index d259c57e8d9..925cca92fac 100644
@@ -7,7 +7,6 @@ DEPENDS = "flex-native bison-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
            file://make_install.patch \
-           file://0001-checks-Use-proper-format-modifier-for-size_t.patch
 \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"

diff --git a/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch b/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch deleted file mode 100644
index cab384dd99a..00000000000
---
a/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch +++ /dev/null

meta/recipes-kernel/dtc/dtc.inc +0 -23
@@ -1,43 +0,0 @@
-From c7a4c3817796107bb824a1f173faf90fae45396b Mon Sep 17 00:00:00 2001
-From: Thierry Reding <[email protected]>
-Date: Wed, 27 Sep 2017 15:04:09 +0200
-Subject: [PATCH] checks: Use proper format modifier for size_t
-
-The size of size_t can vary between architectures, so using %ld isn't
-going to work on 32-bit builds. Use the %zu modifier to make sure it is
-always correct.
-
-Upstream-Status: Backport
-Signed-off-by: Thierry Reding <[email protected]>
-Acked-by: Rob Herring <[email protected]>
-Signed-off-by: David Gibson <[email protected]>
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- checks.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/checks.c b/checks.c
-index 902f2e3..08a3a29 100644
---- a/checks.c
-+++ b/checks.c
-@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check

*c,

meta/recipes-kernel/dtc/dtc.inc +0 -4
-       int cell, cellsize = 0;
-
-       if (prop->val.len % sizeof(cell_t)) {
--              FAIL(c, dti, "property '%s' size (%d) is invalid, expected

multiple of %ld in node %s",
-+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected
multiple of %zu in node %s",
- prop->name, prop->val.len, sizeof(cell_t),
node->fullpath);

meta/recipes-kernel/dtc/dtc.inc +0 -3
-               return;
-       }
-@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check

*c,

meta/recipes-kernel/dtc/dtc.inc +0 -4
-               return;
-
-       if (irq_prop->val.len % sizeof(cell_t))
--              FAIL(c, dti, "property '%s' size (%d) is invalid, expected

multiple of %ld in node %s",
-+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected
multiple of %zu in node %s",

meta/recipes-kernel/dtc/dtc.inc +0 -6
-                    irq_prop->name, irq_prop->val.len, sizeof(cell_t),
-                    node->fullpath);
-
---
-2.15.0
-
meta/recipes-kernel/dtc/dtc_1.4.6.bb renamed from meta/recipes-kernel/dtc/dtc_1.4.5.bb +0 -0
similarity index 81%
rename from meta/recipes-kernel/dtc/dtc_1.4.5.bb
rename to meta/recipes-kernel/dtc/dtc_1.4.6.bb
index 0e46cfbeb4f..78c57363926 100644
@@ -3,7 +3,7 @@ require dtc.inc
 LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
 

file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"

meta/recipes-kernel/dtc/dtc_1.4.6.bb renamed from meta/recipes-kernel/dtc/dtc_1.4.5.bb +1 -2
-SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
+SRCREV = "e54388015af1fb4bf04d0bca99caba1074d9cc42"
 
 S = "${WORKDIR}/git"
 
--

2.15.1

Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#18 lore raw

Re: [PATCH 16/20] dtc: upgrade to 1.4.6

Quoted 13 lines · Khem Raj
Quoted 12 lines

| /data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/recipe-sysroot-native/usr/include/libfdt_env.h:70:30:
error: conflicting types for 'fdt64_t'

|  typedef uint64_t FDT_BITWISE fdt64_t;
|                               ^~~~~~~
| In file included from <command-line>:0:0:
|

/data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/git/include/libfdt_env.h:19:16:
note: previous declaration of 'fdt64_t' was here
| typedef __be64 fdt64_t;
| ^~~~~~~

Quoted 5 lines

I have a patch to u-boot which is fixing similar issue. see see if this helps.

https://gist.github.com/kraj/70d613d1ead4be98a5787928d8518434

Thanks, I think u-boot upstream also has a fix for it. I'll check.

Alex

#19 lore raw

Re: [PATCH 16/20] dtc: upgrade to 1.4.6

Quoted 14 lines · Alexander Kanavin
Quoted 14 lines
Quoted 13 lines

/data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/recipe-sysroot-native/usr/include/libfdt_env.h:70:30:

error: conflicting types for 'fdt64_t'

|  typedef uint64_t FDT_BITWISE fdt64_t;
|                               ^~~~~~~
| In file included from <command-line>:0:0:
|

/data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/git/include/libfdt_env.h:19:16:

note: previous declaration of 'fdt64_t' was here
|  typedef __be64 fdt64_t;
|                 ^~~~~~~

Quoted 7 lines
Quoted 5 lines

I have a patch to u-boot which is fixing similar issue. see see if this helps.

https://gist.github.com/kraj/70d613d1ead4be98a5787928d8518434

Thanks, I think u-boot upstream also has a fix for it. I'll check.

Unfortunately, latest u-boot upstream still fails in the same way. As I really have no idea about when system includes vs bundled includes should be used (and no way to test anything u-boot related), let's defer this update until either upstream takes care of this issue.

Alex

#20 lore raw

Re: [PATCH 16/20] dtc: upgrade to 1.4.6

Quoted 21 lines · Alexander Kanavin
Quoted 20 lines · Alexander Kanavin
Quoted 19 lines
Quoted 7 lines

/data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/recipe-sysroot-native/usr/include/libfdt_env.h:70:30:

error: conflicting types for 'fdt64_t'

|  typedef uint64_t FDT_BITWISE fdt64_t;
|                               ^~~~~~~
| In file included from <command-line>:0:0:
|
Quoted 6 lines

/data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/git/include/libfdt_env.h:19:16:

note: previous declaration of 'fdt64_t' was here
|  typedef __be64 fdt64_t;
|                 ^~~~~~~

I have a patch to u-boot which is fixing similar issue. see see if this helps.

https://gist.github.com/kraj/70d613d1ead4be98a5787928d8518434

Quoted 7 lines
Quoted 1 line

Thanks, I think u-boot upstream also has a fix for it. I'll check.

Unfortunately, latest u-boot upstream still fails in the same way. As I really have no idea about when system includes vs bundled includes should be used (and no way to test anything u-boot related), let's defer this update until either upstream takes care of this issue.

I have a local patch upgrading uboot related recipes here.
https://github.com/kraj/openembedded-core/commit/0ed2c4ff4835142893b8c711ed09ffe10061d4a8
waiting for 2018.03 to come out. May be you can slate this update there after

Quoted 2 lines

Alex