* [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5
@ 2021-02-08 10:59 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 02/12] gptfdisk: update 1.0.5 -> 1.0.6 Alexander Kanavin
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{distcc_3.3.3.bb => distcc_3.3.5.bb} | 9 +-
...cc-10-which-defaults-to-fno-common-c.patch | 34 -----
.../distcc/files/fix-gnome.patch | 122 ------------------
.../distcc/files/separatebuilddir.patch | 33 -----
4 files changed, 4 insertions(+), 194 deletions(-)
rename meta/recipes-devtools/distcc/{distcc_3.3.3.bb => distcc_3.3.5.bb} (91%)
delete mode 100644 meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch
delete mode 100644 meta/recipes-devtools/distcc/files/fix-gnome.patch
delete mode 100644 meta/recipes-devtools/distcc/files/separatebuilddir.patch
diff --git a/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.5.bb
similarity index 91%
rename from meta/recipes-devtools/distcc/distcc_3.3.3.bb
rename to meta/recipes-devtools/distcc/distcc_3.3.5.bb
index d92b9c3046..d2ea9c8a6a 100644
--- a/meta/recipes-devtools/distcc/distcc_3.3.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.5.bb
@@ -15,14 +15,13 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
RRECOMMENDS_${PN}-server = "avahi-daemon"
SRC_URI = "git://github.com/distcc/distcc.git \
- file://fix-gnome.patch \
- file://separatebuilddir.patch \
- file://0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch \
file://default \
file://distcc \
- file://distcc.service"
-SRCREV = "4cde9bcfbda589abd842e3bbc652ce369085eaae"
+ file://distcc.service \
+ "
+SRCREV = "8572e2a1af39e69b2a2d74622fed6d2dd7dca9b7"
S = "${WORKDIR}/git"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
inherit autotools pkgconfig update-rc.d useradd systemd
diff --git a/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch b/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch
deleted file mode 100644
index 86c07c11f8..0000000000
--- a/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 98530865795300008fe06bb647a6fc2dddfc7967 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Mon, 27 Jan 2020 09:28:43 +0000
-Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf
- https://gcc.gnu.org/gcc-10/porting_to.html)
-
-This fixes the following link error I see when I use the latest gcc 10
-git branch:
-/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/serve.o:(.bss+0x0): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here
-/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/stats.o:(.data+0x20): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here
-collect2: error: ld returned 1 exit status
-
-Upstream-Status: Backport [https://github.com/distcc/distcc/pull/373]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/stats.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/stats.h b/src/stats.h
-index 9bde285..74d4690 100644
---- a/src/stats.h
-+++ b/src/stats.h
-@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD,
- STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT,
- STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX };
-
--const char *stats_text[20];
-+extern const char *stats_text[20];
-
- int dcc_stats_init(void);
- void dcc_stats_init_kid(void);
---
-2.28.0
-
diff --git a/meta/recipes-devtools/distcc/files/fix-gnome.patch b/meta/recipes-devtools/distcc/files/fix-gnome.patch
deleted file mode 100644
index f1f5ed1a9f..0000000000
--- a/meta/recipes-devtools/distcc/files/fix-gnome.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Upstream-Status: Backport [https://github.com/distcc/distcc/pull/319]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 2faacc2be8d7eeee0a3f66d88fedd1d3ab11070e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 8 Dec 2018 12:50:07 +0100
-Subject: [PATCH] Fix desktop spec compliance of distccmon-gnome install
-
-Update the .desktop file and install rules for distccmon-gnome to
-conform to the freedesktop.org specifications. More specifically:
-
-- update to version 1.0 of the spec
-- remove obsolete 'Encoding' key
-- remove obsolete 'Application' category and add recommended 'GTK'
-- install icon file to the correct directory
-- strip suffix from desktop file (specifying it is deprecated)
-- while at it, remove redundant '-icon' from the filename
-- install desktop file to the correct directory
----
- Makefile.in | 18 ++++++++++--------
- gnome/distccmon-gnome.desktop | 7 +++----
- ...mon-gnome-icon.png => distccmon-gnome.png} | Bin
- src/mon-gnome.c | 2 +-
- 4 files changed, 14 insertions(+), 13 deletions(-)
- rename gnome/{distccmon-gnome-icon.png => distccmon-gnome.png} (100%)
-
-diff --git a/Makefile.in b/Makefile.in
-index 6e1e467..1106559 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,13 +52,14 @@ mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
- docdir = @docdir@
--pkgdatadir = $(datadir)/@PACKAGE_NAME@
-+icondir = $(datarootdir)/pixmaps
-+desktopdir = $(datarootdir)/applications
-
- include_server_builddir = $(builddir)/_include_server
-
- # These must be done from here, not from autoconf, because they can
- # contain variable expansions written in Make syntax. Ew.
--DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\""
-+DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\""
-
- # arguments to pkgconfig
- GNOME_PACKAGES = @GNOME_PACKAGES@
-@@ -387,7 +388,7 @@ man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \
- man/lsdistcc_1.html man/pump_1.html man/include_server_1.html
- MEN = $(man1_MEN)
-
--gnome_data = gnome/distccmon-gnome-icon.png \
-+gnome_data = gnome/distccmon-gnome.png \
- gnome/distccmon-gnome.desktop
-
- popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
-@@ -1033,7 +1034,8 @@ showpaths:
- @echo " programs $(DESTDIR)$(bindir)"
- @echo " sbin programs $(DESTDIR)$(sbindir)"
- @echo " system configuration $(DESTDIR)$(sysconfdir)"
-- @echo " shared data files $(DESTDIR)$(pkgdatadir)"
-+ @echo " icon file $(DESTDIR)$(icondir)"
-+ @echo " application file $(DESTDIR)$(desktopdir)"
-
-
- # install-sh can't handle multiple arguments, but we don't need any
-@@ -1129,10 +1131,10 @@ install-example: $(example_DOCS)
- done
-
- install-gnome-data: $(gnome_data)
-- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
-- for p in $(gnome_data); do \
-- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-- done
-+ $(mkinstalldirs) "$(DESTDIR)$(icondir)"
-+ $(mkinstalldirs) "$(DESTDIR)$(desktopdir)"
-+ $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)"
-+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)"
-
- install-conf: $(conf_files) $(default_files)
- $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc"
-diff --git a/gnome/distccmon-gnome.desktop b/gnome/distccmon-gnome.desktop
-index bd1fa26..7205f5e 100644
---- a/gnome/distccmon-gnome.desktop
-+++ b/gnome/distccmon-gnome.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
--Version=0.9.4
--Encoding=UTF-8
-+Version=1.0
- Exec=distccmon-gnome
- Name=distcc monitor
- Name[sv]=distcc övervakare
-@@ -8,9 +7,9 @@ GenericName=Distributed Compile Monitor
- GenericName[sv]=Distribuerad kompilerings-övervakare
- Comment=Graphical view of distributed compile tasks
- Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter
--Icon=distccmon-gnome-icon.png
-+Icon=distccmon-gnome
- TryExec=distccmon-gnome
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Development;
-+Categories=GNOME;GTK;Development;
- StartupNotify=true
-diff --git a/gnome/distccmon-gnome-icon.png b/gnome/distccmon-gnome.png
-similarity index 100%
-rename from gnome/distccmon-gnome-icon.png
-rename to gnome/distccmon-gnome.png
-diff --git a/src/mon-gnome.c b/src/mon-gnome.c
-index 24681d0..bfc286d 100644
---- a/src/mon-gnome.c
-+++ b/src/mon-gnome.c
-@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwin (void)
-
- #if GTK_CHECK_VERSION(2,2,0)
- gtk_window_set_icon_from_file (GTK_WINDOW (mainwin),
-- PKGDATADIR "/distccmon-gnome-icon.png",
-+ ICONDIR "/distccmon-gnome.png",
- NULL);
- #endif
-
diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch
deleted file mode 100644
index c8da9d51c3..0000000000
--- a/meta/recipes-devtools/distcc/files/separatebuilddir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Backport [https://github.com/distcc/distcc/pull/363]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 469628ee8dc90c7162d1a850c0b179b7349f9cf3 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 17 Sep 2019 13:04:22 +0100
-Subject: [PATCH] Makefile.in: fix out-of-tree builds when the GNOME UI is
- enabled
-
-The install command doesn't use $(srcdir) so out-of-tree builds fail.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 123054f..b9ce974 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1130,8 +1130,8 @@ install-example: $(example_DOCS)
- install-gnome-data: $(gnome_data)
- $(mkinstalldirs) "$(DESTDIR)$(icondir)"
- $(mkinstalldirs) "$(DESTDIR)$(desktopdir)"
-- $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)"
-- $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)"
-+ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)"
-+ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)"
-
- install-conf: $(conf_files) $(default_files)
- $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc"
---
-2.20.1
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 02/12] gptfdisk: update 1.0.5 -> 1.0.6
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 03/12] python3-setuptools: update 51.0.0 -> 52.0.0 Alexander Kanavin
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../0001-gptcurses-correctly-include-curses.h.patch | 7 ++++---
.../fdisk/{gptfdisk_1.0.5.bb => gptfdisk_1.0.6.bb} | 3 +--
2 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/fdisk/{gptfdisk_1.0.5.bb => gptfdisk_1.0.6.bb} (89%)
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch
index 67689e838a..266afbfa11 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch
+++ b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch
@@ -1,23 +1,24 @@
-From 607b0bed5e8a5f5c3754cd6ffcf499d8134c37f9 Mon Sep 17 00:00:00 2001
+From 6bc6e867c5b3a774c0d7819ee5a3d2885e97caa9 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 30 Mar 2020 17:11:19 +0200
Subject: [PATCH] gptcurses: correctly include curses.h
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
gptcurses.cc | 4 ----
1 file changed, 4 deletions(-)
diff --git a/gptcurses.cc b/gptcurses.cc
-index 1b18cf2..4ebfde1 100644
+index 71aa734..4ebfde1 100644
--- a/gptcurses.cc
+++ b/gptcurses.cc
@@ -23,11 +23,7 @@
#include <iostream>
#include <string>
#include <sstream>
--#ifdef __APPLE__
+-#if defined (__APPLE__) || (__FreeBSD__)
#include <ncurses.h>
-#else
-#include <ncursesw/ncurses.h>
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.6.bb
similarity index 89%
rename from meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb
rename to meta/recipes-devtools/fdisk/gptfdisk_1.0.6.bb
index c7850f03ca..3f331e2dc5 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb
+++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.6.bb
@@ -9,8 +9,7 @@ DEPENDS = "util-linux"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
file://0001-gptcurses-correctly-include-curses.h.patch \
"
-SRC_URI[md5sum] = "58dac67c85e46ca87b587231549aefe6"
-SRC_URI[sha256sum] = "0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f"
+SRC_URI[sha256sum] = "ddc551d643a53f0bd4440345d3ae32c49b04a797e9c01036ea460b6bb4168ca8"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 03/12] python3-setuptools: update 51.0.0 -> 52.0.0
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 02/12] gptfdisk: update 1.0.5 -> 1.0.6 Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 04/12] ruby: update 2.7.2 -> 3.0.0 Alexander Kanavin
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
easy_install script removed upstream:
https://github.com/pypa/setuptools/blob/v52.0.0/CHANGES.rst
Tarballs are now provided instead of zip files.
License-Update: formatting
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...tuptools_51.0.0.bb => python3-setuptools_52.0.0.bb} | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
rename meta/recipes-devtools/python/{python3-setuptools_51.0.0.bb => python3-setuptools_52.0.0.bb} (82%)
diff --git a/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_52.0.0.bb
similarity index 82%
rename from meta/recipes-devtools/python/python3-setuptools_51.0.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_52.0.0.bb
index dc09c13846..118f416657 100644
--- a/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_52.0.0.bb
@@ -2,9 +2,7 @@ SUMMARY = "Download, build, install, upgrade, and uninstall Python packages"
HOMEPAGE = "https://pypi.org/project/setuptools"
SECTION = "devel/python"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158"
-
-PYPI_PACKAGE_EXT = "zip"
+LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=7a7126e068206290f3fe9f8d6c713ea6"
inherit pypi setuptools3
@@ -12,7 +10,7 @@ SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-e
SRC_URI += "file://0001-change-shebang-to-python3.patch"
-SRC_URI[sha256sum] = "029c49fd713e9230f6a41c0298e6e1f5839f2cde7104c0ad5e053a37777e7688"
+SRC_URI[sha256sum] = "fb3a1ee622509550dbf1d419f241296169d7f09cb1eb5b1736f2f10965932b96"
DEPENDS += "${PYTHON_PN}"
@@ -42,10 +40,6 @@ do_install_prepend() {
install -d ${D}${PYTHON_SITEPACKAGES_DIR}
}
-do_install_append() {
- mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
-}
-
BBCLASSEXTEND = "native nativesdk"
# The pkg-resources module can be used by itself, without the package downloader
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 04/12] ruby: update 2.7.2 -> 3.0.0
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 02/12] gptfdisk: update 1.0.5 -> 1.0.6 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 03/12] python3-setuptools: update 51.0.0 -> 52.0.0 Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 05/12] vulkan-samples: update to latest revision Alexander Kanavin
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch
as files removed upstream.
License-Update: formatting
Drop autoconf270.patch, as no longer needed with 3.0.0
(I verified against master-next which has the new autoconf).
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/ruby/ruby.inc | 11 +++---
...of-libexec-y2racc-and-libexec-racc2y.patch | 38 -------------------
...Obey-LDFLAGS-for-the-link-of-libruby.patch | 14 +++----
.../ruby/ruby/autoconf270.patch | 34 -----------------
.../ruby/ruby/remove_has_include_macros.patch | 17 +++++++--
.../ruby/{ruby_2.7.2.bb => ruby_3.0.0.bb} | 5 +--
6 files changed, 25 insertions(+), 94 deletions(-)
delete mode 100644 meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch
delete mode 100644 meta/recipes-devtools/ruby/ruby/autoconf270.patch
rename meta/recipes-devtools/ruby/{ruby_2.7.2.bb => ruby_3.0.0.bb} (91%)
diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc
index 7b6d4edc61..1cede8d47c 100644
--- a/meta/recipes-devtools/ruby/ruby.inc
+++ b/meta/recipes-devtools/ruby/ruby.inc
@@ -7,12 +7,11 @@ It is simple, straight-forward, and extensible. \
HOMEPAGE = "http://www.ruby-lang.org/"
SECTION = "devel/ruby"
LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT"
-LIC_FILES_CHKSUM = "\
- file://COPYING;md5=5b8c87559868796979806100db3f3805 \
- file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\
- file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\
- file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \
-"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \
+ file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \
+ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://LEGAL;md5=cfe5b0bc9f051b58c7e78db882ca5f9b \
+ "
DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi"
DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native"
diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch
deleted file mode 100644
index f316bed7bd..0000000000
--- a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@cn.fujitsu.com>
-Date: Sat, 8 Feb 2020 15:16:14 +0800
-Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y.
-
-change /usr/local/bin/ruby to /usr/bin/env ruby.
-
-Upstream-Status: Pending
-
-Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
----
- libexec/racc2y | 2 +-
- libexec/y2racc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libexec/racc2y b/libexec/racc2y
-index f88d73ed2c..74e49cfa21 100755
---- a/libexec/racc2y
-+++ b/libexec/racc2y
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/env ruby
- #
- # $Id$
- #
-diff --git a/libexec/y2racc b/libexec/y2racc
-index 7933f94153..36daf864e1 100755
---- a/libexec/y2racc
-+++ b/libexec/y2racc
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/env ruby
- #
- # $Id$
- #
---
-2.17.1
-
diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
index b31dee1128..4b954e439b 100644
--- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
+++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
@@ -1,27 +1,25 @@
-From 6d608326970b1613633d7715ebb7d628dfcd16ee Mon Sep 17 00:00:00 2001
+From 07fd1ada322eda6c05ac45c08fc814976f31b596 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Thu, 5 May 2016 10:59:07 -0700
-Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby
+Subject: [PATCH] Obey LDFLAGS for the link of libruby
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Upstream-Status: Pending
+
---
template/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/template/Makefile.in b/template/Makefile.in
-index fa1e19ef37..bbd07fa34b 100644
+index f5a3149..5cc75ae 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
-@@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@
- ENABLE_SHARED = @ENABLE_SHARED@
+@@ -114,7 +114,7 @@ ENABLE_SHARED = @ENABLE_SHARED@
LDSHARED = @LIBRUBY_LDSHARED@
DLDSHARED = @DLDSHARED@
+ XDLDFLAGS = @DLDFLAGS@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
+DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
SOLIBS = @SOLIBS@
ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@
MAINLIBS = @MAINLIBS@
---
-2.23.0.rc1
-
diff --git a/meta/recipes-devtools/ruby/ruby/autoconf270.patch b/meta/recipes-devtools/ruby/ruby/autoconf270.patch
deleted file mode 100644
index 8d205bde43..0000000000
--- a/meta/recipes-devtools/ruby/ruby/autoconf270.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-This macro breaks under autoconf 2.70. Since we don't worry abot darwin or
-openbsd builds, simply remove it.
-
-Upstream-Status: Pending
-RP - 2021/1/28
-
-Index: ruby-2.7.2/configure.ac
-===================================================================
---- ruby-2.7.2.orig/configure.ac
-+++ ruby-2.7.2/configure.ac
-@@ -170,23 +170,6 @@ dnl orig_cxxflags="$cxxflags"
- dnl cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
- dnl ])
-
--AS_CASE(["$host_os:$build_os"],
--[darwin*:darwin*], [
-- AC_CHECK_TOOLS(CC, [clang gcc cc])
-- # Following Apple deployed clang are broken
-- # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
-- # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
-- # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
-- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
-- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
-- @%:@error premature clang
-- @%:@endif
--SRC
-- AC_MSG_ERROR([clang version 3.0 or later is required])
-- ])],
--[openbsd*:openbsd*], [
-- AC_CHECK_TOOLS(CC, [cc])
--])
- AS_IF([test x"${build}" != x"${host}"], [
- AC_CHECK_TOOL(CC, gcc)
- ])
diff --git a/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch b/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch
index a1e6330445..6e90a8ee77 100644
--- a/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch
+++ b/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch
@@ -1,4 +1,7 @@
-Filter out __has_include* compiler defines
+From 303fe0d20184203f1ac86d2a77b1447d47c8c29d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 26 Jan 2020 11:27:40 -0800
+Subject: [PATCH] Filter out __has_include* compiler defines
They are internal to compiler and this header is later on includes in C
files, but newer gcc >= 10 complains about it.
@@ -13,12 +16,18 @@ error in initial header file:
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ common.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/common.mk b/common.mk
+index 7633050..422aa9c 100644
--- a/common.mk
+++ b/common.mk
-@@ -221,6 +221,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT
- $(TIMESTAMPDIR)/$(arch)/.time
+@@ -233,6 +233,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJE
$(ECHO) building $(@F:.time=.h)
- $(Q) $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
+ $(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \
+ $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
+ $(Q)sed -i -e "/#define __has_include __has_include/d" $(@F:.time=.h).new
+ $(Q)sed -i -e "/#define __has_include_next __has_include_next/d" $(@F:.time=.h).new
$(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new
diff --git a/meta/recipes-devtools/ruby/ruby_2.7.2.bb b/meta/recipes-devtools/ruby/ruby_3.0.0.bb
similarity index 91%
rename from meta/recipes-devtools/ruby/ruby_2.7.2.bb
rename to meta/recipes-devtools/ruby/ruby_3.0.0.bb
index 8c338ebecf..5e143ee87f 100644
--- a/meta/recipes-devtools/ruby/ruby_2.7.2.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.0.0.bb
@@ -5,13 +5,10 @@ DEPENDS_append_libc-musl = " libucontext"
SRC_URI += " \
file://remove_has_include_macros.patch \
file://run-ptest \
- file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \
file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \
- file://autoconf270.patch \
"
-SRC_URI[md5sum] = "2d4a28dcfa38352a627a597f6057c465"
-SRC_URI[sha256sum] = "6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4"
+SRC_URI[sha256sum] = "a13ed141a1c18eb967aac1e33f4d6ad5f21be1ac543c344e0d6feeee54af8e28"
PACKAGECONFIG ??= ""
PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 05/12] vulkan-samples: update to latest revision
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
` (2 preceding siblings ...)
2021-02-08 10:59 ` [PATCH 04/12] ruby: update 2.7.2 -> 3.0.0 Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 06/12] u-boot: upgrade 2020.10 -> 2021.01 Alexander Kanavin
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop patch merged upstream.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...inst-libatomic-if-no-built-in-atomic.patch | 117 ------------------
.../vulkan/vulkan-samples_git.bb | 3 +-
2 files changed, 1 insertion(+), 119 deletions(-)
delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-support-link-against-libatomic-if-no-built-in-atomic.patch
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-support-link-against-libatomic-if-no-built-in-atomic.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-support-link-against-libatomic-if-no-built-in-atomic.patch
deleted file mode 100644
index 6c0fb60868..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-support-link-against-libatomic-if-no-built-in-atomic.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From e20a5d13935a41a856e8f71c49f2cc9d81b1d92c Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Fri, 13 Nov 2020 17:07:00 +0800
-Subject: [PATCH] support link against libatomic if no built-in atomic exist
-
-fix error:
-| framework/lib/ppc/libframework.a(device.cpp.o): in function `std::__atomic_base<unsigned long long>::load(std::memory_order) const':
-| /usr/include/c++/10.2.0/bits/atomic_base.h:426: undefined reference to `__atomic_load_8'
-
-Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/212]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- CMakeLists.txt | 1 +
- bldsys/cmake/check_atomic.cmake | 62 +++++++++++++++++++++++++++++++++
- framework/CMakeLists.txt | 4 +++
- 3 files changed, 67 insertions(+)
- create mode 100644 bldsys/cmake/check_atomic.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e72e829..466f51d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,6 +42,7 @@ endmacro(vulkan_samples_pch)
- include(utils)
- include(global_options)
- include(sample_helper)
-+include(check_atomic)
-
- # Add third party libraries
- add_subdirectory(third_party)
-diff --git a/bldsys/cmake/check_atomic.cmake b/bldsys/cmake/check_atomic.cmake
-new file mode 100644
-index 0000000..6b47a7a
---- /dev/null
-+++ b/bldsys/cmake/check_atomic.cmake
-@@ -0,0 +1,62 @@
-+# check weither need to link atomic library explicitly
-+INCLUDE(CheckCXXSourceCompiles)
-+INCLUDE(CheckLibraryExists)
-+
-+if(NOT DEFINED VULKAN_COMPILER_IS_GCC_COMPATIBLE)
-+ if(CMAKE_COMPILER_IS_GNUCXX)
-+ set(VULKAN_COMPILER_IS_GCC_COMPATIBLE ON)
-+ elseif( MSVC )
-+ set(VULKAN_COMPILER_IS_GCC_COMPATIBLE OFF)
-+ elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
-+ set(VULKAN_COMPILER_IS_GCC_COMPATIBLE ON)
-+ elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" )
-+ set(VULKAN_COMPILER_IS_GCC_COMPATIBLE ON)
-+ endif()
-+endif()
-+
-+# Sometimes linking against libatomic is required for atomic ops, if
-+# the platform doesn't support lock-free atomics.
-+
-+function(check_working_cxx_atomics varname)
-+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
-+ CHECK_CXX_SOURCE_COMPILES("
-+#include <atomic>
-+std::atomic<int> x;
-+std::atomic<short> y;
-+std::atomic<char> z;
-+int main() {
-+ ++z;
-+ ++y;
-+ return ++x;
-+}
-+" ${varname})
-+ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-+endfunction(check_working_cxx_atomics)
-+
-+function(check_working_cxx_atomics64 varname)
-+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-+ set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}")
-+ CHECK_CXX_SOURCE_COMPILES("
-+#include <atomic>
-+#include <cstdint>
-+std::atomic<uint64_t> x (0);
-+int main() {
-+ uint64_t i = x.load(std::memory_order_relaxed);
-+ (void)i;
-+ return 0;
-+}
-+" ${varname})
-+ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-+endfunction(check_working_cxx_atomics64)
-+
-+set(NEED_LINK_ATOMIC OFF CACHE BOOL "weither need to link against atomic library")
-+if(VULKAN_COMPILER_IS_GCC_COMPATIBLE)
-+ # check if non-64-bit atomics work without the library.
-+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
-+ # check 64-bit atomics work without the library.
-+ check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-+ if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-+ set(NEED_LINK_ATOMIC ON CACHE BOOL "weither need to link to atomic library" FORCE)
-+ endif()
-+endif()
-diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
-index bf26786..322526e 100644
---- a/framework/CMakeLists.txt
-+++ b/framework/CMakeLists.txt
-@@ -412,6 +412,10 @@ target_link_libraries(${PROJECT_NAME}
- ctpl
- docopt)
-
-+if(${NEED_LINK_ATOMIC})
-+ target_link_libraries(${PROJECT_NAME} atomic)
-+endif()
-+
- # Link platform specific libraries
- if(ANDROID)
- target_link_libraries(${PROJECT_NAME} log android native_app_glue)
---
-2.17.1
-
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index a61dddeb3b..05b9e855d7 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \
file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
- file://0001-support-link-against-libatomic-if-no-built-in-atomic.patch \
file://debugfix.patch \
"
UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "fdc8fab1a520df5566de3eda7b526b24f04e6379"
+SRCREV = "524cdcd27005e7cd56e6694fa41e685519d7dbca"
UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
S = "${WORKDIR}/git"
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 06/12] u-boot: upgrade 2020.10 -> 2021.01
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
` (3 preceding siblings ...)
2021-02-08 10:59 ` [PATCH 05/12] vulkan-samples: update to latest revision Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 07/12] dpkg: update 1.20.5 -> 1.20.7.1 Alexander Kanavin
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
tools/binman/binman needs python3-setuptools now.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +-
.../{u-boot-tools_2020.10.bb => u-boot-tools_2021.01.bb} | 0
meta/recipes-bsp/u-boot/u-boot_2020.10.bb | 5 -----
meta/recipes-bsp/u-boot/u-boot_2021.01.bb | 4 ++++
4 files changed, 5 insertions(+), 6 deletions(-)
rename meta/recipes-bsp/u-boot/{u-boot-tools_2020.10.bb => u-boot-tools_2021.01.bb} (100%)
delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2020.10.bb
create mode 100644 meta/recipes-bsp/u-boot/u-boot_2021.01.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index cbce408a28..5a8035f432 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -12,7 +12,7 @@ PE = "1"
# We use the revision in order to avoid having to fetch it from the
# repo during parse
-SRCREV = "050acee119b3757fee3bd128f55d720fdd9bb890"
+SRCREV = "c4fddedc48f336eabc4ce3f74940e6aa372de18c"
SRC_URI = "git://git.denx.de/u-boot.git \
"
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2021.01.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb
rename to meta/recipes-bsp/u-boot/u-boot-tools_2021.01.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot_2020.10.bb b/meta/recipes-bsp/u-boot/u-boot_2020.10.bb
deleted file mode 100644
index 4f5b3e5dfd..0000000000
--- a/meta/recipes-bsp/u-boot/u-boot_2020.10.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require u-boot-common.inc
-require u-boot.inc
-
-DEPENDS += "bc-native dtc-native"
-
diff --git a/meta/recipes-bsp/u-boot/u-boot_2021.01.bb b/meta/recipes-bsp/u-boot/u-boot_2021.01.bb
new file mode 100644
index 0000000000..2eef1e900e
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot_2021.01.bb
@@ -0,0 +1,4 @@
+require u-boot-common.inc
+require u-boot.inc
+
+DEPENDS += "bc-native dtc-native python3-setuptools-native"
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 07/12] dpkg: update 1.20.5 -> 1.20.7.1
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
` (4 preceding siblings ...)
2021-02-08 10:59 ` [PATCH 06/12] u-boot: upgrade 2020.10 -> 2021.01 Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 08/12] libhandy: upgrade 1.0.2 -> 1.0.3 Alexander Kanavin
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...ild.c-ignore-return-of-1-from-tar-cf.patch | 10 ++++----
...kg-fsys-usrunmess.pl-correct-shebang.patch | 23 +++++++++++++++++++
.../dpkg/{dpkg_1.20.5.bb => dpkg_1.20.7.1.bb} | 5 ++--
3 files changed, 31 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch
rename meta/recipes-devtools/dpkg/{dpkg_1.20.5.bb => dpkg_1.20.7.1.bb} (87%)
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
index ffe520c513..2dc68e2064 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
@@ -1,4 +1,4 @@
-From 15b081cc8bead80c493ab83369ecb3345a24a3dc Mon Sep 17 00:00:00 2001
+From d6f5fed6bc56e1f3b885a796a43aa2868ace57bc Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
Date: Tue, 16 Jun 2020 03:57:25 +0000
Subject: [PATCH] build.c: ignore return of 1 from tar -cf
@@ -29,10 +29,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
-index 8436839cd..6b44a36f7 100644
+index d13a21c1e..059f2be6d 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
-@@ -434,6 +434,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
+@@ -480,6 +480,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
{
int pipe_filenames[2], pipe_tarball[2];
pid_t pid_tar, pid_comp;
@@ -40,7 +40,7 @@ index 8436839cd..6b44a36f7 100644
/* Fork off a tar. We will feed it a list of filenames on stdin later. */
m_pipe(pipe_filenames);
-@@ -486,7 +487,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
+@@ -532,7 +533,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
/* All done, clean up wait for tar and <compress> to finish their job. */
close(pipe_filenames[1]);
subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);
@@ -50,4 +50,4 @@ index 8436839cd..6b44a36f7 100644
+ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc);
}
- static time_t
+ static intmax_t
diff --git a/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch b/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch
new file mode 100644
index 0000000000..292b72ab5d
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch
@@ -0,0 +1,23 @@
+From 0decc62904571582147f2273fa1b521e00485dda Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 3 Feb 2021 20:47:58 +0100
+Subject: [PATCH] scripts/dpkg-fsys-usrunmess.pl: correct shebang
+
+Otherwise automake will write the full native perl path into it.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ scripts/dpkg-fsys-usrunmess.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/dpkg-fsys-usrunmess.pl b/scripts/dpkg-fsys-usrunmess.pl
+index 9220df3c0..9ce368955 100755
+--- a/scripts/dpkg-fsys-usrunmess.pl
++++ b/scripts/dpkg-fsys-usrunmess.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ #
+ # dpkg-fsys-usrunmess - Undoes the merged-/usr-via-aliased-dirs mess
+ #
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.5.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb
similarity index 87%
rename from meta/recipes-devtools/dpkg/dpkg_1.20.5.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb
index d97b69c0b9..55ac84f724 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.20.5.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.20.7.1.bb
@@ -1,7 +1,7 @@
require dpkg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \
+SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=sid \
file://noman.patch \
file://remove-tar-no-timestamp.patch \
file://arch_pm.patch \
@@ -14,10 +14,11 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \
file://0001-dpkg-Support-muslx32-build.patch \
file://pager.patch \
file://0001-Add-support-for-riscv32-CPU.patch \
+ file://0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch \
"
SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
-SRCREV = "823a67d67538b1b403a32d1fef40e6e228265566"
+SRCREV = "667bf0aeb92e0e7bb225ee273569c5e2389083bd"
S = "${WORKDIR}/git"
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 08/12] libhandy: upgrade 1.0.2 -> 1.0.3
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
` (5 preceding siblings ...)
2021-02-08 10:59 ` [PATCH 07/12] dpkg: update 1.20.5 -> 1.20.7.1 Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 09/12] tar: update 1.32 -> 1.33 Alexander Kanavin
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../libhandy/{libhandy_1.0.2.bb => libhandy_1.0.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libhandy/{libhandy_1.0.2.bb => libhandy_1.0.3.bb} (77%)
diff --git a/meta/recipes-gnome/libhandy/libhandy_1.0.2.bb b/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb
similarity index 77%
rename from meta/recipes-gnome/libhandy/libhandy_1.0.2.bb
rename to meta/recipes-gnome/libhandy/libhandy_1.0.3.bb
index 4daa3c1a54..4d2037411d 100644
--- a/meta/recipes-gnome/libhandy/libhandy_1.0.2.bb
+++ b/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb
@@ -2,8 +2,8 @@ SUMMARY = "A library full of GTK+ widgets for mobile phones"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI = "git://gitlab.gnome.org/GNOME/${BPN}.git;protocol=https"
-SRCREV = "465c00f8f80c27330be494ed7c0ba2ffe26321c4"
+SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-0"
+SRCREV = "7126d2e8da9dcdeb5751e60ff6a74930804f9637"
S = "${WORKDIR}/git"
GIR_MESON_ENABLE_FLAG = 'enabled'
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 09/12] tar: update 1.32 -> 1.33
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
` (6 preceding siblings ...)
2021-02-08 10:59 ` [PATCH 08/12] libhandy: upgrade 1.0.2 -> 1.0.3 Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 10/12] at: correct upstream version check Alexander Kanavin
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop musl fix as upstream fixed the issue.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../tar/tar/musl_dirent.patch | 19 -------------------
.../tar/{tar_1.32.bb => tar_1.33.bb} | 7 ++-----
2 files changed, 2 insertions(+), 24 deletions(-)
delete mode 100644 meta/recipes-extended/tar/tar/musl_dirent.patch
rename meta/recipes-extended/tar/{tar_1.32.bb => tar_1.33.bb} (88%)
diff --git a/meta/recipes-extended/tar/tar/musl_dirent.patch b/meta/recipes-extended/tar/tar/musl_dirent.patch
deleted file mode 100644
index 2d98ed1310..0000000000
--- a/meta/recipes-extended/tar/tar/musl_dirent.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-musl has valid d_ino implementation
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: tar-1.28/m4/d-ino.m4
-===================================================================
---- tar-1.28.orig/m4/d-ino.m4
-+++ tar-1.28/m4/d-ino.m4
-@@ -40,7 +40,8 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_
- [gl_cv_struct_dirent_d_ino=no],
- [case "$host_os" in
- # Guess yes on glibc systems with Linux kernel.
-- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
-+ linux*-gnu*|linux*-musl*)
-+ gl_cv_struct_dirent_d_ino="guessing yes" ;;
- # Guess no on native Windows.
- mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;;
- # If we don't know, assume the worst.
diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.33.bb
similarity index 88%
rename from meta/recipes-extended/tar/tar_1.32.bb
rename to meta/recipes-extended/tar/tar_1.33.bb
index ebe6cb0dbd..5e34cdf9e5 100644
--- a/meta/recipes-extended/tar/tar_1.32.bb
+++ b/meta/recipes-extended/tar/tar_1.33.bb
@@ -6,12 +6,9 @@ SECTION = "base"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \
- file://musl_dirent.patch \
-"
+SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
-SRC_URI[md5sum] = "17917356fff5cb4bd3cd5a6c3e727b05"
-SRC_URI[sha256sum] = "e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566"
+SRC_URI[sha256sum] = "85b6953f4bc9666eb7db61b48f150dca21b941d85090171ea8c4f89902e460af"
inherit autotools gettext texinfo
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 10/12] at: correct upstream version check
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
` (7 preceding siblings ...)
2021-02-08 10:59 ` [PATCH 09/12] tar: update 1.32 -> 1.33 Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 11/12] shaderc: correct " Alexander Kanavin
2021-02-08 10:59 ` [PATCH 12/12] spirv-tools: " Alexander Kanavin
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-extended/at/at_3.2.1.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-extended/at/at_3.2.1.bb b/meta/recipes-extended/at/at_3.2.1.bb
index 9574b27792..ae15df8662 100644
--- a/meta/recipes-extended/at/at_3.2.1.bb
+++ b/meta/recipes-extended/at/at_3.2.1.bb
@@ -39,8 +39,6 @@ PAM_SRC_URI = "file://pam.conf.patch \
SRC_URI[sha256sum] = "aabe6e5cb6dd19fe9fb25c2747492f2db38762b95ea41b86f949609c39fb55c4"
-UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/"
-
EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
--with-daemon_username=root \
--with-daemon_groupname=root \
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 11/12] shaderc: correct version check
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
` (8 preceding siblings ...)
2021-02-08 10:59 ` [PATCH 10/12] at: correct upstream version check Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
2021-02-08 10:59 ` [PATCH 12/12] spirv-tools: " Alexander Kanavin
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-graphics/shaderc/shaderc_2020.4.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/shaderc/shaderc_2020.4.bb b/meta/recipes-graphics/shaderc/shaderc_2020.4.bb
index 8658a5737b..e966ed3d77 100644
--- a/meta/recipes-graphics/shaderc/shaderc_2020.4.bb
+++ b/meta/recipes-graphics/shaderc/shaderc_2020.4.bb
@@ -10,7 +10,7 @@ SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c"
SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \
file://0001-cmake-de-vendor-libs-and-disable-git-versioning.patch \
"
-UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
S = "${WORKDIR}/git"
inherit cmake python3native
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 12/12] spirv-tools: correct version check
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
` (9 preceding siblings ...)
2021-02-08 10:59 ` [PATCH 11/12] shaderc: correct " Alexander Kanavin
@ 2021-02-08 10:59 ` Alexander Kanavin
10 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2021-02-08 10:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-graphics/spir/spirv-tools_2020.6.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/spir/spirv-tools_2020.6.bb b/meta/recipes-graphics/spir/spirv-tools_2020.6.bb
index 2c855d8d8e..4866558158 100644
--- a/meta/recipes-graphics/spir/spirv-tools_2020.6.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_2020.6.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRCREV = "b27b1afd12d05bf238ac7368bb49de73cd620a8e"
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git"
-UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
S = "${WORKDIR}/git"
inherit cmake python3native
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-02-08 10:59 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-08 10:59 [PATCH 01/12] distcc: update 3.3.3 -> 3.3.5 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 02/12] gptfdisk: update 1.0.5 -> 1.0.6 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 03/12] python3-setuptools: update 51.0.0 -> 52.0.0 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 04/12] ruby: update 2.7.2 -> 3.0.0 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 05/12] vulkan-samples: update to latest revision Alexander Kanavin
2021-02-08 10:59 ` [PATCH 06/12] u-boot: upgrade 2020.10 -> 2021.01 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 07/12] dpkg: update 1.20.5 -> 1.20.7.1 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 08/12] libhandy: upgrade 1.0.2 -> 1.0.3 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 09/12] tar: update 1.32 -> 1.33 Alexander Kanavin
2021-02-08 10:59 ` [PATCH 10/12] at: correct upstream version check Alexander Kanavin
2021-02-08 10:59 ` [PATCH 11/12] shaderc: correct " Alexander Kanavin
2021-02-08 10:59 ` [PATCH 12/12] spirv-tools: " Alexander Kanavin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.