diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:32:45 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | ac970dd705934286df062e0f1501f776dc2ef01d (patch) | |
| tree | fadcf250bad7a38afc33bc423c0ebb8733b33345 /meta-openembedded | |
| parent | 1110521700bbfe9ffd32338fed19492114e8bbd4 (diff) | |
| download | openbmc-ac970dd705934286df062e0f1501f776dc2ef01d.tar.xz | |
meta-openembedded: subtree update:fd123c9bb2..7206f7f5bc
Adam Miartus (1):
cereal: add cereal a header-only c++11 serialization library
Andreas Müller (14):
xfce4-appfinder: upgrade 4.16.0 -> 4.16.1
xfce4-whiskermenu-plugin: upgrade 2.5.2 -> 2.5.3
xfce4-panel: upgrade 4.16.0 -> 4.16.1
xfce4-notes-plugin: re-add 1.9.0
gparted: upgrade 1.1.0 -> 1.2.0
poppler: upgrade 21.01.0 -> 21.02.0
fluidsynth: upgrade 2.1.6 -> 2.1.7
mousepad: upgrade 0.5.1 -> 0.5.2
xfce4-cpugraph-plugin: upgrade 1.2.0 -> 1.2.1
babl: upgrade 0.1.82 -> 0.1.84
gegl: upgrade 0.4.26 -> 0.4.28
gtk+: upgrade 2.24.32 -> 2.24.33
libsigc++-2.0: upgrade 2.10.3 -> 2.10.6
gtkmm3: upgrade 3.24.2 -> 3.24.3
Andrei Gherzan (1):
gateone: Cleanup assets for removed recipe
Andrey Zhizhikin (1):
iperf3: fix build with autoconf 2.71
Gianfranco (1):
mosquitto: Upgrade 1.6.12 -> 2.0.7
Harpritkaur Bhandari (1):
rapidjson: Remove unwanted patches
Hongxu Jia (4):
lksctp-tools: make conpatible to autoconf-2.70
spice: make conpatible to autoconf-2.70
freeradius: fix build failure with autoconf 2.71
ndpi: fix autoconf-2.71 compatibility
Kai Kang (3):
meta-oe: add crash to NON_MULTILIB_RECIPES
lxdm: support to change user password
lxdm: disallow empty new password
Khem Raj (28):
libssh2: Fix build with autoconf 2.70+
yasm: Fix build with autotools 2.70+
boinc-client: Upgrade to 7.16.16 release
net-snmp: Remove hardcoded paths to build host in net-snmp-config
keepalived: Upgrade to 2.2.1
gst-shark: Upgrade to 0.7.2
hidapi: Backport patch to fix build with autotools 2.70+
libsrtp: Update to 2.3.0
libsrtp: Do not invoke automake during configure
klibc: Upgrade to 2.0.8 release
geany,geany-plugins: Upgrade to 1.37.x
libstatgrab: Fix build with autoconf 2.70+
libmypaint: Fix build with autotools 2.70+
geany: Fix build with autotools 2.70+
ubi-utils-klibc: Fix build with clang
kexecboot: Fix build with clang
glm: Upgrade to 0.9.9.8
gimp: Fix build with autoconf-2.70+
klibc: Fix x86_64 build with binutils 2.36+
pavucontrol: Depend on libxml-parser-perl-native
libsrtp: Copy ar-lib from automake
libmcrypt: Run autoreconf steps manually
libsdl2-mixer: Fix build with autoconf 2.70+
openldap: Fix build with autoconf 2.70+
transmission: Fix build with autotools 2.70+
boinc-client: Fix build with autotools 2.70+
iwd: Fix build with ell 0.37
kernel-selftest: Disable building bpf
Leon Anavi (29):
python3-gevent: Upgrade 20.9.0 -> 21.1.2
python3-prompt-toolkit: Upgrade 3.0.11 -> 3.0.14
python3-urllib3: Upgrade 1.26.2 -> 1.26.3
python3-pybind11: Upgrade 2.5.0 -> 2.6.2
python3-xlrd: Upgrade 1.2.0 -> 2.0.1
python3-croniter: Upgrade 1.0.2 -> 1.0.4
python3-cantools: Upgrade 36.1.0 -> 36.2.0
python3-pyzmq: Upgrade 21.0.2 -> 22.0.2
python3-aiohttp-jinja2: Upgrade 1.2.0 -> 1.4.2
python3-prctl: Upgrade 1.7 -> 1.8.1
python3-cmd2: Upgrade 1.4.0 -> 1.5.0
python3-elementpath: Upgrade 2.1.2 -> 2.1.3
python3-croniter: Upgrade 1.0.4 -> 1.0.5
python3-pychromecast: Upgrade 7.7.2 -> 8.0.0
python3-alembic: Upgrade 1.5.2 -> 1.5.3
python3-meh: Upgrade 0.49 -> 0.50
python3-pywbem: Upgrade 1.1.0 -> 1.1.3
python3-ipython: Upgrade 7.19.0 -> 7.20.0
python3-croniter: Upgrade 1.0.5 -> 1.0.6
python3-pywbemtools: Upgrade 0.8.0 -> 0.8.1
python3-sqlalchemy: Upgrade 1.3.22 -> 1.3.23
python3-flask-migrate: Upgrade 2.5.3 -> 2.6.0
python3-javaobj-py3: Upgrade 0.4.1 -> 0.4.2
python3-pytest-html: Upgrade 2.1.1 -> 3.1.1
python3-graphviz: Upgrade 0.14.2 -> 0.16
python3-tqdm: Upgrade 4.51.0 -> 4.56.0
python3-alembic: Upgrade 1.5.3 -> 1.5.4
python3-pymongo: Upgrade 3.11.2 -> 3.11.3
python3-pymisp: Upgrade 2.4.137.1 -> 2.4.137.3
Martin Jansa (6):
zbar: fix random do_prepare_recipe_sysroot_gettext failures
zbar: use 4 spaces for indentation
net-snmp: fix build with dash
wireguard-module: remove PKG assignment
graphviz: drop unused SRCREV and outdated comment
pidgin: upgrade to 2.14.1 and fix autoconf-2.71 compatibility
Mingli Yu (5):
net-snmp: improve reproducibility
python3-h5py: improve reproducibility
opencv: improve reproducibility
mozjs: improve reproducibility
netsnmp: remove --with-openssl=PATH configure option
Nicolas Jeker (2):
network-manager-applet: Build without libteam support
networkmanager: Add PACKAGECONFIG for ovs
Oleksandr Kravchuk (24):
iwd: update to 1.11
cpuid: update to 20201006
libblockdev: update to 2.25
nano: update to 5.5
plymouth: update to 0.9.5
adcli: update to 0.9.0
cannelloni: update to 1.0.0
ipset: update to 7.10
kronosnet: update 1.20
nghttp2: update to 1.43.0
atftp: update to 0.7.4
cereal: update to 1.3.0
python3-aws-iot-device-sdk-python: update to 1.4.9
python3-flask-socketio: update to 4.3.1
python3-greenstalk: update to 2.0.0
python3-twitter: update to 3.10.0
fetchmail: udpate to 6.4.16
wireshark: update to 3.4.3
iqrencode: update to 4.1.1
libconfig add UPSTREAM_CHECK_URI
ceres-solver: update to 2.0.0
libgit2: update to 1.1.0
hexedit: update to 1.5
ttf-abyssinica: update to 2.000
Oleksiy Obitotskyy (1):
libhugetlbfs: improve reproducibility
Peter Smith (1):
python3-ruamel-yaml: add support for native and nativesdk
Qi.Chen@windriver.com (1):
minifi-cpp: set PSEUDO_CONSIDER_PATHS
Ramon Fried (2):
fluentbit: fix systemd input plugin
fluentbit: Fix SIGSEGV caused by using flb_free instead of mk_mem_free
Robert P. J. Day (1):
correct "RRCOMMENDS" typo in ipset recipe
Ross Burton (2):
python3-ruamel-yaml: add native and nativesdk class extension
python3-pykwalify: fix RDEPENDS
Sakib Sajal (2):
libgpiod: add ptest
xfce4-session: increase ALTERNATIVE_PRIORITY
Wang Mingyu (1):
dnsmasq: upgrade 2.82 -> 2.84
Yi Fan Yu (1):
postgresql: bypass autoconf version check
Yi Zhao (1):
openipmi: upgrade 2.0.30 -> 2.0.31
Zang Ruochen (7):
libfastjson: upgrade 0.99.8 -> 0.99.9
libio-pty-perl: upgrade 1.15 -> 1.16
libjson-perl: upgrade 4.02000 -> 4.03000
libmbim: upgrade 1.24.4 -> 1.24.6
sanlock: upgrade 3.8.2 -> 3.8.3
python3-matplotlib: upgrade 3.3.2 -> 3.3.4
python3-pytz: upgrade 2020.1 -> 2021.1
akuster (2):
enca: Fix SRC_URI
meta-oe/README: add Ubuntu prerequisite information
zangrc (6):
libtalloc: upgrade 2.3.1 -> 2.3.2
gensio: upgrade 2.2.0 -> 2.2.3
zchunk: upgrade 1.1.8 -> 1.1.9
libnet-ldap-perl: upgrade 0.67 -> 0.68
librole-tiny-perl: upgrade 2.002003 -> 2.002004
cpprest: upgrade 2.10.17 -> 2.10.18
zhengruoqin (4):
open-isns: upgrade 0.99 -> 0.101
gd: upgrade 2.3.0 -> 2.3.1
live555: upgrade 20210101 -> 20210129
python3-periphery: upgrade 2.1.0 -> 2.2.0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I65a2b942fbfbc262976e6417d7481ae3fc82cb17
Diffstat (limited to 'meta-openembedded')
221 files changed, 2848 insertions, 1373 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb index f2bc24ea9..bc3e66ca2 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb @@ -13,6 +13,8 @@ SRC_URI[archive.sha256sum] = "ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96 # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no" +# We currently don't build NetworkManager with libteamdctl support +EXTRA_OEMESON += "-Dteam=false" PACKAGECONFIG ??= "" PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.1.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.2.0.bb index 3aaec3cdd..d0a499e6e 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.1.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.2.0.bb @@ -11,8 +11,7 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ " -SRC_URI[md5sum] = "0da45cb522d766dfb4886fb3bdbc2634" -SRC_URI[sha256sum] = "e2fe7b7afbc07e930491c00a05200c2682cc0576ca8f6da87245a000257f5924" +SRC_URI[sha256sum] = "6c90715d254d7a7ec0208b29007b64160dd9fb7df4c4aa7f8ec2c9d23114c719" DEPENDS += " \ glib-2.0-native \ diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb index 244b867fa..b49d9d7e8 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb @@ -15,6 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "c62d93d4ad6774cb8e3231bbbc7f2e61e551e7242d78640d757505ee1a9fadc5" +SRC_URI[sha256sum] = "e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb index 6ac1e6ca9..810036162 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb @@ -26,7 +26,7 @@ SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ " -SRC_URI[sha256sum] = "0f371e2ed2b92162fefd3dde743e648ca08a6a1b2b05004867fbddc7e211e424" +SRC_URI[sha256sum] = "1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch new file mode 100644 index 000000000..7e12487c7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch @@ -0,0 +1,58 @@ +From 1b66e4cca6d95f4607599bcbdd4afeb601aee84e Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Sun, 25 Oct 2020 18:09:21 +0000 +Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming autoconf-2.70 + +Upcoming autoconf-2.70 exposes deficiency in configure.ac: + +``` +$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu +./configure: line 1430: 5: Bad file descriptor +checking whether is declared... ./configure: line 1432: ${+y}: bad +``` + +It happens because macros are called with parameters using insufficient quoting. + +More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html + +The fix only amends `--with-linux-input`. Other cases of underquoting +will need to be handled separately. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/cebeb90a87105cd6e35bcb357d53cc04c828ca21] +Fix-by: Zack Weinberg +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + configure.ac | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6e2c193..afbcdd8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2138,15 +2138,14 @@ fi + AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module]) + + have_linux_input="no (linux input support disabled)" +-if test "x$with_linux_input" != "xno"; then +- AC_CHECK_HEADER(linux/input.h, +- AC_CHECK_DECL(KEY_OK, +- have_linux_input=yes, +- have_linux_input="no (needs Linux 2.6)", +- [#include <linux/input.h>])) +-fi +- +-AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes) ++AS_IF([test "x$with_linux_input" != "xno"], ++ [AC_CHECK_HEADER([linux/input.h], ++ [AC_CHECK_DECL([KEY_OK], ++ [have_linux_input=yes], ++ [have_linux_input="no (needs Linux 2.6)"], ++ [#include <linux/input.h>])])]) ++ ++AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes]) + + + ############################### +-- +2.30.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb index aec1ebf7b..070ed1904 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb @@ -37,7 +37,9 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ + file://0001-configure.ac-fix-with-linux-input-handling-with-upco.patch \ + " SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb" EXTRA_OECONF = "--disable-python \ diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch new file mode 100644 index 000000000..28e279438 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch @@ -0,0 +1,32 @@ +From 712a101c9aa2eb8548e4d0100a4a2eaf76fad164 Mon Sep 17 00:00:00 2001 +From: Jesper Lloyd <jpl.lloyd@gmail.com> +Date: Wed, 20 Jan 2021 20:21:53 +0100 +Subject: [PATCH] make build compatible w. autoconf 2.7 + +Workaround for stricter behaviour (due to a bugfix) in 2.7, +which makes a failing intltoolize macro check fail the build. + +Fix provided by hosiet. + +Upstream-Status: Backport [https://github.com/mypaint/libmypaint/commit/a6bac154db018e1f1cc4dbddc34f6c8422c891fb] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 416d9fe..48b9d02 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,7 +248,7 @@ if test "x$enable_i18n" != "xno"; then + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The prefix for our gettext translation domains.]) + AC_SUBST(GETTEXT_PACKAGE) +- IT_PROG_INTLTOOL ++IT_PROG_INTLTOOL + AM_GLIB_GNU_GETTEXT + + dnl Debian: stdlib +-- +2.30.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb index 37d41780d..e711a2a7f 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb @@ -12,7 +12,9 @@ DEPENDS = " \ inherit autotools gobject-introspection gettext python3native -SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1" +SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1 \ + file://0001-make-build-compatible-w.-autoconf-2.7.patch \ + " SRCREV = "2768251dacce3939136c839aeca413f4aa4241d0" PV = "1.6.1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch new file mode 100644 index 000000000..931d0fa58 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/files/0001-make-Add-compiler-includes-in-cflags.patch @@ -0,0 +1,31 @@ +From 528a64d17488295299dad9fbfe3d7140bc1cfdfa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Feb 2021 11:06:48 -0800 +Subject: [PATCH] make: Add compiler includes in cflags + +Fixes +| In file included from /mnt/b/yoe/master/build/tmp/work/raspberrypi4_64-yoe-linux/kexecboot-klibc/0.6+gitAUTOINC+5a5e04be20-r0/recipe-sysroot/usr/lib/klibc/include/stdio.h:11: +| /mnt/b/yoe/master/build/tmp/work/raspberrypi4_64-yoe-linux/kexecboot-klibc/0.6+gitAUTOINC+5a5e04be20-r0/recipe-sysroot/usr/lib/klibc/include/stdarg.h:9:15: fatal error: 'stdarg.h' file not found +| #include_next <stdarg.h> +| ^~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index c75df23..d2adf38 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,6 +1,6 @@ + bin_PROGRAMS=kexecboot + +-kexecboot_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) ++kexecboot_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) -I$(shell $(CC) -print-file-name=include) + + kexecboot_SOURCES = \ + util.c \ +-- +2.30.0 + diff --git a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb index 2f46fa952..ad9ccd02c 100644 --- a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb @@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PV = "0.6+git${SRCPV}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/kexecboot/kexecboot.git" -SRC_URI_append_libc-klibc = " file://0001-kexecboot-Use-new-reboot-API-with-klibc.patch " - +SRC_URI_append_libc-klibc = "\ + file://0001-kexecboot-Use-new-reboot-API-with-klibc.patch \ + file://0001-make-Add-compiler-includes-in-cflags.patch \ +" SRCREV = "5a5e04be206140059f42ac786d424da1afaa04b6" inherit autotools diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch deleted file mode 100644 index eee144dc4..000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 241f423a015279cb29b7ad1a34386ef1c32007fc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Dec 2018 16:47:16 -0800 -Subject: [PATCH] Define ulocked_{fgets|fread|fwrite} aliases - -latest clang converts the normal calls to the unlocked variant -equivalents - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Cc: Andrea Adami <andrea.adami@gmail.com> ---- - usr/klibc/fgets.c | 2 ++ - usr/klibc/fread2.c | 2 ++ - usr/klibc/fwrite2.c | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/usr/klibc/fgets.c b/usr/klibc/fgets.c -index dbf742c6..2e9fcb65 100644 ---- a/usr/klibc/fgets.c -+++ b/usr/klibc/fgets.c -@@ -25,3 +25,5 @@ char *fgets(char *s, int n, FILE *f) - - return s; - } -+char *fgets_unlocked(char *s, int n, FILE *f) -+ __alias("fgets"); -diff --git a/usr/klibc/fread2.c b/usr/klibc/fread2.c -index 7dca56b1..5c234766 100644 ---- a/usr/klibc/fread2.c -+++ b/usr/klibc/fread2.c -@@ -11,3 +11,5 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE * f) - { - return _fread(ptr, size * nmemb, f) / size; - } -+size_t fread_unlocked(void *ptr, size_t size, size_t nmemb, FILE *f) -+ __alias("fread"); -diff --git a/usr/klibc/fwrite2.c b/usr/klibc/fwrite2.c -index cebc017c..3e0bb57d 100644 ---- a/usr/klibc/fwrite2.c -+++ b/usr/klibc/fwrite2.c -@@ -11,3 +11,5 @@ size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE * f) - { - return _fwrite(ptr, size * nmemb, f) / size; - } -+size_t fwrite_unlocked(void *ptr, size_t size, size_t nmemb, FILE *f) -+ __alias("fwrite"); --- -2.19.2 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch deleted file mode 100644 index 181dcfb6d..000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b4147b76518d31a88fb2c58cdbf2236e159a25c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 23:10:54 -0700 -Subject: [PATCH] Kbuild.klibc: Add path to compiler headers via -isystem - -We need to include this path so it can find compiler headers e.g. -stdarg.h which is called from wrapper stdarg.h using include_next - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - scripts/Kbuild.klibc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc -index 101f86f..1d5cdc4 100644 ---- a/scripts/Kbuild.klibc -+++ b/scripts/Kbuild.klibc -@@ -105,7 +105,8 @@ KLIBCOBJCOPY := $(OBJCOPY) - KLIBCOBJDUMP := $(OBJDUMP) - - # klibc include paths --KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ -+KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ -+ -isystem $(shell $(CC) -print-file-name=include) \ - -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ - -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ - -I$(KLIBCOBJ)/../include \ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch deleted file mode 100644 index 1ba05a811..000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b6185401fc3daa7fa8ba2b84db3e4da3b94a9867 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 26 Jul 2017 16:13:16 -0700 -Subject: [PATCH] Kbuild.klibc: Use -print-libgcc-file-name instead of - --print-libgcc - --print-libgcc-file-name works with clang and gcc unlike --print-libgcc -which is gcc specific - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - scripts/Kbuild.klibc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc -index f500d53..101f86f 100644 ---- a/scripts/Kbuild.klibc -+++ b/scripts/Kbuild.klibc -@@ -128,7 +128,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) \ - KLIBCAFLAGS += -D__ASSEMBLY__ $(KLIBCCFLAGS) - KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note - --KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc) -+KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) -print-libgcc-file-name) - KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) - KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o - KLIBCLIBC := $(KLIBCOBJ)/libc.a diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch index fcf4f891a..ea14c49f0 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch @@ -14,8 +14,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> usr/klibc/arch/arm/MCONFIG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG -index 303c6ac..48d2685 100644 --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG @@ -10,7 +10,7 @@ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch index 94818e366..15b5144e4 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch @@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> usr/klibc/Kbuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild -index 98caf2e9..b34521e0 100644 --- a/usr/klibc/Kbuild +++ b/usr/klibc/Kbuild -@@ -168,7 +168,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash +@@ -183,7 +183,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash targets += interp.o quiet_cmd_interp = BUILD $@ @@ -25,4 +23,4 @@ index 98caf2e9..b34521e0 100644 + -D__ASSEMBLY__ \ -DLIBDIR=\"$(SHLIBDIR)\" \ -DSOHASH=\"$(SOLIBHASH)\" \ - -c -o $@ $< + $(KLIBCSTACKFLAGS) \ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch index 0768f6d51..f096486d0 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch @@ -10,11 +10,9 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> usr/klibc/SYSCALLS.def | 1 + 1 file changed, 1 insertion(+) -diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def -index 6b3bf4c..d4184ba 100644 --- a/usr/klibc/SYSCALLS.def +++ b/usr/klibc/SYSCALLS.def -@@ -274,6 +274,7 @@ int syslog::klogctl(int, char *, int); +@@ -275,6 +275,7 @@ int syslog::klogctl(int, char *, int); int sysinfo(struct sysinfo *); long kexec_load(void *, unsigned long, struct kexec_segment *, unsigned long); <x86_64,ppc64,s390x> long kexec_file_load(int, int, unsigned long, const char *, unsigned long); @@ -22,6 +20,3 @@ index 6b3bf4c..d4184ba 100644 /* * Low-level I/O (generally architecture-specific); --- -2.7.4 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch index 3d8d987c4..b03fb9126 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch @@ -10,11 +10,9 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> usr/klibc/SYSCALLS.def | 1 + 1 file changed, 1 insertion(+) -diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def -index c56e8f9..6b3bf4c 100644 --- a/usr/klibc/SYSCALLS.def +++ b/usr/klibc/SYSCALLS.def -@@ -273,6 +273,7 @@ int reboot::__reboot(int, int, int, void *); +@@ -274,6 +274,7 @@ int reboot::__reboot(int, int, int, void int syslog::klogctl(int, char *, int); int sysinfo(struct sysinfo *); long kexec_load(void *, unsigned long, struct kexec_segment *, unsigned long); @@ -22,6 +20,3 @@ index c56e8f9..6b3bf4c 100644 /* * Low-level I/O (generally architecture-specific); --- -2.7.4 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch new file mode 100644 index 000000000..8ccfe447e --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-workaround-for-overlapping-sections-in-binary.patch @@ -0,0 +1,52 @@ +From 911130ce429cbf6a92d0fbd17f0ff638ec941df2 Mon Sep 17 00:00:00 2001 +From: Petr Ovtchenkov <ptr@void-ptr.info> +Date: Sun, 7 Feb 2021 00:04:36 -0800 +Subject: [PATCH] workaround for overlapping sections in binary + +Problem: binary (typesize.bin) created from object file (typesize.o) +with 'objcopy -O binary ... '. But typesize.o has relocatable objects that all +copied with offset 0. This will lead to overlapping sections in binary. +By fortunate syscalls.pl check magic bytes and ring the bell. + +This is naive workaround: skip .note.gnu.property section that overlap +.rodata section. + +This not a bug of objcopy, https://sourceware.org/bugzilla/show_bug.cgi?id=27314 + +Related commit: + + commit de6f630e6be90d6d32d8bf2fed3f856b0c32f7ba + Author: H. Peter Anvin <hpa at zytor.com> + Date: Sat Jun 10 11:15:19 2006 -0700 + + [klibc] Detect the sizes of various types, and make available to sysstub.ph. + + This additional code effectively queries the C compiler for the sizes of + various types, and makes an associative array %typesize available to + sysstub.ph. This is currently not used, but it's expected that some + architectures, e.g. s390, will need this to determine which registers + go where, and how many registers are needed. + +Upstream-Status: Submitted [https://lists.zytor.com/archives/klibc/2021-February/004583.html] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + usr/klibc/syscalls/Kbuild | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild +index 2430b9b4..754d028e 100644 +--- a/usr/klibc/syscalls/Kbuild ++++ b/usr/klibc/syscalls/Kbuild +@@ -71,7 +71,7 @@ $(obj)/typesize.c: $(srctree)/$(KLIBCSRC)/syscalls.pl $(obj)/SYSCALLS.i \ + + # Convert typesize.o to typesize.bin + quiet_cmd_mkbin = OBJCOPY $@ +- cmd_mkbin = $(KLIBCOBJCOPY) -O binary $< $@ ++ cmd_mkbin = $(KLIBCOBJCOPY) -O binary --remove-section .note.gnu.property $< $@ + + $(obj)/typesize.bin: $(obj)/typesize.o FORCE + $(call if_changed,mkbin) +-- +2.30.0 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch new file mode 100644 index 000000000..69799c5c7 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/cross-clang.patch @@ -0,0 +1,24 @@ +--- a/scripts/Kbuild.klibc ++++ b/scripts/Kbuild.klibc +@@ -113,10 +113,8 @@ KLIBCCPPFLAGS := -nostdinc -iwithpref + -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ + -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ + -I$(KLIBCOBJ)/../include \ +- -I$(KLIBCINC) +-ifeq ($(cc-name),clang) +-KLIBCCPPFLAGS += -I$(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) +-endif ++ -I$(KLIBCINC) \ ++ -I$(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) + + # kernel include paths + KLIBCKERNELSRC ?= $(srctree) +@@ -137,7 +135,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(K + KLIBCAFLAGS += -D__ASSEMBLY__ $(KLIBCCFLAGS) + KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note + +-KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) $(if $(filter gcc,$(cc-name)),--print-libgcc,--print-libgcc-file-name)) ++KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc-file-name) + KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) + KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o + KLIBCLIBC := $(KLIBCOBJ)/libc.a diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch index 3b7031e98..56905a515 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch @@ -5,10 +5,22 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/klcc/klcc.in +++ b/klcc/klcc.in -@@ -207,6 +207,12 @@ while ( defined($a = shift(@ARGV)) ) { +@@ -207,6 +207,24 @@ while ( defined($a = shift(@ARGV)) ) { } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) { # Override gcc encoded sysroot push(@ccopt, $a); ++ } elsif ( $a eq '-nostartfiles' ) { ++ # Allow clang options ++ push(@ccopt, $a); ++ } elsif ( $a eq '-nostdlib' ) { ++ # Allow clang options ++ push(@ccopt, $a); ++ } elsif ( $a eq '-nodefaultlibs' ) { ++ # Allow clang options ++ push(@ccopt, $a); ++ } elsif ( $a eq '-no-pie' ) { ++ # Allow clang options ++ push(@ccopt, $a); + } elsif ( $a eq '-no-integrated-as' ) { + # Allow clang options + push(@ccopt, $a); diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch index eac128cc0..597382488 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch @@ -10,8 +10,6 @@ that /usr/bin/env perl will always return ours (if it has been built). Signed-off-by: Tom Rini <tom_rini@mentor.com> -Index: klibc-1.5.20/klcc/makeklcc.pl -=================================================================== --- a/klcc/makeklcc.pl +++ b/klcc/makeklcc.pl @@ -26,7 +26,7 @@ sub pathsearch($) { diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.7.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.8.bb index 4011aa231..4011aa231 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.7.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.8.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.7.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb index c835fd647..c835fd647 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.7.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.7.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb index 06e71cb7b..06e71cb7b 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.7.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 243107e9a..41147eb2d 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -15,13 +15,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \ file://0001-include-linux-sysinfo.h-directly.patch \ file://0001-mkfifo-Implement-mkfifo.patch \ file://0001-always-use-bfd-linker.patch \ - file://0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch \ - file://0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch \ file://0001-arm-Do-not-set-a-fallback-march-and-mtune.patch \ file://0001-klibc_2.0.4-add-kexec_file_load-syscall.patch \ file://0001-klibc-add-getrandom-syscall.patch \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ - file://0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch \ + file://cross-clang.patch \ + file://0001-workaround-for-overlapping-sections-in-binary.patch \ " ARMPATCHES ?= "" @@ -29,9 +28,7 @@ ARMPATCHES ?= "" ARMPATCHES_arm = " \ file://armv4-fix-v4bx.patch \ " - -SRC_URI[md5sum] = "712f8bc1a069e03d92584b7f5380c521" -SRC_URI[sha256sum] = "abef2637ca823485d9c90ce9512e2b08a65047ec4da204635eeaef95a41a9122" +SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d9cb436" S = "${WORKDIR}/klibc-${PV}" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.7.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb index 7df0b0a3d..7df0b0a3d 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.7.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-make-Add-compiler-includes-in-cflags.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-make-Add-compiler-includes-in-cflags.patch new file mode 100644 index 000000000..778d83012 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-make-Add-compiler-includes-in-cflags.patch @@ -0,0 +1,32 @@ +From 884ec4c654f1d07a387fdc1dae5640606369f254 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Feb 2021 10:56:36 -0800 +Subject: [PATCH] make: Add compiler includes in cflags + +Fixes + In file included from ../git/ubi-utils/ubiformat.c:47: +| ../git/include/common.h:22:10: fatal error: 'stdbool.h' file not found +| #include <stdbool.h> +| ^~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 5a6e77c..f0003d5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,6 +9,7 @@ endif + if WITHOUT_LZO + AM_CPPFLAGS += -DWITHOUT_LZO + endif ++AM_CPPFLAGS += -I$(shell $(CC) -print-file-name=include) + + sbin_PROGRAMS = + sbin_SCRIPTS = +-- +2.30.0 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb index d32238162..5f43b0229 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb @@ -16,6 +16,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git \ file://0003-Makefile.am-only-build-ubi-utils.patch \ file://0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch \ file://0005-common.h-replace-getline-with-fgets.patch \ + file://0001-make-Add-compiler-includes-in-cflags.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch index 5bbb178bc..07fa841cc 100644 --- a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch @@ -10,11 +10,9 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> purgatory/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/purgatory/Makefile b/purgatory/Makefile -index 49ce80a..1542b3a 100644 --- a/purgatory/Makefile +++ b/purgatory/Makefile -@@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c +@@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/s $(PURGATORY): CC=$(TARGET_CC) $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ @@ -23,14 +21,14 @@ index 49ce80a..1542b3a 100644 -fno-zero-initialized-in-bss \ -fno-PIC -fno-PIE -fno-stack-protector -@@ -59,8 +59,8 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ +@@ -59,8 +59,8 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO -Iinclude \ -I$(shell $(CC) -print-file-name=include) $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ - -Wl,--no-undefined -nostartfiles -nostdlib \ - -nodefaultlibs -e purgatory_start -r \ -+ -Wl,--no-undefined -Wl,-no-pie -Wl,-nostartfiles -Wl,-nostdlib \ -+ -Wl,-nodefaultlibs -Wl,--entry=purgatory_start -Wl,-r \ ++ -Wl,--no-undefined -no-pie -nostartfiles -nostdlib \ ++ -nodefaultlibs -Wl,--entry=purgatory_start -Wl,-r \ -Wl,-Map=$(PURGATORY_MAP) $(PURGATORY): $(PURGATORY_OBJS) diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch new file mode 100644 index 000000000..d4fbd1436 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/include_next.patch @@ -0,0 +1,22 @@ +--- a/kexec/Makefile ++++ b/kexec/Makefile +@@ -110,7 +110,7 @@ $(KEXEC): $(KEXEC_OBJS) $(UTIL_LIB) + @$(MKDIR) -p $(@D) + $(LINK.o) -o $@ $^ $(CFLAGS) $(LIBS) + +-$(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include ++$(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include -I$(shell $(CC) -print-file-name=include) + + kexec/fs2dt.o: CPPFLAGS+=$($(ARCH)_FS2DT_INCLUDE) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -46,7 +46,7 @@ TARGET_CFLAGS = @TARGET_CFLAGS@ + # Base compiler flags. These are extended by the subcomponent-Makefiles + # where necessary. + CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \ +- -Iinclude/ $($(ARCH)_CPPFLAGS) ++ -Iinclude/ $($(ARCH)_CPPFLAGS) -I$(shell $(CC) -print-file-name=include) + CFLAGS = @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes + PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@ + ASFLAGS = @ASFLAGS@ $($(ARCH)_ASFLAGS) diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb index d28cfc90f..c49b24f52 100644 --- a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb @@ -32,7 +32,9 @@ KLIBC_PATCHES += " \ file://0013-sha256.h-avoid-inclusion-of-sys-types.h.patch \ file://0014-add-if_nameindex-from-musl.patch \ file://0015-vmcore-dmesg-fix-warning.patch \ - file://klibc-reboot.patch" + file://klibc-reboot.patch \ + file://include_next.patch \ + " WARNING_FIXES = "" FROM_OE_CORE = "file://arm_crashdump-fix-buffer-align.patch \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 847a22311..74a2683ac 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x" -SRCREV = "fd9bf6a6b0d10a984d2eb0e0e549700b7aa590ec" +SRCREV = "e2d67ea77237046b703d537aec90620c22f7f629" S = "${WORKDIR}/git" -PV = "2.1.6" +PV = "2.1.7" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb index d047caef5..94d05def3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb @@ -10,9 +10,9 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad " SRCBRANCH ?= "master" -PV = "0.6.1" +PV = "0.7.2" -SRCREV_base = "c41a05cc9e2310c2f73eda4b4f0b4477bf4479c5" +SRCREV_base = "50e3dbd3b131de2a39d3917576e8f834631ec46b" SRCREV_common = "88e512ca7197a45c4114f7fa993108f23245bf50" SRC_URI = " \ @@ -22,7 +22,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -PACKAGECONFIG_CONFARGS = " \ +EXTRA_OECONF += " \ --disable-graphviz \ --enable-gtk-doc=no \ " @@ -33,8 +33,3 @@ FILES_${PN} += "\ " inherit autotools gettext - -do_configure() { - ${S}/autogen.sh --noconfigure - oe_runconf -} diff --git a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch deleted file mode 100644 index b56c78959..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 3dc8a678a844247d0afcf7e30fb3cbd5ccbd828f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 29 Jun 2017 14:05:06 -0700 -Subject: [PATCH] Rename conflicting variable 'mips' - -Fixes -test/srtp_driver.c:344:12: error: expected identifier or '(' before numeric constant - double mips = mips_estimate(1000000000, &ignore); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - test/srtp_driver.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/test/srtp_driver.c b/test/srtp_driver.c -index 8872971..d38ea19 100644 ---- a/test/srtp_driver.c -+++ b/test/srtp_driver.c -@@ -341,7 +341,7 @@ main (int argc, char *argv[]) { - if (do_codec_timing) { - srtp_policy_t policy; - int ignore; -- double mips = mips_estimate(1000000000, &ignore); -+ double est = mips_estimate(1000000000, &ignore); - - crypto_policy_set_rtp_default(&policy.rtp); - crypto_policy_set_rtcp_default(&policy.rtcp); -@@ -353,33 +353,33 @@ main (int argc, char *argv[]) { - policy.allow_repeat_tx = 0; - policy.next = NULL; - -- printf("mips estimate: %e\n", mips); -+ printf("mips estimate: %e\n", est); - - printf("testing srtp processing time for voice codecs:\n"); - printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n"); - printf("G.711\t\t%d\t\t\t%e\n", 80, -- (double) mips * (80 * 8) / -+ (double) est * (80 * 8) / - srtp_bits_per_second(80, &policy) / .01 ); - printf("G.711\t\t%d\t\t\t%e\n", 160, -- (double) mips * (160 * 8) / -+ (double) est * (160 * 8) / - srtp_bits_per_second(160, &policy) / .02); - printf("G.726-32\t%d\t\t\t%e\n", 40, -- (double) mips * (40 * 8) / -+ (double) est * (40 * 8) / - srtp_bits_per_second(40, &policy) / .01 ); - printf("G.726-32\t%d\t\t\t%e\n", 80, -- (double) mips * (80 * 8) / -+ (double) est * (80 * 8) / - srtp_bits_per_second(80, &policy) / .02); - printf("G.729\t\t%d\t\t\t%e\n", 10, -- (double) mips * (10 * 8) / -+ (double) est * (10 * 8) / - srtp_bits_per_second(10, &policy) / .01 ); - printf("G.729\t\t%d\t\t\t%e\n", 20, -- (double) mips * (20 * 8) / -+ (double) est * (20 * 8) / - srtp_bits_per_second(20, &policy) / .02 ); - printf("Wideband\t%d\t\t\t%e\n", 320, -- (double) mips * (320 * 8) / -+ (double) est * (320 * 8) / - srtp_bits_per_second(320, &policy) / .01 ); - printf("Wideband\t%d\t\t\t%e\n", 640, -- (double) mips * (640 * 8) / -+ (double) est * (640 * 8) / - srtp_bits_per_second(640, &policy) / .02 ); - } - --- -2.13.2 - diff --git a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb deleted file mode 100644 index 6c868185f..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.6.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "library implementing Secure RTP (RFC 3711)" -HOMEPAGE = "https://github.com/cisco/libsrtp" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=15bc16b9d2e305974dde47e733883714" - -S = "${WORKDIR}/git" -SRCREV = "2b091a4fb21c9b06fc5d4b5763bdaec97542fcd7" -SRC_URI = "git://github.com/cisco/libsrtp.git;protocol=https;branch=1_6_x_throttle; \ - file://0001-Rename-conflicting-variable-mips.patch \ - " - -inherit autotools pkgconfig - -EXTRA_OEMAKE += "shared_library" - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb new file mode 100644 index 000000000..9d4c305fc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "library implementing Secure RTP (RFC 3711)" +HOMEPAGE = "https://github.com/cisco/libsrtp" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1" + +S = "${WORKDIR}/git" +SRCREV = "d02d21111e379c297e93a9033d7b653135f732ee" +SRC_URI = "git://github.com/cisco/libsrtp.git" + +inherit autotools pkgconfig + +EXTRA_OEMAKE += "shared_library" + +do_configure_prepend() { + cp ${STAGING_DATADIR_NATIVE}/automake-*/ar-lib ${S} +} + +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.8.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb index 75f303068..76df27851 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.8.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "A helper library and tools for Active Directory client operations HOMEPAGE = "http://cgit.freedesktop.org/realmd/adcli" SECTION = "net" -SRCREV = "cc3ef52884a48863a81acbfc741735fe09cd85f7" +SRCREV = "1b1528038e084a9f81ea108cffca9c2707623b9c" SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master \ file://Fixed-build-error-on-musl.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch deleted file mode 100644 index b78f0b329..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c74f04dbab4d586287347b1d5517f36e2f0c3d8e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 19 Dec 2019 15:52:34 -0800 -Subject: [PATCH] Use GNUInstallDirs instead of hard-coding paths - -Bump minimum cmake version to be >= 3.1 - -Upstream-Status: Submitted [https://github.com/mguentner/cannelloni/pull/22] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 51b354f..958e0eb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.1) - project(cannelloni) - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -@@ -60,6 +60,8 @@ set_target_properties ( cannelloni-common - SOVERSION 0 - ) - -+include(GNUInstallDirs) -+ - if(SCTP_SUPPORT) - add_library(sctpthread STATIC sctpthread.cpp) - target_link_libraries(sctpthread addsources sctp) -@@ -68,5 +70,5 @@ endif(SCTP_SUPPORT) - set_target_properties(addsources PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - target_link_libraries(cannelloni addsources cannelloni-common pthread) - --install(TARGETS cannelloni DESTINATION bin) --install(TARGETS cannelloni-common DESTINATION lib) -+install(TARGETS cannelloni DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS cannelloni-common DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- -2.24.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0002-include-missing-stdexcept-for-runtime_error.patch b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0002-include-missing-stdexcept-for-runtime_error.patch deleted file mode 100644 index 55f28dd67..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni/0002-include-missing-stdexcept-for-runtime_error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1788762863cd1f657697575f6e73a22e661ccb43 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 23 Dec 2019 10:32:54 -0800 -Subject: [PATCH 2/2] include missing <stdexcept> for runtime_error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes -error: ‘runtime_error’ is not a member of ‘std’ - -Upstream-Status: Submitted [https://github.com/mguentner/cannelloni/pull/22] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - parser.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/parser.cpp b/parser.cpp -index 4afb9e0..5bcdbde 100644 ---- a/parser.cpp -+++ b/parser.cpp -@@ -2,6 +2,7 @@ - - #include <arpa/inet.h> - #include <string.h> -+#include <stdexcept> - - void parseFrames(uint16_t len, const uint8_t* buffer, std::function<canfd_frame*()> frameAllocator, - std::function<void(canfd_frame*, bool)> frameReceiver) --- -2.24.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb index d4a62bd92..0cf57ccdb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb @@ -2,13 +2,8 @@ SUMMARY = "a SocketCAN over Ethernet tunnel" HOMEPAGE = "https://github.com/mguentner/cannelloni" LICENSE = "GPLv2" -SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https \ - file://0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch \ - file://0002-include-missing-stdexcept-for-runtime_error.patch \ - " -SRCREV = "82aa49b417b96fe46bb3f017ae1bfea928f20f9a" - -PV = "20160414+${SRCPV}" +SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https" +SRCREV = "0bd7e27db35bdef361226882ae04205504f7b2f4" LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-workaround-error-with-autoconf-2.7.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-workaround-error-with-autoconf-2.7.patch new file mode 100644 index 000000000..80c571df9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-workaround-error-with-autoconf-2.7.patch @@ -0,0 +1,42 @@ +From 3b4ba29c7c5800df87eecd65214244619e01162b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sun, 7 Feb 2021 16:02:36 +0800 +Subject: [PATCH] workaround error with autoconf 2.7 + +While using autoconf 2.7, the AM_MISSING_PROG caused unexpected error: +... +configure.ac: error: required file 'missing' not found +... + +Since these tools were explicitly added by autotools bbclass, +remove the testing to workaround the error with autoconf 2.7 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 609efb104b..2d761cf62c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -693,14 +693,6 @@ fi + + AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers) + +-dnl # +-dnl # FIXME This is truly gross. +-dnl # +-missing_dir=`cd $ac_aux_dir && pwd` +-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +- + AC_PATH_PROG(LOCATE,locate) + AC_PATH_PROG(DIRNAME,dirname) + AC_PATH_PROG(GREP,grep) +-- +2.27.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb index 2c39c4c44..608d66b1b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 file://0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch \ file://0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ file://0001-raddb-certs-Makefile-fix-the-occasional-verification.patch \ + file://0001-workaround-error-with-autoconf-2.7.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch index 93ff6bcfa..37560f30c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch @@ -11,7 +11,7 @@ Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -89,6 +89,8 @@ +@@ -94,6 +94,8 @@ OUTPUT_NAME mosquitto VERSION ${VERSION} SOVERSION 1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch deleted file mode 100644 index 1397fc6a2..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Also install mqtt_protocol.h, as is done in Makefile -Author: Gianfranco Costamagna <locutusofborg@debian.org> -Bug-Debian: https://bugs.debian.org/951116 -Forwarded: https://github.com/eclipse/mosquitto/pull/1599 -Last-Update: 2020-02-15 - ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -114,4 +114,4 @@ - install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") - endif (WITH_STATIC_LIBRARIES) - --install(FILES mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -+install(FILES mqtt_protocol.h mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb index 36bfe099f..06220327e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.7.bb @@ -6,22 +6,21 @@ provides a lightweight method of carrying out messaging using a \ publish/subscribe model. " HOMEPAGE = "http://mosquitto.org/" SECTION = "console/network" -LICENSE = "EPL-1.0 | EDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20 \ +LICENSE = "EPL-2.0 | EDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ - file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ - file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ + file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ + file://notice.html;md5=541f8f37af492858dab8d2c1b69ede69 \ " -DEPENDS = "uthash" +DEPENDS = "uthash cjson dlt-daemon" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ file://1571.patch \ - file://install-protocol.patch \ " -SRC_URI[md5sum] = "beb8d76d6e45f1e66d711006082a631f" -SRC_URI[sha256sum] = "548d73d19fb787dd0530334e398fd256ef3a581181678488a741a995c4f007fb" +SRC_URI[md5sum] = "56de4e27533ab53697245809feea95bf" +SRC_URI[sha256sum] = "a98054f0b8161588975ef24e1d467550d3935f4c16ccee63ecb623248a28356e" inherit systemd update-rc.d useradd cmake @@ -29,6 +28,7 @@ PACKAGECONFIG ??= "ssl dlt websockets \ ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ " +PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native" PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" @@ -59,6 +59,8 @@ PACKAGE_BEFORE_PN = "${PN}-examples" FILES_${PN} = "${sbindir}/mosquitto \ ${bindir}/mosquitto_passwd \ + ${bindir}/mosquitto_ctrl \ + ${libdir}/mosquitto_dynamic_security.so \ ${sysconfdir}/mosquitto \ ${sysconfdir}/init.d \ ${systemd_unitdir}/system/mosquitto.service \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb index dcb23d05c..7a20e914f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb @@ -15,7 +15,6 @@ DEPENDS = " \ util-linux \ libndp \ libnewt \ - jansson \ curl \ " @@ -89,6 +88,7 @@ PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" PACKAGECONFIG[nmcli] = "--with-nmcli=yes,--with-nmcli=no,readline" +PACKAGECONFIG[ovs] = "--enable-ovs,--disable-ovs,jansson" PACKAGES =+ " \ ${PN}-nmcli ${PN}-nmcli-doc \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch deleted file mode 100644 index cfa8a7325..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 16 Apr 2015 22:41:57 +0200 -Subject: [PATCH] argz.h: fix musl compile (add missing defines) - -Upstream-Status: Pending - -Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines. - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - argz.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/argz.h b/argz.h -index 582be55..bdf9f62 100644 ---- a/argz.h -+++ b/argz.h -@@ -48,6 +48,22 @@ - # define __const const - #endif - -+#ifndef __THROW -+# define __THROW -+#endif -+ -+#ifndef __BEGIN_DECLS -+# define __BEGIN_DECLS -+#endif -+ -+#ifndef __END_DECLS -+# define __END_DECLS -+#endif -+ -+#ifndef __attribute_pure__ -+# define __attribute_pure__ -+#endif -+ - #ifndef __error_t_defined - typedef int error_t; - #endif --- -2.1.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch deleted file mode 100644 index 093054ce8..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 16 Apr 2015 22:43:49 +0200 -Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include) - -Upstream-Status: Pending - -Add sys/types.h include for u_char typedef. - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - tftp.h | 1 + - tftpd.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/tftp.h b/tftp.h -index 12bd6aa..32a3f63 100644 ---- a/tftp.h -+++ b/tftp.h -@@ -19,6 +19,7 @@ - - #include <sys/time.h> - #include <sys/times.h> -+#include <sys/types.h> - #include "tftp_def.h" - #include "config.h" - -diff --git a/tftpd.h b/tftpd.h -index 945065e..60d3a49 100644 ---- a/tftpd.h -+++ b/tftpd.h -@@ -20,6 +20,7 @@ - #include <pthread.h> - #include <arpa/tftp.h> - #include <arpa/inet.h> -+#include <sys/types.h> - #include "tftp_io.h" - - /* --- -2.1.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.2.bb b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb index ff9084dbf..936fc723f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb @@ -4,15 +4,12 @@ HOMEPAGE = "http://packages.debian.org/atftp" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" -SRCREV = "52b71f0831dcbde508bd3a961d84abb80a62480f" +SRCREV = "e56e8845f1070e89a4a6e509396b681688d03793" SRC_URI = "git://git.code.sf.net/p/atftp/code \ file://atftpd.init \ file://atftpd.service \ " -SRC_URI_append_libc-musl = " file://0001-argz.h-fix-musl-compile-add-missing-defines.patch \ - file://0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch \ - " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.1.5.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.1.bb index 1230fcaee..a778d2609 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.1.bb @@ -11,9 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" -SRC_URI[md5sum] = "27e1cfff5b8dd95062ad415957e663e5" -SRC_URI[sha256sum] = "d94d7ccbc5c95ab39c95a0e5ae89a25a224f39b6811f2930d3a1885a69732259" - +SRC_URI[sha256sum] = "91186f20c83ffc48d7a15a9a6e2329ed4feeb2dcb51f4aa9672c8840190ea741" UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" DEPENDS = "libnfnetlink openssl" diff --git a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.18.bb b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb index 7b1dfc241..a468a9ab6 100644 --- a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.18.bb +++ b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa88 SECTION = "libs" DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" -SRCREV = "e1f3d4fb4906a26bf155a0e3fff2b6cb02be4dd2" +SRCREV = "b8d18c8360fd39cb04748e8bc1ee26de4afa4cbd" SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1" UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases" diff --git a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.10.bb index 95e48f013..b724233ba 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.9.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.10.bb @@ -10,12 +10,12 @@ SECTION = "base" DEPENDS = "libtool libmnl" SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2" -SRC_URI[sha256sum] = "b75c13689eddf1d95b396840a69dc04fd7ae4112b10b70594bc0405df7b9b30a" +SRC_URI[sha256sum] = "b24906ba43e2fe322bd41863476761d749a4bddf5ce4c2265ba04b03bc7e9cf6" inherit autotools pkgconfig module-base EXTRA_OECONF += "-with-kbuild=${KBUILD_OUTPUT} --with-ksource=${STAGING_KERNEL_DIR}" -RRCOMMENDS_${PN} = "\ +RRECOMMENDS_${PN} = "\ kernel-module-ip-set \ -" +" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb index c540445d7..64958a75b 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb @@ -21,13 +21,6 @@ MAKE_TARGETS = "module" RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" MODULE_NAME = "wireguard" -# Kernel module packages MUST begin with 'kernel-module-', otherwise -# multilib image generation can fail. -# -# The following line is only necessary if the recipe name does not begin -# with kernel-module-. -PKG_${PN} = "kernel-module-${MODULE_NAME}" - module_do_install() { install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} install -m 0644 ${MODULE_NAME}.ko \ diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch new file mode 100644 index 000000000..4cd729044 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch @@ -0,0 +1,39 @@ +From 6f8ea2e841ad45eed193310b599d3f3b410ae91d Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 29 Jan 2021 08:49:15 +0000 +Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and 64bit + +With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves +differently between 32bit and 64bit system as the openssl lib resides under +/build/tmp/work/corei7-64-wrs-linux/net-snmp/5.9-r0/recipe-sysroot/usr/lib64 +for 64bit system, but resides under [1] for 32bit system. + +So add the patch to fix the gap between 32bit and 64bit system. + +[1] /build/tmp/work/corei7-64-wrs-linux/net-snmp/5.9-r0/recipe-sysroot/usr/lib + +Upstream-Status: Inappropriate [configuration specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + m4/ac_add_search_path.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4 +index 8e0a819..961f587 100644 +--- a/m4/ac_add_search_path.m4 ++++ b/m4/ac_add_search_path.m4 +@@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables + dnl + AC_DEFUN([AC_ADD_SEARCH_PATH],[ + if test "x$1" != x -a -d $1; then +- if test -d $1/lib; then +- LDFLAGS="-L$1/lib $LDFLAGS" ++ if test -d $1/${libdir:5}; then ++ LDFLAGS="-L$1/${libdir:5} $LDFLAGS" + fi + if test -d $1/include; then + CPPFLAGS="-I$1/include $CPPFLAGS" +-- +2.29.2 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb index bee83c4d1..d9040c164 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ file://net-snmp-fix-for-disable-des.patch \ file://reproducibility-have-printcap.patch \ + file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ " SRC_URI[sha256sum] = "04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071" @@ -57,7 +58,6 @@ EXTRA_OECONF = "--enable-shared \ --with-install-prefix=${D} \ --with-persistent-directory=${localstatedir}/lib/net-snmp \ ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ - --with-openssl=${STAGING_EXECPREFIXDIR} \ --with-mib-modules='${MIB_MODULES}' \ " @@ -102,11 +102,10 @@ do_configure_prepend() { } do_configure_append() { - if [ "${HAS_PERL}" = "1" ]; then - sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=${STAGING_DIR_TARGET}\$\{includedir\}@g" \ - -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ - -i ${B}/net-snmp-config - fi + sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=${STAGING_DIR_TARGET}\$\{includedir\}@g" \ + -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ + -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L${STAGING_DIR_TARGET}\$\{libdir\} @g" \ + -i ${B}/net-snmp-config } do_install_append() { @@ -128,15 +127,16 @@ do_install_append() { -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ - -e 's@-L${STAGING_DIR_HOST}${libdir}@@g' \ - -e 's@-I${STAGING_DIR_HOST}${includedir}@@g' \ + -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${bindir}/net-snmp-config - if [ "${HAS_PERL}" = "1" ]; then - sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=\$\{includedir\}@g" \ - -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ - -i ${D}${bindir}/net-snmp-config - fi + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${libdir}/pkgconfig/netsnmp*.pc + + sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=\$\{includedir\}@g" \ + -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ + -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L\$\{libdir\} @g" \ + -i ${D}${bindir}/net-snmp-config oe_multilib_header net-snmp/net-snmp-config.h } diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch index 1bf0f75c1..be2bb42fc 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch @@ -14,7 +14,7 @@ diff --git a/Makefile b/Makefile index 73ea23e..ed3eeb9 100644 --- a/Makefile +++ b/Makefile -@@ -59,8 +59,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI +@@ -60,8 +60,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2` ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack` ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack` @@ -22,9 +22,10 @@ index 73ea23e..ed3eeb9 100644 -lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` +lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua` +lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua` - nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed` - nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed` - gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp` + nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags 'nettle hogweed' \ + HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \ + HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle` + -- 2.9.5 diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb deleted file mode 100644 index 4ca1f3cc9..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb +++ /dev/null @@ -1,8 +0,0 @@ -require dnsmasq.inc - -SRC_URI[dnsmasq-2.82.md5sum] = "3c710dee3edba510ed11a6e3d9e0d9cb" -SRC_URI[dnsmasq-2.82.sha256sum] = "62f33bfac1a1b4a5dab8461b4664e414f7d6ced1d2cf141e9cdf9c3c2a424f65" -SRC_URI += "\ - file://lua.patch \ -" - diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb new file mode 100644 index 000000000..3dd9154f3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.84.md5sum] = "6bf24b5bcf9293db2941fbdb545c1133" +SRC_URI[dnsmasq-2.84.sha256sum] = "4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36" +SRC_URI += "\ + file://lua.patch \ +" + diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.4.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.16.bb index efab0c808..71163c8d9 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.16.bb @@ -1,16 +1,18 @@ SUMMARY = "Fetchmail retrieves mail from remote mail servers and forwards it via SMTP" HOMEPAGE = "http://www.fetchmail.info/" -DESCRIPTION = "Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." +DESCRIPTION = "Fetchmail is a full-featured, robust, well-documented remote-mail retrieval \ +and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP \ +connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, \ +RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." SECTION = "mail" LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ca53985c1fd053ae0bffffaa89ed49f1" +LIC_FILES_CHKSUM = "file://COPYING;md5=06a8d16599e1d0b131390bec01fb571c" DEPENDS = "openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "53d52179c8bf8e2f57489538b49bfda9" -SRC_URI[sha256sum] = "511b60daabf7543a01de06af07c8772290c6807cd53c42a8504960e978f3abea" +SRC_URI[sha256sum] = "044b9a0ac03afbae7744979defe3e2e32e39141bca68fd0c8deda2ed40884fb9" inherit autotools gettext python3-dir python3native diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.1.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.2.bb index 07d54b71f..ae92de2db 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6 SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://options-2.2.0.patch \ " -SRC_URI[md5sum] = "ce40593428c0de6b85946189dcc37b5e" -SRC_URI[sha256sum] = "ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77" +SRC_URI[md5sum] = "3376a86bdf9dd4abc6b8d8d645390902" +SRC_URI[sha256sum] = "27a03ef99e384d779124df755deb229cd1761f945eca6d200e8cfd9bf5297bd7" inherit waf-samba diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch new file mode 100644 index 000000000..484af4e0f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch @@ -0,0 +1,89 @@ +From d6d7130f0a2e3b81880fca29966e42c1b2be40a7 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Fri, 8 Jan 2021 22:22:52 +0000 +Subject: [PATCH] m4/sctp.m4: make conpatible to autoconf-2.70 + +On recently released `autoconf-2.70` generated `./configure` +fails as: + +``` +$ ./configure +... +checking for struct sctp_event_subscribe.sctp_stream_reset_event... yes +checking for gcc options needed to detect all undeclared functions... none needed +./configure: line 16464: syntax error: unexpected end of file +``` + +This happens becuase new autoconf generates less whitespace: + +``` +{ +if ... +... +fi} +``` + +It requires at least whitespace between `fi` and `}`. + +As input already has newlines the change just drops extra `{}`. + +Tested on `autoconf-2.69` and `autoconf-2.70`. + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> + +Upstream-Status: Backport [git://github.com/sctp/lksctp-tools.git] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +--- + m4/sctp.m4 | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/m4/sctp.m4 b/m4/sctp.m4 +index 6593517..94527a6 100644 +--- a/m4/sctp.m4 ++++ b/m4/sctp.m4 +@@ -6,7 +6,7 @@ + + # Macros to assist on probing kernel features + # Probes if a type is defined +-AC_DEFUN([LKSCTP_CHECK_TYPE], [{ ++AC_DEFUN([LKSCTP_CHECK_TYPE], [ + AC_CHECK_TYPE([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -22,10 +22,10 @@ AC_CHECK_TYPE([$1], + #ifdef HAVE_LINUX_SCTP_H + # include <linux/sctp.h> + #endif +-])}]) ++])]) + + # Probes if a struct has a given member +-AC_DEFUN([LKSCTP_CHECK_MEMBER], [{ ++AC_DEFUN([LKSCTP_CHECK_MEMBER], [ + AC_CHECK_MEMBER([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -41,10 +41,10 @@ AC_CHECK_MEMBER([$1], + #ifdef HAVE_LINUX_SCTP_H + # include <linux/sctp.h> + #endif +-])}]) ++])]) + + # Probes if a declaration is present +-AC_DEFUN([LKSCTP_CHECK_DECL], [{ ++AC_DEFUN([LKSCTP_CHECK_DECL], [ + AC_CHECK_DECL([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -60,4 +60,4 @@ AC_CHECK_DECL([$1], + #ifdef HAVE_LINUX_SCTP_H + # include <linux/sctp.h> + #endif +-])}]) ++])]) +-- +2.27.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb index 1e2c644b4..f481ffee1 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb @@ -15,6 +15,7 @@ LK_REL = "1.0.18" SRC_URI = " \ git://github.com/sctp/lksctp-tools.git \ + file://0001-m4-sctp.m4-make-conpatible-to-autoconf-2.70.patch \ file://run-ptest \ file://v4test.sh \ file://v6test.sh \ diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb index d24b0b475..959cccf35 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb @@ -11,8 +11,7 @@ SRC_URI = "\ https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \ file://0001-fetch-ocsp-response-use-python3.patch \ " -SRC_URI[md5sum] = "c38f1d230af8cec480ff9dd60c9e0db0" -SRC_URI[sha256sum] = "c5a7f09020f31247d0d1609078a75efadeccb7e5b86fc2e4389189b1b431fe63" +SRC_URI[sha256sum] = "f7d54fa6f8aed29f695ca44612136fa2359013547394d5dffeffca9e01a26b0f" inherit cmake manpages python3native PACKAGECONFIG[manpages] = "" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb index 1e4153779..22e4d8e9a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb @@ -17,6 +17,8 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig +CPPFLAGS += "${SELECTED_OPTIMIZATION}" + do_configure_prepend() { ${S}/autogen.sh } diff --git a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb index eb04dfae3..0b1bb6d51 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb @@ -17,7 +17,7 @@ SRC_URI = "git://github.com/open-iscsi/open-isns \ file://0001-isnsd.socket-use-run-instead-of-var-run.patch \ " -SRCREV = "cfdbcff867ee580a71bc9c18c3a38a6057df0150" +SRCREV = "0d86dc31fae2e2d77a082ccea5aba95426b40c3c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper index 4cebfb9c6..4cebfb9c6 100755..100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch index ce37d5eb2..1aea32eae 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch @@ -1,4 +1,4 @@ -From 6395659ca6d64b20bf78bb640c2cc523d6c1d9c2 Mon Sep 17 00:00:00 2001 +From 5a4abf223d79d4e1a58bbad1e4f2f406c7cab748 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Mon, 29 Dec 2014 18:16:04 +0800 Subject: [PATCH] remove host path from la_LDFLAGS @@ -7,42 +7,43 @@ Upstream-Status: Inappropriate [ cross compile specific ] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- - cmdlang/Makefile.am | 3 +-- - unix/Makefile.am | 6 ++---- - 2 files changed, 3 insertions(+), 6 deletions(-) + cmdlang/Makefile.am | 2 +- + unix/Makefile.am | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index d9a941f..21b9531 100644 +index 9cf180d..da46ceb 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - libOpenIPMIcmdlang_la_LIBADD = -lm \ +@@ -18,7 +18,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined bin_PROGRAMS = openipmish diff --git a/unix/Makefile.am b/unix/Makefile.am -index 5128839..bd0f897 100644 +index baf0815..80c3d5d 100644 --- a/unix/Makefile.am +++ b/unix/Makefile.am -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c +@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ $(GDBM_LIB) $(RT_LIB) --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined noinst_HEADERS = heap.h +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.30.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.31.bb index 4929c4f05..d172083bb 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.30.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.31.bb @@ -35,8 +35,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "8d35f68058ca5359973b4121e1544d31" -SRC_URI[sha256sum] = "237a9be2a30bde85a88c4ec2759b54eb5b21fede554ffabf8fef1ffac2b42ade" +SRC_URI[md5sum] = "ce8eb27da016dcad7543d0128fcb3b0a" +SRC_URI[sha256sum] = "7052f37726ff454b0dcac49f35dd030bc12c9570ca0ba5cd2d17774b8e9d9717" inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice/0001-configure.ac-explicitly-link-to-jpeg-lib.patch b/meta-openembedded/meta-networking/recipes-support/spice/spice/0001-configure.ac-explicitly-link-to-jpeg-lib.patch new file mode 100644 index 000000000..2d05143db --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice/0001-configure.ac-explicitly-link-to-jpeg-lib.patch @@ -0,0 +1,48 @@ +From 6ffd9db8e02e411bda2f421abf7951dab6cf0e38 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 5 Feb 2021 01:43:44 -0800 +Subject: [PATCH] configure.ac: explicitly link to jpeg lib + +Since oe has added lib jpeg to the depends, explicitly link to jpeg lib +to workaround build failure with autoconf 2.7 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1ce81f91..8bbb50de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -191,24 +191,12 @@ AC_SUBST(SSL_CFLAGS) + AC_SUBST(SSL_LIBS) + AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"]) + +-AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, +- AC_MSG_CHECKING([for jpeglib.h]) +- AC_TRY_CPP( +-[#include <stdio.h> +-#undef PACKAGE +-#undef VERSION +-#undef HAVE_STDLIB_H +-#include <jpeglib.h>], +- JPEG_LIBS='-ljpeg' +- AC_MSG_RESULT($jpeg_ok), +- AC_MSG_ERROR([jpeglib.h not found])), +- AC_MSG_ERROR([libjpeg not found])) ++JPEG_LIBS='-ljpeg' + AC_SUBST(JPEG_LIBS) + + AC_CHECK_LIB(z, deflate, Z_LIBS='-lz', AC_MSG_ERROR([zlib not found])) + AC_SUBST(Z_LIBS) + +- + AC_ARG_ENABLE([manual], + AS_HELP_STRING([--enable-manual=@<:@auto/yes/no@:>@], + [Build SPICE manual]), +-- +2.29.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb index fad8b639e..52dad7124 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb @@ -25,6 +25,7 @@ SRC_URI = " \ git://anongit.freedesktop.org/spice/spice-common;destsuffix=git/subprojects/spice-common;name=spice-common \ file://0001-Convert-pthread_t-to-be-numeric.patch \ file://0001-Fix-compile-errors-on-Linux-32bit-system.patch \ + file://0001-configure.ac-explicitly-link-to-jpeg-lib.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.3.bb index d28482414..1c470d8bc 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.3.bb @@ -4,7 +4,7 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " @@ -12,7 +12,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "1e9e239f2449f240a7910ed598084ccaf8ea308b2b46b196c5adbec59612226c" +SRC_URI[sha256sum] = "f467cc77f0fc73fce0b854cdbc292f132d4879fca69d417eccad5f967fbf262b" PE = "1" diff --git a/meta-openembedded/meta-oe/README b/meta-openembedded/meta-oe/README index 8d787df68..98f671d7c 100644 --- a/meta-openembedded/meta-oe/README +++ b/meta-openembedded/meta-oe/README @@ -14,6 +14,9 @@ e.g. on archlinux based distributions install prerequisites like below pacman -S lib32-gcc-libs lib32-glibc +Ubuntu +sudo apt-get install gcc-multilib + Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' When sending single patches, please use something like: diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 1f6086164..3de301550 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -98,3 +98,5 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ " DEFAULT_TEST_SUITES_pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}" + +NON_MULTILIB_RECIPES_append = " crash" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb index 130ff13ec..614cdf6e3 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb @@ -125,6 +125,8 @@ MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js60-config" do_install_append() { oe_multilib_header mozjs-60/js-config.h + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/js60-config } PACKAGES =+ "lib${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch new file mode 100644 index 000000000..739fd20fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch @@ -0,0 +1,31 @@ +From cc4499cd4cfcb655fc44c3f3571eee20663dafde Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin <andrey.z@gmail.com> +Date: Wed, 3 Feb 2021 20:44:34 +0000 +Subject: [PATCH] configure.ac: check for CPP prog + +Absence of check for CPP_PROG causes following build errors: +| checking TCP_CONGESTION socket option... ../git/configure: line 14427: CPP: command not found +| ../git/configure: line 14553: ac_fn_c_try_cpp: command not found +| ../git/configure: line 14553: ac_fn_c_try_cpp: command not found + +Upstream-Status: Pending +Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 939cf0a..f75b398 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,6 +47,7 @@ AC_CANONICAL_HOST + # Checks for tools: c compiler, ranlib (used for creating static libraries), + # symlinks and libtool + AC_PROG_CC ++AC_PROG_CPP + AC_PROG_RANLIB + AC_PROG_LN_S + AC_PROG_LIBTOOL +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb index d969555c2..be75837be 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b7fb682e9941a49f1214dcd7441410d7" SRC_URI = "git://github.com/esnet/iperf.git \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ + file://0001-configure.ac-check-for-CPP-prog.patch \ " SRCREV = "1f8fb13297f3e3e40169ebcd12e171167e394473" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch new file mode 100644 index 000000000..78a4cb0fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch @@ -0,0 +1,31 @@ +From b6dba773491bbb7b4664dacdd87a12af860f1bd8 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Thu, 28 Jan 2021 05:43:33 -0800 +Subject: [PATCH] tests/makefile: Append CPPFLAGS rather then override + +CPPFLAGS overrided and we could miss some options needed. + +Upstream-Status: Submitted +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + tests/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 0ca3716..d262932 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -33,8 +33,8 @@ HELPERS = get_hugetlbfs_path compare_kvers + HELPER_LIBS = libheapshrink.so + BADTOOLCHAIN = bad-toolchain.sh + +-CFLAGS = -O2 -Wall -g +-CPPFLAGS = -I.. ++CFLAGS += -O2 -Wall -g ++CPPFLAGS += -I.. + STATIC_LIBHUGE = -Wl,--whole-archive -lhugetlbfs -Wl,--no-whole-archive + STATIC_LDLIBS = -Wl,--no-as-needed -lpthread + LDLIBS = $(STATIC_LDLIBS) -ldl -lhugetlbfs_privutils +-- +2.26.2.Cisco + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 2f07c938b..fa63316b0 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -26,6 +26,7 @@ SRC_URI = " \ file://0006-include-limits.h-for-PATH_MAX.patch \ file://0001-huge_page_setup_helper-use-python3-interpreter.patch \ file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \ + file://0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch deleted file mode 100644 index 22a452508..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b94eff3461e4fb99cd761d6858e8ed94cb6c5412 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Tue, 8 Dec 2020 11:58:06 +0900 -Subject: [PATCH] 0001-Modify-parameter-of-function-sctp_gensio_alloc.patch - -parameter type of declearation is const, definition should also be -const. - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - lib/gensio_sctp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/gensio_sctp.c b/lib/gensio_sctp.c -index bd9437f..4278ff8 100644 ---- a/lib/gensio_sctp.c -+++ b/lib/gensio_sctp.c -@@ -1092,7 +1092,7 @@ str_to_sctp_gensio_accepter(const char *str, const char * const args[], - #else - - int --sctp_gensio_alloc(struct gensio_addr *iai, const char * const args[], -+sctp_gensio_alloc(const struct gensio_addr *iai, const char * const args[], - struct gensio_os_funcs *o, - gensio_event cb, void *user_data, - struct gensio **new_gensio) --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.3.bb index 424e176ca..89d454989 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.3.bb @@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " -SRCREV = "4ec19138aa968dea34e4bc4e022c1ad7ed4c43c0" +SRCREV = "88fe56696b19ffff3e16be1d46d062e835879740" -SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ - file://0001-Modify-parameter-of-function-sctp_gensio_alloc.patch" +SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=2.2.x" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch new file mode 100644 index 000000000..ab55b48b7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch @@ -0,0 +1,31 @@ +From 9389f472bc724abb6c6a8db696efb132215783cc Mon Sep 17 00:00:00 2001 +From: Andrew Zaborowski <andrew.zaborowski@intel.com> +Date: Thu, 24 Dec 2020 00:22:15 +0100 +Subject: [PATCH] crypto: Update l_pkcs5_pbkdf2 call after rename + +--- +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=9ef3d51f8724c9b9f9fd4d4fffcc730f4bb1c806] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + + src/crypto.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/crypto.c b/src/crypto.c +index f5f8e24d..563f17ce 100644 +--- a/src/crypto.c ++++ b/src/crypto.c +@@ -552,8 +552,9 @@ int crypto_psk_from_passphrase(const char *passphrase, + if (ssid_len == 0 || ssid_len > 32) + return -ERANGE; + +- result = l_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase, ssid, ssid_len, +- 4096, psk, sizeof(psk)); ++ result = l_cert_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase, ++ ssid, ssid_len, 4096, ++ psk, sizeof(psk)); + if (!result) + return -ENOKEY; + +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb index b2495348f..2205b72ff 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.10.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb @@ -5,8 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "d8dc5a9bd19c5b98d8692801d3cf4e8af495930a" +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + file://0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch \ + " +SRCREV = "355c2df97e1adfdaee4a67c1705bd76202384687" S = "${WORKDIR}/git" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.6.bb index 148b3ca8d..6fe6a2e4f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.6.bb @@ -13,5 +13,5 @@ inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "4b4b12ab7153d7c999289b5dfc2d25db" -SRC_URI[sha256sum] = "dd488ee6176243a6adb27a5872897336272ea7bea33a3ad501ba268e5a58b285" +SRC_URI[md5sum] = "38d228548eae3ee144e19a42b028eab0" +SRC_URI[sha256sum] = "760465caaa1ccd699c14290e9791da456d5300dd11ebf4c1486151033e875dfd" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 297185de7..57267a8de 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -18,7 +18,7 @@ PV = "3.00" S = "${WORKDIR}/git" -inherit autotools gettext update-rc.d systemd mime-xdg +inherit autotools-brokensep gettext update-rc.d systemd mime-xdg PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" @@ -33,12 +33,16 @@ TRANSMISSION_GROUP ??= "root" # Configure aborts with: # config.status: error: po/Makefile.in.in was not created by intltoolize. -B = "${S}" -do_configure_prepend() { +do_configure() { sed -i /AM_GLIB_GNU_GETTEXT/d ${S}/configure.ac cd ${S} ./update-version-h.sh intltoolize --copy --force --automake + aclocal + libtoolize --automake --copy --force + autoconf + automake -a + oe_runconf } do_install_append() { diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.3.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb index e6129e246..f4c5aa396 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" DEPENDS = "mm-common" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz" -SRC_URI[md5sum] = "ea68c7afc23a4b89a2dfa78344460785" -SRC_URI[sha256sum] = "0b68dfc6313c6cc90ac989c6d722a1bf0585ad13846e79746aa87cb265904786" +SRC_URI[sha256sum] = "dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b" S = "${WORKDIR}/libsigc++-${PV}" -inherit autotools +inherit meson FILES_${PN}-dev += "${libdir}/sigc++-*/" FILES_${PN}-doc += "${datadir}/devhelp" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 94830e297..ba8559699 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -961,7 +961,7 @@ RDEPENDS_packagegroup-meta-oe-fortran-packages = "\ # nlohmann-json exprtk liblightmodbus p8platform gnome-doc-utils-stub # glm ttf-mplus xbitmaps ceres-solver cli11 fftw gnulib libeigen ade # spdlog span-lite uthash websocketpp catch2 properties-cpp cpp-netlib - +# cereal # rsyslog conflicts with syslog-ng so its not included here EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb index 78c1cb444..04106fcc9 100644 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb @@ -21,8 +21,7 @@ SRC_URI = " \ file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ " -SRC_URI[md5sum] = "4efa5551d230165981b105e7c6a50aa7" -SRC_URI[sha256sum] = "4a197a4f1a05785d7453dd829b231352fb2d09171bd86c5ffaafbb2dd6791351" +SRC_URI[md5sum] = "8a25d23f3ae732af300a56fa33cacff2" EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ --with-logo=${LOGO} \ @@ -41,7 +40,7 @@ PACKAGECONFIG[initrd] = ",,," LOGO ??= "${datadir}/plymouth/bizcom.png" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig systemd gettext do_install_append() { # Remove /var/run from package as plymouth will populate it on startup diff --git a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb index 46e694be4..0c5fc9319 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb @@ -14,4 +14,15 @@ UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P<pver>\d+(\.\d+)+)/" inherit autotools-brokensep gettext binconfig +do_configure() { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + aclocal + libtoolize --automake --copy --force + autoconf + autoheader + automake -a + oe_runconf +} + CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch new file mode 100644 index 000000000..c54a886a2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch @@ -0,0 +1,32 @@ +From 7177d8334a3c28ab0ec5c90e0656f43414929659 Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Fri, 5 Feb 2021 17:15:42 -0500 +Subject: [PATCH] configure.in: bypass autoconf 2.69 version check + +for upgrade to autoconf 2.71 + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + configure.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 8d4e9ac..75203c2 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + + AC_INIT([PostgreSQL], [13.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb index aeeddc647..f2a29a59d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb @@ -6,6 +6,7 @@ SRC_URI += "\ file://not-check-libperl.patch \ file://0001-Add-support-for-RISC-V.patch \ file://0001-Improve-reproducibility.patch \ + file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ " SRC_URI[sha256sum] = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cereal/cereal/0001-add-license-files-for-components-of-cereal.patch b/meta-openembedded/meta-oe/recipes-devtools/cereal/cereal/0001-add-license-files-for-components-of-cereal.patch new file mode 100644 index 000000000..0000ab919 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cereal/cereal/0001-add-license-files-for-components-of-cereal.patch @@ -0,0 +1,99 @@ +From 481b2aa46b3f54d9bee059d9da68263edece2bb3 Mon Sep 17 00:00:00 2001 +From: Adam Miartus <adam.miartus@softhows.eu> +Date: Mon, 1 Feb 2021 16:15:01 +0100 +Subject: [PATCH] add license files for components of cereal + +Signed-off-by: Adam Miartus <adam.miartus@softhows.eu> +--- + include/cereal/external/LICENSE | 21 ++++++++++++++ + include/cereal/external/rapidjson/LICENSE | 13 +++++++++ + .../external/rapidjson/msinttypes/LICENSE | 29 +++++++++++++++++++ + 3 files changed, 63 insertions(+) + create mode 100644 include/cereal/external/LICENSE + create mode 100644 include/cereal/external/rapidjson/LICENSE + create mode 100644 include/cereal/external/rapidjson/msinttypes/LICENSE + +diff --git a/include/cereal/external/LICENSE b/include/cereal/external/LICENSE +new file mode 100644 +index 00000000..66300b68 +--- /dev/null ++++ b/include/cereal/external/LICENSE +@@ -0,0 +1,21 @@ ++Copyright (C) 2004-2008 René Nyffenegger ++ ++This source code is provided 'as-is', without any express or implied ++warranty. In no event will the author be held liable for any damages ++arising from the use of this software. ++ ++Permission is granted to anyone to use this software for any purpose, ++including commercial applications, and to alter it and redistribute it ++freely, subject to the following restrictions: ++ ++1. The origin of this source code must not be misrepresented; you must not ++ claim that you wrote the original source code. If you use this source code ++ in a product, an acknowledgment in the product documentation would be ++ appreciated but is not required. ++ ++2. Altered source versions must be plainly marked as such, and must not be ++ misrepresented as being the original source code. ++ ++3. This notice may not be removed or altered from any source distribution. ++ ++René Nyffenegger rene.nyffenegger@adp-gmbh.ch +diff --git a/include/cereal/external/rapidjson/LICENSE b/include/cereal/external/rapidjson/LICENSE +new file mode 100644 +index 00000000..4546f15a +--- /dev/null ++++ b/include/cereal/external/rapidjson/LICENSE +@@ -0,0 +1,13 @@ ++Tencent is pleased to support the open source community by making RapidJSON available. ++ ++Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved. ++ ++Licensed under the MIT License (the "License"); you may not use this file except ++in compliance with the License. You may obtain a copy of the License at ++ ++http://opensource.org/licenses/MIT ++ ++Unless required by applicable law or agreed to in writing, software distributed ++under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR ++CONDITIONS OF ANY KIND, either express or implied. See the License for the ++specific language governing permissions and limitations under the License. +diff --git a/include/cereal/external/rapidjson/msinttypes/LICENSE b/include/cereal/external/rapidjson/msinttypes/LICENSE +new file mode 100644 +index 00000000..e3d96f8f +--- /dev/null ++++ b/include/cereal/external/rapidjson/msinttypes/LICENSE +@@ -0,0 +1,29 @@ ++ISO C9x compliant stdint.h for Microsoft Visual Studio ++Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 ++ ++ Copyright (c) 2006-2013 Alexander Chemeris ++ ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++ ++ 1. Redistributions of source code must retain the above copyright notice, ++ this list of conditions and the following disclaimer. ++ ++ 2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ ++ 3. Neither the name of the product nor the names of its contributors may ++ be used to endorse or promote products derived from this software ++ without specific prior written permission. ++ ++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED ++WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO ++EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; ++OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/cereal/cereal_1.3.0.bb b/meta-openembedded/meta-oe/recipes-devtools/cereal/cereal_1.3.0.bb new file mode 100644 index 000000000..a4b7f3432 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cereal/cereal_1.3.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "cereal is a header-only C++11 serialization library" +HOMEPAGE = "https://uscilab.github.io/cereal" +LICENSE = "BSD & MIT & BSL-1.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=e612690af2f575dfd02e2e91443cea23 \ + file://include/cereal/external/rapidxml/license.txt;md5=d63ab70ba21ca0544b03284958324301 \ + file://include/cereal/external/LICENSE;md5=b07578c9df99c0b8b45eb041efd4a645 \ + file://include/cereal/external/rapidjson/LICENSE;md5=e7abb663111d4ac17cf00323698aff08 \ + file://include/cereal/external/rapidjson/msinttypes/LICENSE;md5=dffce65b98c773976de2e338bd130f46 \ +" + +inherit cmake pkgconfig + +RDEPENDS_${PN}-dev = "" + +SRC_URI = " \ + git://github.com/USCiLab/cereal.git;protocol=https \ + file://0001-add-license-files-for-components-of-cereal.patch \ +" + +SRCREV = "02eace19a99ce3cd564ca4e379753d69af08c2c8" + +EXTRA_OECMAKE += "\ + -DCEREAL_INSTALL=TRUE \ + -DJUST_INSTALL_CEREAL=TRUE \ +" + +S = "${WORKDIR}/git" + +PROVIDES += "${PN}-dev" + +FILES_${PN}-dev = " \ + ${includedir} \ + ${libdir} \ + ${datadir}/cmake \ +" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20200427.bb b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20201006.bb index ff781f694..1b42590f4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20200427.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20201006.bb @@ -3,13 +3,13 @@ DESCRIPTION = "cpuid dumps detailed information about the CPU(s) gathered \ from the CPUID instruction, and also determines the exact model of CPU(s). \ It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, \ UMC, NexGen, Rise, and SiS CPUs" +HOMEPAGE="http://www.etallen.com/cpuid.html" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ " -SRC_URI[md5sum] = "daa93ee2fdaf461e515b4713e7337076" -SRC_URI[sha256sum] = "c1a9463f1f2175086120e9079e318bbd383dc1e574fafb2f724879f1d11061d4" +SRC_URI[sha256sum] = "13c53f16408341d11ed489b352f218ec4dbb5bedb796a9d059e924770a9c56a6" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch deleted file mode 100644 index 25e5ac4ea..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 -From: Dominik Schmidt <dominik@schm1dt.ch> -Date: Sun, 23 Feb 2020 19:15:30 +0100 -Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible - with libgit2-0.99 - -LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99", -from libgit2-0.99 and beyond. Arithmetic checks against this -variable whill hence fail. This patch switches the checks to -compare against the LIBGIT2_VER_* family, which should be more stable. ---- - git-changebar/src/gcb-plugin.c | 6 +++--- - workbench/src/plugin_main.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c -index b7083199..a911815f 100644 ---- a/git-changebar/src/gcb-plugin.c -+++ b/git-changebar/src/gcb-plugin.c -@@ -32,11 +32,11 @@ - #include <geany.h> - #include <document.h> - --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) - /* 0.23 added @p binary_cb */ - # define git_diff_buffers(old_buffer, old_len, old_as_path, \ - new_buffer, new_len, new_as_path, options, \ -@@ -45,7 +45,7 @@ - new_buffer, new_len, new_as_path, options, \ - file_cb, hunk_cb, line_cb, payload) - #endif --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) - # define git_buf_dispose git_buf_free - # define git_error_last giterr_last - #endif -diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c -index 6fa6fc84..25ecdf6d 100644 ---- a/workbench/src/plugin_main.c -+++ b/workbench/src/plugin_main.c -@@ -36,7 +36,7 @@ - #include "tm_control.h" - - --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb index 3cf260573..890bbdb44 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb @@ -31,10 +31,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ - file://0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch \ " -SRC_URI[md5sum] = "91fb4634953702f914d9105da7048a33" -SRC_URI[sha256sum] = "ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6" +SRC_URI[sha256sum] = "c98f9b1303f4ab9bed7587e749cd0b5594d9136a1bf8ba110900d46a17fa9cd8" do_configure_prepend() { rm -f ${S}/build/cache/glib-gettext.m4 diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch b/meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch new file mode 100644 index 000000000..b96684719 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch @@ -0,0 +1,22 @@ +From 51e145b43e66134aa4b33c9af0319331ec8a5bce Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 5 Feb 2021 23:15:45 -0800 +Subject: [PATCH] configure: Use AC_PROG_INTLTOOL + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/configure.ac ++++ b/configure.ac +@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects]) + AC_CONFIG_HEADERS([config.h]) +- ++AC_PROG_INTLTOOL + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + + GEANY_PREFIX diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb index 039999f6b..b361b1187 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb @@ -9,9 +9,10 @@ inherit features_check autotools pkgconfig perlnative gettext mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://download.geany.org/${BP}.tar.bz2" -SRC_URI[md5sum] = "53216a43345e2b6dbefa02ac24885753" -SRC_URI[sha256sum] = "9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e" +SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \ + file://0001-configure-Upgrade-to-a-modern-Gettext.patch \ + " +SRC_URI[sha256sum] = "18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18" FILES_${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.16.bb index 7b1a8a639..b6bc80784 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.16.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42 SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz" -SRC_URI[md5sum] = "060103c6d6e4d9833fa7715860f2923b" -SRC_URI[sha256sum] = "43f9cc0f87620bbb159e0890e196b23a8e6419cbd04224c10f3dcee948f6b51a" +SRC_URI[md5sum] = "5ee30bf7c76f00cc69f92388ad776e2a" +SRC_URI[sha256sum] = "8f1a09c070738adc695df903f2e7f74308dd8d991b914c0bc390a0e6021294dd" S = "${WORKDIR}/IO-Tty-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb index 4e5a8a6ff..4e7aeb128 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.02000.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb @@ -11,7 +11,7 @@ DEPENDS += "perl" SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https" -SRCREV = "42a6324df654e92419512cee80c0b49155d9e56d" +SRCREV = "ebbae181c5e311fa80ee4c6379b598c7a6400570" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch deleted file mode 100644 index 745f5d013..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001 -From: Ruslan Bilovol <rbilovol@cisco.com> -Date: Thu, 24 Jan 2019 18:11:39 +0200 -Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path - -Currently this path is hardcoded to lib/cmake. -Some distributions have different library path (like lib64). -So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR -configurable and usable in such distros. - -Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9] - -Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c60407..0275672 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -199,9 +199,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY) - - # ... for the install tree --SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} ) -+SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) - FILE( RELATIVE_PATH REL_INCLUDE_DIR -- "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}" -+ "${CMAKECONFIG_INSTALL_DIR}" - "${CMAKE_INSTALL_PREFIX}/include" ) - - SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" ) --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch deleted file mode 100644 index cf3e16ea5..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 827155e5e659b2a5065b00d701bc59b57feab2bf Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Mon, 19 Dec 2016 01:37:11 -0800 -Subject: [PATCH] remove -march=native from CMAKE_CXX_FLAGS - -Not appropriate when cross compiling. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: git/CMakeLists.txt -=================================================================== ---- git.orig/CMakeLists.txt -+++ git/CMakeLists.txt -@@ -51,10 +51,10 @@ endif(CCACHE_FOUND) - - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - else() - #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror") - set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion) -@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") - else() - #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers") - set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything) diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch new file mode 100644 index 000000000..bda90edb2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch @@ -0,0 +1,39 @@ +From 6b1cbe8b4dcc45103d69bc7337e5eb33d1fd21f3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Feb 2021 14:22:51 -0800 +Subject: [PATCH] Do not use AC_HEADER_STDC + +This macro is removed in autotools 2.70+ and it can be expected that C90 +headers are always available [1] + +Upstream-Status: Pending + +[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.70/autoconf.html#index-AC_005fHEADER_005fSTDC + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 01b61097..2823ecd7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,14 +101,8 @@ AM_WITH_DMALLOC + # + # Checks for header files. + # +-AC_HEADER_STDC + AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h sys/stat.h]) + +-# REQUIRE standard C headers +-if test "$ac_cv_header_stdc" != yes; then +- AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.]) +-fi +- + # + # Checks for typedefs, structures, and compiler characteristics. + # +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb index 53856263f..cacdd74c4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -9,7 +9,9 @@ DEPENDS += "flex-native bison-native xmlto-native" PV = "1.3.0+git${SRCPV}" # v1.3.0 SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" -SRC_URI = "git://github.com/yasm/yasm.git" +SRC_URI = "git://github.com/yasm/yasm.git \ + file://0001-Do-not-use-AC_HEADER_STDC.patch \ +" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch deleted file mode 100644 index ad4493f0b..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4f2dd929618f149087249f3c90cc056d5080b1e4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 3 Nov 2016 01:20:33 -0700 -Subject: [PATCH] boinc: Add recipe for boinc-client - -Do not add prefix/lib to library search path -let sysroot take care of that - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate[Cross-compile specific] - ---- - m4/ax_check_gl.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 -index e26ce5b930..1e60c9266a 100644 ---- a/m4/ax_check_gl.m4 -+++ b/m4/ax_check_gl.m4 -@@ -58,7 +58,7 @@ else - else - ax_try_lib="${ax_lib}" - fi -- LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" -+ LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ - # if HAVE_WINDOWS_H && defined(_WIN32) diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb index db90f06f4..d2e81ee78 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb @@ -29,11 +29,10 @@ DEPENDS = "curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " -SRCREV = "e0e033af9fca3cca84a3417ea6531ae25be73a7a" -BRANCH = "client_release/7/${PV}" +SRCREV = "df0239e6f074207798a8ecf1358a74545dda9132" +BRANCH = "client_release/7/7.16" SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ - file://opengl_m4_check.patch \ file://gtk-configure.patch \ " @@ -56,11 +55,12 @@ EXTRA_OECONF += "\ --without-wxdir \ --without-x \ --with-boinc-platform=${TARGET_SYS} \ + ac_cv_c_undeclared_builtin_options='none' \ " export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config" do_configure_prepend () { - if "${@bb.utils.contains('DEPENDS', 'gtk+', '1', '0', d)}" = "0" + if [ "${@bb.utils.contains('DEPENDS', 'gtk+', '1', '0', d)}" = "0" ] then export GTK2_CFLAGS="" export GTK2_LIBS="" diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch new file mode 100644 index 000000000..a6ff5991c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch @@ -0,0 +1,43 @@ +From 3d7390c89c2205d1eed0384be0bb65adb675e60d Mon Sep 17 00:00:00 2001 +From: Ramon Fried <ramon@neureality.ai> +Date: Tue, 9 Feb 2021 18:59:59 +0200 +Subject: [PATCH] bin: fix SIGSEGV caused by using flb_free instead of + mk_mem_free + +Upstream-Status: Accepted +Signed-off-by: Ramon Fried <ramon@neureality.ai> +--- + src/fluent-bit.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/fluent-bit.c b/src/fluent-bit.c +index c0c73b4..989cfde 100644 +--- a/src/fluent-bit.c ++++ b/src/fluent-bit.c +@@ -289,7 +289,7 @@ static int input_set_property(struct flb_input_instance *in, char *kv) + in->p->name, key); + } + +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + +@@ -314,7 +314,7 @@ static int output_set_property(struct flb_output_instance *out, char *kv) + } + + ret = flb_output_set_property(out, key, value); +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + +@@ -340,7 +340,7 @@ static int filter_set_property(struct flb_filter_instance *filter, char *kv) + } + + ret = flb_filter_set_property(filter, key, value); +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch new file mode 100644 index 000000000..91675dfc6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch @@ -0,0 +1,82 @@ +From 7c3b1dfb174312594d3317c24ed71c60398f653f Mon Sep 17 00:00:00 2001 +From: Ramon Fried <ramon@neureality.ai> +Date: Wed, 10 Feb 2021 04:23:36 +0200 +Subject: [PATCH] parser: Fix SIGSEGV caused by using flb_free instead of + mk_mem_free + +Upstream-Status: Backport (fix only for 1.3.5) +Signed-off-by: Ramon Fried <ramon@neureality.ai> +--- + src/flb_parser.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/src/flb_parser.c b/src/flb_parser.c +index d35c568..7c20e12 100644 +--- a/src/flb_parser.c ++++ b/src/flb_parser.c +@@ -490,7 +490,7 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + MK_RCONF_STR); + if (str) { + time_keep = flb_utils_bool(str); +- flb_free(str); ++ mk_mem_free(str); + } + else { + time_keep = FLB_FALSE; +@@ -522,23 +522,23 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + + flb_debug("[parser] new parser registered: %s", name); + +- flb_free(name); +- flb_free(format); ++ mk_mem_free(name); ++ mk_mem_free(format); + + if (regex) { +- flb_free(regex); ++ mk_mem_free(regex); + } + if (time_fmt) { +- flb_free(time_fmt); ++ mk_mem_free(time_fmt); + } + if (time_key) { +- flb_free(time_key); ++ mk_mem_free(time_key); + } + if (time_offset) { +- flb_free(time_offset); ++ mk_mem_free(time_offset); + } + if (types_str) { +- flb_free(types_str); ++ mk_mem_free(types_str); + } + + decoders = NULL; +@@ -548,19 +548,19 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + return 0; + + fconf_error: +- flb_free(name); +- flb_free(format); ++ mk_mem_free(name); ++ mk_mem_free(format); + if (regex) { +- flb_free(regex); ++ mk_mem_free(regex); + } + if (time_fmt) { +- flb_free(time_fmt); ++ mk_mem_free(time_fmt); + } + if (time_key) { +- flb_free(time_key); ++ mk_mem_free(time_key); + } + if (types_str) { +- flb_free(types_str); ++ mk_mem_free(types_str); + } + if (decoders) { + flb_parser_decoder_list_destroy(decoders); diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb index bc4cd0cf9..eac267041 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -16,12 +16,16 @@ SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ file://cross-build-init-system-detection.patch \ file://builtin-nan.patch \ file://0001-ppc-Fix-signature-for-co_create-API.patch \ - " + file://0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch \ + file://0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch \ + " SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" S = "${WORKDIR}/fluent-bit-${PV}" DEPENDS = "zlib bison-native flex-native" +DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + DEPENDS_append_libc-musl = " fts " INSANE_SKIP_${PN}-dev += "dev-elf" diff --git a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb index 3e7fb2a07..3a7413d8a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://github.com/pixel/hexedit.git \ " -SRCREV = "800e4b2e6280531a84fd23ee0b48e16baeb90878" +SRCREV = "baf45a289360a39a05253949fb9d1b50e4668d8a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb index 99cdee5bb..2c8fdc75c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" -SRCREV = "f5a4ba8bb298f8cbc435707d0b19b4b2ff836a8e" +SRCREV = "c50869272b54bf4b4bc3825e8c3332a54678b43f" S = "${WORKDIR}/git" FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" @@ -37,4 +37,3 @@ PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" - diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb index 70ea82eb9..a4a258145 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb @@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29" SRC_URI = "https://hyperrealm.github.io/libconfig/dist/libconfig-${PV}.tar.gz" +UPSTREAM_CHECK_URI = "https://github.com/hyperrealm/libconfig/releases" +UPSTREAM_CHECK_REGEX = "Version (?P<pver>\d+(\.\d+)+)" + inherit autotools-brokensep pkgconfig SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690" @@ -16,4 +19,3 @@ SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a PACKAGE_BEFORE_PN = "${PN}++" FILES_${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" - diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch new file mode 100644 index 000000000..46493bb9e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch @@ -0,0 +1,33 @@ +From a8502c5a7e336f1e5068f9dd3bdb359d787f9bdc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 5 Feb 2021 18:35:12 -0800 +Subject: [PATCH] configure.ac: Do not use single line comment + +autoconf 2.70+ does not like it and regenerating configure script fails + +| ../libstatgrab-0.92/configure: line 7818: syntax error near unexpected token `ac_fn_check_decl' +| ../libstatgrab-0.92/configure: line 7818: `fi ac_fn_check_decl "$LINENO" "__sun" "ac_cv_have_decl___sun" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"' + +Upstream-Status: Submitted [https://github.com/libstatgrab/libstatgrab/pull/128] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99518f8..74e7f0f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,8 @@ AC_TYPE_UNSIGNED_LONG_LONG_INT + + dnl Check for extra flags to enable some kind of behavior + AC_CHECK_DECL([_AIX],[ac_cv_need_minus_d_linux_source_compat="yes"; ac_cv_need_minus_d_all_source="yes"]) +-AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) dnl probably required by kfreebsd, too? ++dnl probably required by kfreebsd, too? ++AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) + AC_CHECK_DECL([__sun],[ac_cv_need_minus_d_extensions="yes"; ac_cv_need_minus_d_posix_pthread_semantics="yes"]) + AC_CHECK_DECL([__hpux],[ac_cv_need_minus_d_hpux_source="yes"]) + +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb index 27fe0e2c4..a47d3bf00 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb @@ -10,6 +10,7 @@ PACKAGES_prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " # don't use the git tag unless docbooc2x is available to build the manpages SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92/libstatgrab-0.92.tar.gz \ + file://0001-configure.ac-Do-not-use-single-line-comment.patch \ " SRC_URI[md5sum] = "5362b2ddbec54b3901e7d70c22cda249" SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index b3ea44c3c..34090cf28 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -75,6 +75,7 @@ TARGET_CFLAGS_append_riscv64 = " -fpic" TARGET_CXXFLAGS_append_riscv64 = " -fpic" do_install[cleandirs] += "${WORKDIR}/minifi-install" +PSEUDO_CONSIDER_PATHS .= ",${WORKDIR}/minifi-install" do_install() { DESTDIR='${WORKDIR}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch deleted file mode 100644 index 25e5efa4b..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d697182f18a421b7f80ea9de4914251b55d82532 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards <rgerhards@adiscon.com> -Date: Sun, 15 Jul 2018 17:24:59 +0200 -Subject: [PATCH] "fix" "jump-misses-init" gcc-8 warning - -Actually, that warning is overly conservative, and so we -have changed the code in a somewhat suboptimal way to "fix" -it. In this spots, it's not that bad and we wanted to avoid -totally disabling this warning. - -If it were more costly in terms of cleanness, we would probaly -have done that. Just mention it to tell anyone else the -cure is not really a good one, just selected due to the -circumstances in this special case. - -Upstream-Status: Backport - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - json_object.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/json_object.c b/json_object.c -index 35338e1..6e67891 100644 ---- a/json_object.c -+++ b/json_object.c -@@ -396,6 +396,7 @@ fjson_child_get_empty_etry(struct fjson_object *const __restrict__ jso) - { - struct _fjson_child *chld = NULL; - struct _fjson_child_pg *pg; -+ int pg_idx; - - if (jso->o.c_obj.ndeleted > 0) { - /* we first fill deleted spots */ -@@ -415,7 +416,7 @@ fjson_child_get_empty_etry(struct fjson_object *const __restrict__ jso) - goto done; - } - -- const int pg_idx = jso->o.c_obj.nelem % FJSON_OBJECT_CHLD_PG_SIZE; -+ pg_idx = jso->o.c_obj.nelem % FJSON_OBJECT_CHLD_PG_SIZE; - if (jso->o.c_obj.nelem > 0 && pg_idx == 0) { - if((pg = calloc(1, sizeof(struct _fjson_child_pg))) == NULL) { - errno = ENOMEM; --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.8.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb index b84dde3d3..88ba9edaa 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb @@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f" DEPENDS = "" -SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https \ - file://0001-fix-jump-misses-init-gcc-8-warning.patch" +SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https" -SRCREV = "4758b1caf69ada911ef79e1d80793fe489b98dff" +SRCREV = "0293afb3913f760c449348551cca4d2df59c1a00" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.2.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb index 6f3685c4b..e8b2e3721 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb @@ -16,7 +16,7 @@ PV .= "+git${SRCPV}" SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \ " -SRCREV = "01b727adf1ce3c0ed5b95299d60f62bc66d98eb5" +SRCREV = "3a750fed849405c745dcb7b4ceb85f662c53d8d0" S = "${WORKDIR}/git/python" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch deleted file mode 100644 index 176e97998..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6914eccee34376f9067b0ee9f17039fe182125e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 31 Mar 2018 22:29:16 +0200 -Subject: [PATCH] do not build demos -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -They are not installed anyway and add libepoxy dependency - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - Makefile.am | 3 ++- - configure.ac | 3 --- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 984b6a7..6c754a6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,7 +28,8 @@ doc_subdirs = docs - else - doc_subdirs = - endif --SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs) -+ -+SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs) - - gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME) - gdkmm_include_HEADERS = gdk/gdkmm.h -diff --git a/configure.ac b/configure.ac -index e5e82dc..c1c7658 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -109,11 +109,8 @@ AS_IF([test "x$gtkmm_enable_api_atkmm" != xno], - [GTKMM_MODULES="atkmm-1.6 >= 2.24.2 $GTKMM_MODULES"]) - AC_SUBST([GTKMM_MODULES]) - --AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2']) -- - PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES]) - PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES]) --PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES]) - - MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0]) - MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0]) --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 682d31e49..0c2e353a9 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb @@ -13,8 +13,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ " -SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784" -SRC_URI[sha256sum] = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e" +SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb index adc38d8cf..f9ca7fd4b 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb @@ -6,18 +6,18 @@ LICENSE = "LGPLv2.1 & GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm" +DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm" BPN = "gtkmm" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "e311db484ca9c53f1689d35f5f58a06b" -SRC_URI[archive.sha256sum] = "6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3" -SRC_URI += "file://0001-do-not-build-demos.patch" +SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435" -EXTRA_OECONF = " --disable-documentation " +EXTRA_OEMESON = "-Dbuild-demos=false" FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch deleted file mode 100644 index 2eb50a5a3..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 461861cd2e34294830b121db834c05ff39424f6f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 27 Dec 2019 18:42:51 -0800 -Subject: [PATCH] Fix Wimplicit-int-float-conversion warnings with clang 10+ - -This is a new warning in clang which will be available in clang 10 -onwards - -Fixes -error: implicit conversion from 'const int' to 'float' may lose precision [-Werror,-Wimplicit-int-float-conversion] - -Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/986] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - glm/gtx/scalar_multiplication.hpp | 2 +- - test/gtx/gtx_fast_trigonometry.cpp | 32 +++++++++++++++--------------- - 2 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp -index f391f8de..496ba193 100644 ---- a/glm/gtx/scalar_multiplication.hpp -+++ b/glm/gtx/scalar_multiplication.hpp -@@ -54,7 +54,7 @@ namespace glm - template<typename T> \ - return_type_scalar_multiplication<T, Vec> \ - operator/(Vec lh, T const& s){ \ -- return lh *= 1.0f / s; \ -+ return lh *= 1.0f / static_cast<float>(s); \ - } - - GLM_IMPLEMENT_SCAL_MULT(vec2) -diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp -index f3bf17bf..f3c4e957 100644 ---- a/test/gtx/gtx_fast_trigonometry.cpp -+++ b/test/gtx/gtx_fast_trigonometry.cpp -@@ -239,12 +239,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -280,12 +280,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -327,12 +327,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -349,12 +349,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -371,12 +371,12 @@ namespace taylorCos - std::vector<glm::vec4> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * i)); -+ Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * float(i))); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -466,12 +466,12 @@ namespace taylor2 - std::vector<float> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCosA(AngleShift.x + Begin + Steps * i); -+ Results[i] = taylorCosA(AngleShift.x + Begin + Steps * float(i)); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -488,12 +488,12 @@ namespace taylor2 - std::vector<float> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCosB(AngleShift.x + Begin + Steps * i); -+ Results[i] = taylorCosB(AngleShift.x + Begin + Steps * float(i)); - - std::clock_t const TimeStampEnd = std::clock(); - -@@ -510,12 +510,12 @@ namespace taylor2 - std::vector<float> Results; - Results.resize(Samples); - -- float Steps = (End - Begin) / Samples; -+ float Steps = (End - Begin) / float(Samples); - - std::clock_t const TimeStampBegin = std::clock(); - - for(std::size_t i = 0; i < Samples; ++i) -- Results[i] = taylorCosC(AngleShift.x + Begin + Steps * i); -+ Results[i] = taylorCosC(AngleShift.x + Begin + Steps * float(i)); - - std::clock_t const TimeStampEnd = std::clock(); - --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch new file mode 100644 index 000000000..25e851883 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch @@ -0,0 +1,50 @@ +From 5b83983b246cff440de4421696b6b5dd9072ed2d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Feb 2021 11:36:23 -0800 +Subject: [PATCH] Silence clang warnings + +Fixes +glm/gtc/random.inl:25:17: error: implicit conversion loses integer precision: 'int' to 'unsigned char' [-Werror,-Wimplicit-int-conversion] +| std::rand() % std::numeric_limits<uint8>::max()); +| ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +glm/gtc/../ext/quaternion_common.inl:76:87: error: unused parameter 'k' [-Werror,-Wunused-parameter] + GLM_FUNC_QUALIFIER qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a, S k) + ^ + +Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/1055] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + glm/ext/quaternion_common.inl | 2 +- + glm/gtc/random.inl | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl +index 0e4a3bb2..8f9dccef 100644 +--- a/glm/ext/quaternion_common.inl ++++ b/glm/ext/quaternion_common.inl +@@ -104,7 +104,7 @@ namespace glm + { + // Graphics Gems III, page 96 + T angle = acos(cosTheta); +- T phi = angle + k * glm::pi<T>(); ++ T phi = angle + static_cast<float>(k) * glm::pi<T>(); + return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle); + } + } +diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl +index 70485098..a4af2a06 100644 +--- a/glm/gtc/random.inl ++++ b/glm/gtc/random.inl +@@ -22,7 +22,7 @@ namespace detail + GLM_FUNC_QUALIFIER static vec<1, uint8, P> call() + { + return vec<1, uint8, P>( +- std::rand() % std::numeric_limits<uint8>::max()); ++ static_cast<uint8>(std::rand()) % std::numeric_limits<uint8>::max()); + } + }; + +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index e2f4dbebc..c5a7c5bff 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -6,17 +6,17 @@ HOMEPAGE = "https://glm.g-truc.net" BUGTRACKER = "https://github.com/g-truc/glm/issues" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://copying.txt;md5=4a735e33f271f57404fda17e80085411" +LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d" SRC_URI = " \ git://github.com/g-truc/glm;branch=master \ - file://0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch \ + file://0001-Silence-clang-warnings.patch \ file://glmConfig.cmake.in \ file://glmConfigVersion.cmake.in \ file://glm.pc.in \ file://glmTargets.cmake \ " -SRCREV = "4db8f89aace8f04c839b606e15b39fb8383ec732" +SRCREV = "bf71a834948186f4097caa076cd2663c69a10e1e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb index bc46a11d3..8fe837b75 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb @@ -20,13 +20,6 @@ DEPENDS_append_class-nativesdk = " ${BPN}-native" inherit autotools-brokensep pkgconfig gettext -# The source tarball suggested at -# https://graphviz.gitlab.io/_pages/Download/Download_source.html has no -# version in its name. So once graphviz is updgraded, only first time users will -# get checksum errors. Fedora people seem to expect same so they use a versioned -# source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec - -SRCREV = "771bc4dbff3e6f358fa75cdc7774a413ccacad51" SRC_URI = "https://www2.graphviz.org/Packages/stable/portable_source/${BP}.tar.gz \ file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch new file mode 100644 index 000000000..0605b32e3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch @@ -0,0 +1,34 @@ +From 9363c98528ef850235852e44f678df6b5c011ee1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 7 Feb 2021 18:08:36 -0800 +Subject: [PATCH] configure.in: Undefine AC_CONFIG_AUX_DIR + +This helps reconfiguring with autotools 2.70+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(README.txt) + AC_CONFIG_AUX_DIR(build-scripts) +- + dnl Set various version strings - taken gratefully from the GTk sources + + # Making releases: +@@ -40,10 +39,6 @@ AC_SUBST(LT_CURRENT) + AC_SUBST(LT_REVISION) + AC_SUBST(LT_AGE) + +-dnl Detect the canonical build and host environments +-AC_CONFIG_AUX_DIRS($srcdir/build-scripts) +-dnl AC_CANONICAL_HOST +- + dnl Check for tools + AC_PROG_LIBTOOL + AC_PROG_CC diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb index 8f1960d8a..6b6a531d3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb @@ -4,18 +4,18 @@ DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=516daf7a177ad4c8874bb9efa1a69c1f" -SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz" - -SRC_URI[md5sum] = "a36e8410cac46b00a4d01752b32c3eb1" +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz \ + file://0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch \ + " SRC_URI[sha256sum] = "b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419" S = "${WORKDIR}/SDL2_mixer-${PV}" inherit autotools-brokensep pkgconfig -EXTRA_AUTORECONF += "--include=acinclude" EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}" +PACKAGECONFIG ??= "" PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" do_configure_prepend () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-greeter-set-visible-when-switch-to-input-user.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-greeter-set-visible-when-switch-to-input-user.patch new file mode 100644 index 000000000..e01dc7fa7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-greeter-set-visible-when-switch-to-input-user.patch @@ -0,0 +1,33 @@ +From f6b8e141e00c4837239f5b69af4e7bee1204abba Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Thu, 17 Dec 2020 10:18:58 +0800 +Subject: [PATCH 1/8] greeter: set visible when switch to input user + +It switches back to input user entry if press Esc key when input the +password. At this time, the user name input is shown as '*' rather than +plain text. Set the visibility to fix this issue. And clean the text as +well. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/greeter.c b/src/greeter.c +index 2c6e5be..f100c72 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -139,6 +139,8 @@ static void switch_to_input_user(void) + pass=NULL; + } + gtk_label_set_text( GTK_LABEL(prompt), _("User:")); ++ gtk_entry_set_text(GTK_ENTRY(login_entry), ""); ++ gtk_entry_set_visibility(GTK_ENTRY(login_entry), TRUE); + gtk_widget_show(prompt); + if(user_list) + { +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-greeter-gdk.c-fix-typo.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-greeter-gdk.c-fix-typo.patch new file mode 100644 index 000000000..da0212975 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-greeter-gdk.c-fix-typo.patch @@ -0,0 +1,28 @@ +From 3a3c5c644c9790cb3f88f3ce3757c2803cff90c5 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Thu, 17 Dec 2020 14:32:40 +0800 +Subject: [PATCH 2/8] greeter-gdk.c: fix typo + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter-gdk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c +index 1b27d2e..5aa3e7f 100644 +--- a/src/greeter-gdk.c ++++ b/src/greeter-gdk.c +@@ -299,7 +299,7 @@ void ui_prepare(void) + attr.wclass = GDK_INPUT_OUTPUT; + win = gdk_window_new(root, &attr, mask); + gdk_window_set_decorations(win,0); +- gdk_window_set_title(win,"lxdm-greter-gdk"); ++ gdk_window_set_title(win,"lxdm-greeter-gdk"); + + scr=gdk_screen_get_default(); + g_signal_connect(scr, "size-changed", G_CALLBACK(on_screen_size_changed), win); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-whether-password-expired-with-pam.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-whether-password-expired-with-pam.patch new file mode 100644 index 000000000..c64854373 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-whether-password-expired-with-pam.patch @@ -0,0 +1,46 @@ +From 497e0fc7010969759c8247f7013a89589c44234a Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Thu, 17 Dec 2020 18:12:29 +0800 +Subject: [PATCH 3/8] check whether password expired with pam + +Introduce a new enum AuthResult type AUTH_PASSWD_EXPIRE. When user's +password is expired, return it. Only work with pam. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/lxdm.h | 1 + + src/pam.c | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/src/lxdm.h b/src/lxdm.h +index 568573f..1c2f837 100644 +--- a/src/lxdm.h ++++ b/src/lxdm.h +@@ -41,6 +41,7 @@ enum AuthResult + AUTH_SUCCESS, + AUTH_BAD_USER, + AUTH_FAIL, ++ AUTH_PASSWD_EXPIRE, + AUTH_PRIV, + AUTH_ERROR + }; +diff --git a/src/pam.c b/src/pam.c +index 43bd687..16a36f0 100644 +--- a/src/pam.c ++++ b/src/pam.c +@@ -257,6 +257,10 @@ int lxdm_auth_user_authenticate(LXDM_AUTH *a,const char *user,const char *pass,i + return AUTH_FAIL; + } + ret=pam_acct_mgmt(a->handle,PAM_SILENT); ++ if (ret == PAM_NEW_AUTHTOK_REQD) { ++ g_debug("user %s account has expired\n", user); ++ return AUTH_PASSWD_EXPIRE; ++ } + if(ret!=PAM_SUCCESS) + { + g_debug("user %s acct mgmt fail with %d\n",user,ret); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-lxdm.c-add-function-to-change-password-with-pam.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-lxdm.c-add-function-to-change-password-with-pam.patch new file mode 100644 index 000000000..29c1000d1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-lxdm.c-add-function-to-change-password-with-pam.patch @@ -0,0 +1,124 @@ +From d4de5497bd89c408377194b9fa9026ba8e68b634 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 11 Jan 2021 14:11:05 +0800 +Subject: [PATCH 4/8] lxdm.c: add function to change password with pam + +Add function to change user's password when pam is enabled. It is useful +to change user's password when the password is expired. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/lxdm.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/lxdm.h | 1 + + 2 files changed, 69 insertions(+) + +diff --git a/src/lxdm.c b/src/lxdm.c +index 638c30f..fe17a71 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -104,6 +104,10 @@ static int old_tty=1,def_tty = 7,nr_tty=0; + static int def_display=0; + static GSList *session_list; + ++#if HAVE_LIBPAM ++static const char *new_passwd = NULL; ++#endif ++ + static void lxdm_startx(LXSession *s); + + static int get_active_vt(void) +@@ -759,6 +763,69 @@ int lxdm_auth_user(int type,char *user, char *pass, struct passwd **ppw) + return ret; + } + ++ ++#if HAVE_LIBPAM ++ ++static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg) ++{ ++ int result = PAM_SUCCESS; ++ int i; ++ ++ *resp = (struct pam_response *) calloc(num, sizeof(struct pam_response)); ++ for(i = 0; i < num; i++) ++ { ++ switch (msg[i]->msg_style) { ++ case PAM_PROMPT_ECHO_ON: ++ break; ++ case PAM_PROMPT_ECHO_OFF: ++ resp[i]->resp = strdup(new_passwd); ++ break; ++ case PAM_ERROR_MSG: ++ case PAM_TEXT_INFO: ++ break; ++ default: ++ break; ++ } ++ } ++ return result; ++} ++ ++static int lxdm_change_passwd_pam(const char *service, const char *user, const char *pass) ++{ ++ pam_handle_t *pamh = NULL; ++ static struct pam_conv conv = { ++ do_conv, ++ NULL ++ }; ++ ++ int ret = pam_start("lxdm", user, &conv, &pamh); ++ if (PAM_SUCCESS != ret) { ++ g_warning("pam_start failed."); ++ return 1; ++ } ++ ++ new_passwd = pass; ++ ret = pam_chauthtok(pamh, 0); ++ if (PAM_SUCCESS != ret) { ++ g_warning("pam_chauthtok failed: %s", pam_strerror(pamh, ret)); ++ return 1; ++ } ++ ++ (void)pam_end(pamh, PAM_SUCCESS); ++ ++ return 0; ++} ++#endif ++ ++int lxdm_change_passwd(const char *user, const char *pass) ++{ ++#if HAVE_LIBPAM ++ return lxdm_change_passwd_pam("lxdm", user, pass); ++#else ++ return 0; ++#endif ++} ++ + static void close_left_fds(void) + { + struct dirent **list; +@@ -1446,6 +1513,7 @@ int lxdm_do_auto_login(void) + lxdm_do_login(pw,session,lang,option); + success=1; + } ++ + g_free(user);g_free(session);g_free(lang); + } + g_free(last_lang); +diff --git a/src/lxdm.h b/src/lxdm.h +index 1c2f837..be3c81f 100644 +--- a/src/lxdm.h ++++ b/src/lxdm.h +@@ -30,6 +30,7 @@ G_BEGIN_DECLS + extern GKeyFile *config; + + int lxdm_auth_user(int type,char *user,char *pass,struct passwd **ppw); ++int lxdm_change_passwd(const char *user, const char *pass); + void lxdm_do_login(struct passwd *pw,char *session,char *lang,char *option); + void lxdm_do_reboot(void); + void lxdm_do_shutdown(void); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0005-ui.c-handle-password-expire-and-update-new-password.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0005-ui.c-handle-password-expire-and-update-new-password.patch new file mode 100644 index 000000000..ecbe68d14 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0005-ui.c-handle-password-expire-and-update-new-password.patch @@ -0,0 +1,53 @@ +From 54b2ed18ca52fa682ade2fe84e1b0d19d1b78cc4 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 11 Jan 2021 16:48:26 +0800 +Subject: [PATCH 5/8] ui.c: handle password-expire and update-new-password + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/ui.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/ui.c b/src/ui.c +index f233589..3ddb484 100644 +--- a/src/ui.c ++++ b/src/ui.c +@@ -161,6 +161,9 @@ static gboolean on_greeter_input(GIOChannel *source, GIOCondition condition, gpo + ui_drop(); + lxdm_do_login(pw, session, lang,NULL); + } ++ else if (AUTH_PASSWD_EXPIRE == ret) { ++ xwrite(greeter_pipe[0], "password-expire\n", 16); ++ } + else + { + if(pass!=NULL) +@@ -205,6 +208,23 @@ static gboolean on_greeter_input(GIOChannel *source, GIOCondition condition, gpo + g_free(session); + g_free(lang); + } ++ else if (!strncmp(str, "update-new-password", 19)) { ++ xwrite(greeter_pipe[0], "update-new-password\n", 20); ++ char *user = greeter_param(str, "user"); ++ char *pass = greeter_param(str, "newpass"); ++ char *session = greeter_param(str, "session"); ++ char *lang = greeter_param(str, "lang"); ++ ++ int ret = lxdm_change_passwd(user, pass); ++ if (ret) { ++ xwrite(greeter_pipe[0], "invalid-new-password\n", 21); ++ } else { ++ struct passwd *pw; ++ ret = lxdm_auth_user(AUTH_TYPE_NORMAL, user, pass, &pw); ++ ui_drop(); ++ lxdm_do_login(pw, session, lang, NULL); ++ } ++ } + g_free(str); + return TRUE; + } +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0006-themes-Industrial-add-info-label-in-ui.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0006-themes-Industrial-add-info-label-in-ui.patch new file mode 100644 index 000000000..4cadc3d9b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0006-themes-Industrial-add-info-label-in-ui.patch @@ -0,0 +1,124 @@ +From 8414d63343cc7909bc7a972941c678509d5d5be6 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 11 Jan 2021 10:15:45 +0800 +Subject: [PATCH 6/8] themes/Industrial: add info label in ui + +Adjust the layout and add a new label "info" under the labe "prompt" in +themes/Industrial to tell user some useful information such as +"Authentication failed" or "Invalid password". + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + data/themes/Industrial/greeter-gtk3.ui | 27 +++++++++++++++++++++++++- + data/themes/Industrial/greeter.ui | 27 +++++++++++++++++++++++++- + data/themes/Industrial/gtk.css | 5 +++++ + 3 files changed, 57 insertions(+), 2 deletions(-) + +diff --git a/data/themes/Industrial/greeter-gtk3.ui b/data/themes/Industrial/greeter-gtk3.ui +index 2f4e631..e59eee3 100644 +--- a/data/themes/Industrial/greeter-gtk3.ui ++++ b/data/themes/Industrial/greeter-gtk3.ui +@@ -45,7 +45,12 @@ + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> +- <object class="GtkHBox" id="hbox3"> ++ <object class="GtkVBox" id="vbox3"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> +@@ -91,6 +96,26 @@ + </packing> + </child> + </object> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox4"> ++ <property name="visible">True</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkLabel" id="info"> ++ <property name="visible">True</property> ++ <property name="label" translatable="yes"></property> ++ <property name="yalign">0.2</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> + </child> + </object> + <packing> +diff --git a/data/themes/Industrial/greeter.ui b/data/themes/Industrial/greeter.ui +index 3413922..6a02d8d 100644 +--- a/data/themes/Industrial/greeter.ui ++++ b/data/themes/Industrial/greeter.ui +@@ -47,7 +47,12 @@ + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> +- <object class="GtkHBox" id="hbox3"> ++ <object class="GtkVBox" id="vbox3"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> +@@ -93,6 +98,26 @@ + </packing> + </child> + </object> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox4"> ++ <property name="visible">True</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkLabel" id="info"> ++ <property name="visible">True</property> ++ <property name="label" translatable="yes"></property> ++ <property name="yalign">0.2</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> + </child> + </object> + <packing> +diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css +index 7621345..be15f43 100644 +--- a/data/themes/Industrial/gtk.css ++++ b/data/themes/Industrial/gtk.css +@@ -22,3 +22,8 @@ + font: Sans 12; + color: #9E9D9B; + } ++ ++#info { ++ font: Sans 14; ++ font-style: italic; ++} +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0007-greeter.c-support-to-update-expired-password.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0007-greeter.c-support-to-update-expired-password.patch new file mode 100644 index 000000000..84a9faebb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0007-greeter.c-support-to-update-expired-password.patch @@ -0,0 +1,180 @@ +From bae6a2b3a2232abd16a8d8558dda542d4970f1bb Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Tue, 12 Jan 2021 09:23:05 +0800 +Subject: [PATCH 7/8] greeter.c: support to update expired password + +Update greeter to work with ui to handle expired password. It checks +whether password is expired after input user and password. If expired, +force user to update password immediately. It allows 3 times to try. If +exceeds, reset to input user. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 81 insertions(+), 2 deletions(-) + +diff --git a/src/greeter.c b/src/greeter.c +index f100c72..804fca0 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -77,6 +77,8 @@ static GtkWidget *lang_menu; + + static char* user = NULL; + static char* pass = NULL; ++static char* new_pass = NULL; ++static gboolean pass_expired = FALSE; + + static char* ui_file = NULL; + static char *ui_nobody = NULL; +@@ -167,10 +169,19 @@ static void switch_to_input_passwd(void) + else + gtk_widget_hide(user_list); + } +- gtk_label_set_text( GTK_LABEL(prompt), _("Password:") ); ++ if (pass_expired) { ++ if (!new_pass) { ++ gtk_label_set_text(GTK_LABEL(prompt), _("New password:")); ++ } else { ++ gtk_label_set_text(GTK_LABEL(prompt), _("Retype new password:")); ++ } ++ } else { ++ gtk_label_set_text( GTK_LABEL(prompt), _("Password:") ); ++ } + gtk_entry_set_text(GTK_ENTRY(login_entry), ""); + gtk_entry_set_visibility(GTK_ENTRY(login_entry), FALSE); + gtk_widget_show(login_entry); ++ gtk_widget_show(prompt); + gtk_widget_grab_focus(login_entry); + } + +@@ -189,6 +200,8 @@ static void try_login_user(const char *user) + + static void on_entry_activate(GtkEntry* entry) + { ++ static int count = 0; ++ + char* tmp; + if( !user ) + { +@@ -217,6 +230,46 @@ static void on_entry_activate(GtkEntry* entry) + } + else + { ++ if (pass_expired) { ++ if (!new_pass) { ++ new_pass = g_strdup(gtk_entry_get_text(entry)); ++ switch_to_input_passwd(); ++ } else { ++ tmp = g_strdup(gtk_entry_get_text(entry)); ++ if (strcmp(new_pass, tmp)) { ++ g_free(new_pass); ++ new_pass = NULL; ++ // if new passwords not match, retry for 3 times at most ++ if (++count < 3) { ++ switch_to_input_passwd(); ++ } else { ++ count = 0; ++ pass_expired = FALSE; ++ switch_to_input_user(); ++ } ++ } else if (!strcmp(pass, g_base64_encode((guchar*)new_pass, strlen(new_pass) + 1))) { ++ // if new password is same as old one ++ g_free(new_pass); ++ new_pass = NULL; ++ if (++count < 3) { ++ switch_to_input_passwd(); ++ } else { ++ count = 0; ++ pass_expired = FALSE; ++ switch_to_input_user(); ++ } ++ } else { ++ char *session_exec=get_session_exec(); ++ char *session_lang=get_session_lang(); ++ ++ printf("update-new-password user=%s newpass=%s session=%s lang=%s\n", ++ user, new_pass, session_exec, session_lang); ++ } ++ } ++ ++ return ; ++ } ++ + char *session_exec=get_session_exec(); + char *session_lang=get_session_lang(); + +@@ -227,6 +280,7 @@ static void on_entry_activate(GtkEntry* entry) + printf("login user=%s pass=%s session=%s lang=%s\n", + user, pass, session_exec, session_lang); + ++#if 0 + /* password check failed */ + g_free(user); + user = NULL; +@@ -241,6 +295,7 @@ static void on_entry_activate(GtkEntry* entry) + gtk_label_set_text( GTK_LABEL(prompt), _("User:") ); + gtk_entry_set_text(GTK_ENTRY(entry), ""); + gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE); ++#endif + } + } + +@@ -1091,8 +1146,12 @@ static void on_screen_size_changed(GdkScreen *screen,GtkWidget *win) + + static gint login_entry_on_key_press (GtkWidget *widget,GdkEventKey *event) + { +- if(event->keyval == GDK_Escape) ++ if(event->keyval == GDK_Escape) { ++ g_free(new_pass); ++ new_pass = NULL; ++ pass_expired = FALSE; + switch_to_input_user(); ++ } + return FALSE; + } + +@@ -1285,8 +1344,10 @@ static void create_win() + + static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpointer data) + { ++ + GIOStatus ret; + char *str; ++ static int count = 0; + + if( !(G_IO_IN & condition) ) + return FALSE; +@@ -1300,10 +1361,28 @@ static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpoi + { + switch_to_input_user(); + } ++ else if (!strncmp(str, "password-expire", 15)) ++ { ++ pass_expired = TRUE; ++ switch_to_input_passwd(); ++ } + else if( !strncmp(str, "password", 8)) + { + switch_to_input_passwd(); + } ++ else if (!strncmp(str, "invalid-new-password", 20)) ++ { ++ g_free(new_pass); ++ new_pass = NULL; ++ ++ if (count++ < 3) { ++ switch_to_input_passwd(); ++ } else { ++ count = 0; ++ pass_expired = FALSE; ++ switch_to_input_user(); ++ } ++ } + g_free(str); + return TRUE; + } +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0008-greeter.c-show-information-on-gtk-label-info.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0008-greeter.c-show-information-on-gtk-label-info.patch new file mode 100644 index 000000000..eab9fd5e2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0008-greeter.c-show-information-on-gtk-label-info.patch @@ -0,0 +1,99 @@ +From bb4ff4b134383bfdadf7cb5353d3553a8a72d47e Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 13 Jan 2021 10:45:48 +0800 +Subject: [PATCH 8/8] greeter.c: show information on gtk label 'info' + +Show information on a gtk label 'info' which is added under label +'prompt' in the .glade or .ui files. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/1/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/greeter.c b/src/greeter.c +index 804fca0..a4a2336 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -64,6 +64,7 @@ static GtkWidget* win; + static GtkWidget* alignment2; + static GtkWidget* prompt; + static GtkWidget* login_entry; ++static GtkWidget* info; + static GtkWidget* user_list_scrolled; + static GtkWidget* user_list; + +@@ -241,10 +242,12 @@ static void on_entry_activate(GtkEntry* entry) + new_pass = NULL; + // if new passwords not match, retry for 3 times at most + if (++count < 3) { ++ gtk_label_set_text((GtkLabel *)info, _("Passwords do not match, please retry.")); + switch_to_input_passwd(); + } else { + count = 0; + pass_expired = FALSE; ++ gtk_label_set_text((GtkLabel *)info, _("Maximum number of failed update password attempts exceeded.")); + switch_to_input_user(); + } + } else if (!strcmp(pass, g_base64_encode((guchar*)new_pass, strlen(new_pass) + 1))) { +@@ -252,6 +255,7 @@ static void on_entry_activate(GtkEntry* entry) + g_free(new_pass); + new_pass = NULL; + if (++count < 3) { ++ gtk_label_set_text((GtkLabel *)info, _("New password is same as old one, password unchanged.")); + switch_to_input_passwd(); + } else { + count = 0; +@@ -1146,6 +1150,9 @@ static void on_screen_size_changed(GdkScreen *screen,GtkWidget *win) + + static gint login_entry_on_key_press (GtkWidget *widget,GdkEventKey *event) + { ++ ++ gtk_label_set_text(GTK_LABEL(info), ""); ++ + if(event->keyval == GDK_Escape) { + g_free(new_pass); + new_pass = NULL; +@@ -1211,11 +1218,14 @@ static void create_win() + login_entry = (GtkWidget*)gtk_builder_get_object(builder, "login_entry"); + if(login_entry!=NULL) + { +- g_signal_connect_after(login_entry,"key-press-event",G_CALLBACK(login_entry_on_key_press),NULL); ++ g_signal_connect(login_entry,"key-press-event",G_CALLBACK(login_entry_on_key_press),NULL); + } + + g_signal_connect(login_entry, "activate", G_CALLBACK(on_entry_activate), NULL); + ++ info = (GtkWidget *)gtk_builder_get_object(builder, "info"); ++ gtk_label_set_text(GTK_LABEL(info), ""); ++ + if( g_key_file_get_integer(config, "display", "bottom_pane", 0)==1) + { + /* hacks to let GtkEventBox paintable with gtk pixmap engine. */ +@@ -1359,11 +1369,13 @@ static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpoi + gtk_main_quit(); + else if( !strncmp(str, "reset", 5) ) + { ++ gtk_label_set_text(GTK_LABEL(info), _("Authentication failed.")); + switch_to_input_user(); + } + else if (!strncmp(str, "password-expire", 15)) + { + pass_expired = TRUE; ++ gtk_label_set_text(GTK_LABEL(info), _("You are required to change your password immediately.")); + switch_to_input_passwd(); + } + else if( !strncmp(str, "password", 8)) +@@ -1376,6 +1388,7 @@ static gboolean on_lxdm_command(GIOChannel *source, GIOCondition condition, gpoi + new_pass = NULL; + + if (count++ < 3) { ++ gtk_label_set_text(GTK_LABEL(info), _("Invalid new password. Please input new password again.")); + switch_to_input_passwd(); + } else { + count = 0; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0009-greeter.c-disallow-empty-new-password.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0009-greeter.c-disallow-empty-new-password.patch new file mode 100644 index 000000000..3b12defb0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0009-greeter.c-disallow-empty-new-password.patch @@ -0,0 +1,53 @@ +From af1c347a31ae243d29c6087da8ffb423b23c74f2 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 1 Feb 2021 09:54:48 +0800 +Subject: [PATCH] greeter.c: disallow empty new password + +Do not clear text of label 'promt' when skip_password is set. When user +is required to update password, it only shows input box without label +for about 1 second. + +And disallow empty new password when user is required to update it. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/2/] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/greeter.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/greeter.c b/src/greeter.c +index 7e4a168..c0e6b64 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -220,7 +220,6 @@ static void on_entry_activate(GtkEntry* entry) + } + if(g_key_file_get_integer(config,"base","skip_password",NULL)!=0) + { +- gtk_label_set_text( GTK_LABEL(prompt), ""); + try_login_user(user); + } + else +@@ -235,6 +239,10 @@ static void on_entry_activate(GtkEntry* entry) + if (pass_expired) { + if (!new_pass) { + new_pass = g_strdup(gtk_entry_get_text(entry)); ++ if (strlen(new_pass) == 0) { ++ new_pass = NULL; ++ gtk_label_set_text((GtkLabel *)info, _("Empty password is not allowed.")); ++ } + switch_to_input_passwd(); + } else { + tmp = g_strdup(gtk_entry_get_text(entry)); +@@ -251,7 +259,7 @@ static void on_entry_activate(GtkEntry* entry) + gtk_label_set_text((GtkLabel *)info, _("Maximum number of failed update password attempts exceeded.")); + switch_to_input_user(); + } +- } else if (!strcmp(pass, g_base64_encode((guchar*)new_pass, strlen(new_pass) + 1))) { ++ } else if (pass && !strcmp(pass, g_base64_encode((guchar*)new_pass, strlen(new_pass) + 1))) { + // if new password is same as old one + g_free(new_pass); + new_pass = NULL; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index db4767bb3..216bbb624 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -9,6 +9,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar. file://0002-let-autotools-create-lxdm.conf.patch \ file://0003-check-for-libexecinfo-providing-backtrace-APIs.patch \ file://0004-fix-css-under-gtk-3.20.patch \ + file://0001-greeter-set-visible-when-switch-to-input-user.patch \ + file://0002-greeter-gdk.c-fix-typo.patch \ + file://0003-check-whether-password-expired-with-pam.patch \ + file://0004-lxdm.c-add-function-to-change-password-with-pam.patch \ + file://0005-ui.c-handle-password-expire-and-update-new-password.patch \ + file://0006-themes-Industrial-add-info-label-in-ui.patch \ + file://0007-greeter.c-support-to-update-expired-password.patch \ + file://0008-greeter.c-show-information-on-gtk-label-info.patch \ + file://0009-greeter.c-disallow-empty-new-password.patch \ " SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" diff --git a/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb index 108c339bf..3eb23dc0f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb @@ -4,9 +4,8 @@ HOMEPAGE = "http://fukuchi.org/works/qrencode/" SECTION = "libs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -PV = "4.0.1+git${SRCPV}" -SRCREV = "7c83deb8f562ae6013fea4c3e65278df93f98fb7" +SRCREV = "715e29fd4cd71b6e452ae0f4e36d917b43122ce8" SRC_URI = "git://github.com/fukuchi/libqrencode.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_1.500.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.000.bb index ce003e922..d3dd417dc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_1.500.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.000.bb @@ -3,15 +3,13 @@ require ttf.inc SUMMARY = "Ethiopia and Eritrea (Amharic) font - TTF Edition" HOMEPAGE = "http://software.sil.org/abyssinica/" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://OFL.txt;md5=1694c7fc245cdc85c9971db707928159" +LIC_FILES_CHKSUM = "file://OFL.txt;md5=80cc8cdcdc3f8ce96957bbac946b70ae" SRCNAME = "AbyssinicaSIL" SRC_URI = "http://software.sil.org/downloads/r/abyssinica/${SRCNAME}-${PV}.zip" S = "${WORKDIR}/${SRCNAME}-${PV}" -SRC_URI[md5sum] = "a3d943d18e303197c8d3d92d2de54d1e" -SRC_URI[sha256sum] = "e48a77d5ab8ee0b06464a5b29be70f292aa25dc1e73eb39ec933bd7fa47bbd86" +SRC_URI[sha256sum] = "274204a53b30f64cca662d78c7199e3c0325ea95ad4109886b47af734c92d0f9" FONT_PACKAGES = "${PN}" FILES_${PN} = "${datadir}" - diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 7c36dfc60..4caf217c2 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -18,7 +18,7 @@ SRC_URI += "file://run-ptest \ # we will append other kernel selftest in the future # bpf was added in 4.10 with: https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d # if you have older kernel than that you need to remove it from PACKAGECONFIG -PACKAGECONFIG ??= "bpf firmware vm" +PACKAGECONFIG ??= "firmware vm" PACKAGECONFIG_remove_x86 = "bpf" PACKAGECONFIG_remove_arm = "bpf vm" # host ptrace.h is used to compile BPF target but mips ptrace.h is needed diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210101.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210129.bb index 817e52dca..1e7a674f4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210101.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210129.bb @@ -16,7 +16,7 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" -SRC_URI[sha256sum] = "a26a2fb43c56719e5e94bbde7d2c492eb8306aa457a5a08034c6b942c4a3b0d4" +SRC_URI[sha256sum] = "85ab8d4337d414482586089b6f64fc39af64ff4be5b51976b54b0e10dceb333b" S = "${WORKDIR}/live" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb index 51d7e2a2e..6c07eff76 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" # AM_GLIB_GNU_GETTEXT macro in configure.ac. That macro is deprecated, so the # glib-2.0-native dependency may go away at some point (something to keep in # mind when doing version upgrades). -DEPENDS = "intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" +DEPENDS = "libxml-parser-perl-native intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" -inherit autotools features_check +inherit autotools features_check perlnative REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb index ac463038a..28d0868c4 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solvi AUTHOR = "Sameer Agarwal and Keir Mierle and Others" HOMEPAGE = "http://ceres-solver.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=35e00f0c4c96a0820a03e0b31e6416be" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" DEPENDS = "libeigen glog" SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" -SRCREV = "facb199f3eda902360f9e1d5271372b7e54febe1" +SRCREV = "399cda773035d99eaf1f4a129a666b3c4df9d1b1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb index c16e89329..1633412cf 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-outside-tests.patch " # tag 2.10.17 -SRCREV= "41e7d0074b6cb5b22c89f835b4531d848ab66987" +SRCREV= "122d09549201da5383321d870bed45ecb9e168c5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb index bf19843b2..b0ba3aede 100644 --- a/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb @@ -1,21 +1,20 @@ SUMMARY = "Enca is an Extremely Naive Charset Analyser" SECTION = "libs" -HOMEPAGE = "http://trific.ath.cx/software/enca/" +HOMEPAGE = "https://cihar.com/software/enca/" DEPENDS += "gettext-native" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" -SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \ +SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ file://configure-hack.patch \ file://dont-run-tests.patch \ file://configure-remove-dumbness.patch \ file://makefile-remove-tools.patch \ file://libenca-003-iconv.patch " -SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3" -SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d" +SRC_URI[sha256sum] = "75a38ed23bac37cc12166cc5edc8335c3af862adc202f84823d3aef3e2208e47" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.1.bb index 554e07fd3..60abe73a1 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.1.bb @@ -16,7 +16,7 @@ DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ " -SRCREV = "b079fa06223c3ab862c8f0eea58a968727971988" +SRCREV = "75ef79c9b013fb5eafd92710b3867827682fd52d" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch new file mode 100644 index 000000000..f3cd1015f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch @@ -0,0 +1,27 @@ +From ce3ab6ba4b8176d100ac535a39e3d5b0c517989b Mon Sep 17 00:00:00 2001 +From: Jan Palus <atler@pld-linux.org> +Date: Fri, 15 Jan 2021 14:32:14 +0100 +Subject: [PATCH] configure.ac: remove duplicate AC_CONFIG_MACRO_DIR (#226) + +fixes build with autoconf 2.70 +Upstream-Status: Backport [https://github.com/libusb/hidapi/pull/226] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 220909a..77da67a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" + + AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([foreign -Wall -Werror]) +-AC_CONFIG_MACRO_DIR([m4]) + + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + LT_INIT +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb index df68a850a..76f5dc762 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -10,7 +10,9 @@ DEPENDS = "libusb udev" inherit autotools pkgconfig -SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https" +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https \ + file://0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch \ +" PV = "0.10.1" SRCREV = "f6d0073fcddbdda24549199445e844971d3c9cef" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.1.0.bb index 363ed4d65..2bbf59ea7 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.1.0.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" -SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1" +SRCREV = "7f4fa178629d559c037a1f72f79f79af9c1ef8ce" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest new file mode 100644 index 000000000..4cda05d44 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest @@ -0,0 +1,12 @@ +#!/bin/sh + +testbin="gpiod-test" +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +./$testbin +if [ $? -ne 0 ]; then + echo "FAIL: $testbin" +else + echo "PASS: $testbin" +fi diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb index c0cf54589..e6b6476e2 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb @@ -4,11 +4,14 @@ AUTHOR = "Bartosz Golaszewski <bgolaszewski@baylibre.com>" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" -SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz" +SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ + file://run-ptest \ +" + SRC_URI[md5sum] = "4765470becb619fead3cdaeac61b9a77" SRC_URI[sha256sum] = "c601e71846f5ab140c83bc757fdd62a4fda24a9cee39cc5e99c96ec2bf1b06a9" -inherit autotools pkgconfig python3native +inherit autotools pkgconfig python3native ptest PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" @@ -31,3 +34,10 @@ PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" + +PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch b/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch new file mode 100644 index 000000000..1128c7ea0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch @@ -0,0 +1,30 @@ +From efe7101786193eaddb749c0583af6b54aec6f289 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Feb 2021 18:45:16 -0800 +Subject: [PATCH] configure: Conditionally undefine backend m4 macro + +Unlike the M4 builtin, this macro fails if macro is not defined +therefore recover the behavior of the builtin. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fe5054a..758f8c2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,7 +127,7 @@ fi + m4_set_foreach([crypto_backends], [backend], + [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")] + ) +-m4_undefine([backend]) ++m4_ifdef([backend], [m4_undefine([backend])]) + + + # libz +-- +2.30.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index 4a5a05060..0b8ccbd21 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://CVE-2019-17498.patch \ + file://0001-configure-Conditionally-undefine-backend-m4-macro.patch \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.5.bb index 68c326b52..29ec00a79 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.5.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "fe993408b22286355809ce48ebecc4444d19af8203ed4959d269969112ed86e9" +SRC_URI[sha256sum] = "390b81bf9b41ff736db997aede4d1f60b4453fbd75a519a4ddb645f6fd687e4a" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb index b223334a5..5263ffc03 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb @@ -213,6 +213,11 @@ do_install_append() { mv ${D}/usr/lib/* ${D}/${libdir}/ rm -rf ${D}/usr/lib fi + # remove build host path to improve reproducibility + if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake + fi } TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb index a282523a3..7c0460067 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb @@ -151,11 +151,13 @@ CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC" LDFLAGS_append = " -pthread" do_configure() { - cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build rm -f ${S}/libtool aclocal libtoolize --force --copy gnu-configize + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/missing ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/compile ${S}/build autoconf oe_runconf } diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch new file mode 100644 index 000000000..8bb60b555 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch @@ -0,0 +1,215 @@ +From 51d66c1c257f7487497f562033ac32ac75f648cb Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Mon, 8 Feb 2021 12:27:51 +0100 +Subject: [PATCH] meson: import changes from 3.0.* version + +* we need to use the meson option to disable introspection and docs + +Upstream-Status: Backport +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + meson.build | 139 ++++++++++++++++++++++++++++------------------ + meson_options.txt | 5 ++ + 2 files changed, 90 insertions(+), 54 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 1084c82..ed040b4 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,9 +53,9 @@ compiler = meson.get_compiler('c') + pkgconfig = import('pkgconfig') + + # ####################################################################### +-# # Check for GLib 2.16 ++# # Check for GLib 2.44 + # ####################################################################### +-glib = dependency('glib-2.0', version : '>= 2.16.0') ++glib = dependency('glib-2.0', version : '>= 2.44.0') + gobject = dependency('gobject-2.0') + gmodule = dependency('gmodule-2.0') + gnome = import('gnome') +@@ -63,74 +63,88 @@ gnome = import('gnome') + ####################################################################### + # Check for LibXML2 + ####################################################################### +-libxml = dependency('libxml-2.0', version : '>= 2.6.0', required : false) +-gnt_config.set('NO_LIBXML', not libxml.found()) ++libxml = dependency('libxml-2.0', version : '>= 2.6.0') + + ####################################################################### + # Check for ncurses and other things used by it + ####################################################################### + ncurses_available = true +-ncurses_inc = [] +-# The order of this list is important to the condition that follows. +-ncurses_libs = [ +- compiler.find_library('ncursesw', required : false), +- compiler.find_library('panelw', required : false), +- compiler.find_library('tinfow', required : false), +-] +-if not ncurses_libs[0].found() or not ncurses_libs[1].found() +- ncurses_available = false +-endif ++ncurses_widechar = true ++ncurses_header = 'ncurses.h' ++# Some distros put the headers in ncursesw/, some don't. These are ordered to ++# pick the last available as most-specific version. ++ncursesw_header_paths = ['', 'ncursesw/'] + +-if host_machine.system() == 'windows' +- # FIXME: $host ? +- ncurses_sys_prefix = '/usr/$host/sys-root/mingw' ++ncurses = [ ++ dependency('ncursesw', required : false), ++ dependency('panelw', required : false), ++] ++if ncurses[0].found() and ncurses[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' ++ if compiler.has_header_symbol(f, 'get_wch', ++ prefix : '#define _XOPEN_SOURCE_EXTENDED') ++ ncurses_header = f ++ endif ++ endforeach + else +- ncurses_sys_prefix = '/usr' +-endif +- +-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw', +- ncurses_sys_prefix + '/include'] +- +-if ncurses_available +- # Some distros put the headers in ncursesw/, some don't +- found_ncurses_h = false +- foreach location : ncurses_sys_dirs +- f = location + '/ncurses.h' +- if not found_ncurses_h ++ ncurses_available = false ++ ncurses_inc = [] ++ ncurses_libs = [ ++ compiler.find_library('ncursesw', required : false), ++ compiler.find_library('panelw', required : false) ++ ] ++ if ncurses_libs[0].found() and ncurses_libs[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' + if compiler.has_header_symbol(f, 'get_wch', + prefix : '#define _XOPEN_SOURCE_EXTENDED') +- if location != '.' +- ncurses_inc += [include_directories(location)] +- endif +- found_ncurses_h = true ++ ncurses_available = true ++ ncurses_header = f + endif +- endif +- endforeach ++ endforeach + +- if not found_ncurses_h +- ncurses_inc = [] +- ncurses_libs = [] +- ncurses_available = false ++ if ncurses_available ++ ncurses = declare_dependency( ++ include_directories : ncurses_inc, ++ dependencies : ncurses_libs ++ ) ++ endif + endif +-else ++endif ++ ++if not ncurses_available + # ncursesw was not found. Look for plain old ncurses +- # The order of this list is important to the condition that follows. +- ncurses_libs = [ +- compiler.find_library('ncurses', required : false), +- compiler.find_library('panel', required : false), +- compiler.find_library('tinfo', required : false), ++ ncurses = [ ++ dependency('ncurses', required : false), ++ dependency('panel', required : false), + ] +- ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() +- gnt_config.set('NO_WIDECHAR', true) ++ if ncurses[0].found() and ncurses_libs[1].found() ++ ncurses_available = true ++ else ++ ncurses_libs = [ ++ compiler.find_library('ncurses', required : false), ++ compiler.find_library('panel', required : false), ++ ] ++ ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++ endif ++ ncurses_widechar = false + endif ++ ++if not ncurses_available and host_machine.system() == 'windows' ++ # Try pdcurses too. ++ ncurses_header = 'curses.h' ++ ncurses_libs = compiler.find_library('pdcurses', required : false) ++ ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++endif ++ + if not ncurses_available + error('ncurses could not be found!') + endif +- +-ncurses = declare_dependency( +- include_directories : ncurses_inc, +- dependencies : ncurses_libs +-) ++gnt_config.set('NCURSES_HEADER', ncurses_header) ++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar) + + libgnt_SOURCES = [ + 'gntwidget.c', +@@ -191,7 +205,10 @@ libgnt_headers = [ + ] + + # Check for Python headers +-python_dep = dependency('python2', required : false) ++python_dep = dependency('python3-embed', required: false) ++if not python_dep.found() ++ python_dep = dependency('python3', required : false) ++endif + gnt_config.set('USE_PYTHON', python_dep.found()) + + configure_file(output : 'gntconfig.h', +@@ -233,6 +250,20 @@ pkgconfig.generate( + variables : ['plugindir = ${libdir}/gnt'], + ) + ++if get_option('introspection') ++ libgnt_gir = gnome.generate_gir(libgnt, ++ sources : libgnt_headers + [gnt_h], ++ includes : 'GObject-2.0', ++ namespace : 'Gnt', ++ symbol_prefix : 'gnt', ++ identifier_prefix : 'Gnt', ++ nsversion : '@0@.@1@'.format(gnt_major_version, gnt_minor_version), ++ install : true, ++ extra_args : ['-DGNT_COMPILATION', '--quiet']) ++endif ++ + subdir('wms') + subdir('test') +-subdir('doc') ++if get_option('doc') ++ subdir('doc') ++endif +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..f2414e2 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option('doc', type : 'boolean', value : true, yield : true, ++ description : 'build documentation with gtk-doc') ++ ++option('introspection', type : 'boolean', value : true, yield : true, ++ description : 'build introspection data') diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb new file mode 100644 index 000000000..67d8cc87c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "GNT: The GLib Ncurses Toolkit" + +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a1abacd0166f595a9fbe6afb1f0d5e" +DEPENDS = "glib-2.0 ncurses libxml2 glib-2.0-native" + +inherit meson + +# SRCREV = "0a44b1d01c41" +# SRC_URI = "hg://keep.imfreedom.org/${BPN};module=${BPN} + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \ + file://0001-meson-import-changes-from-3.0.-version.patch \ +" +SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" + +EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" + +FILES_${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch new file mode 100644 index 000000000..cfb0290f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch @@ -0,0 +1,229 @@ +From e03d3ef5aadd582ebf7102b7d5785fed177a0cb1 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 7 Feb 2021 13:25:29 +0100 +Subject: [PATCH] configure.ac: fix build with autoconf-2.71 + +* fixes: + | autoreconf: running: intltoolize --copy --force + | ERROR: 'IT_PROG_INTLTOOL' must appear in configure.ac for intltool to work. + | autoreconf: error: intltoolize failed with exit status: 1 + +* replace AM_GLIB_GNU_GETTEXT with AM_GNU_GETTEXT as suggested in: + https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration + https://blogs.gnome.org/jjardon/2010/10/08/use-upstream-gettext-instead-the-glib-one/ + because the former is causing issues with autoconf-2.71: + + -m4trace:configure.ac:266: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. + -You should run autoupdate.], [../autoconf-2.71/lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from... + -../autoconf-2.71/lib/m4sugar/m4sh.m4:699: AS_IF is expanded from... + -../autoconf-2.71/lib/autoconf/headers.m4:89: _AC_CHECK_HEADER_COMPILE is expanded from... + -../autoconf-2.71/lib/autoconf/headers.m4:56: AC_CHECK_HEADER is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:150: GLIB_WITH_NLS is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:370: GLIB_GNU_GETTEXT is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:470: AM_GLIB_GNU_GETTEXT is expanded from... + -configure.ac:266: the top level]) + -m4trace:configure.ac:266: -1- m4_pattern_allow([^ENABLE_NLS$]) + -m4trace:configure.ac:266: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. + -You should run autoupdate.], [../autoconf-2.71/lib/autoconf/status.m4:1025: AC_OUTPUT_COMMANDS is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:150: GLIB_WITH_NLS is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:370: GLIB_GNU_GETTEXT is expanded from... + -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:470: AM_GLIB_GNU_GETTEXT is expanded from... + -configure.ac:266: the top level]) + + and then configure fails with: + + configure.ac:2621: error: `po/stamp-it' is already registered with AC_CONFIG_COMMANDS. + autoconf-2.71/lib/autoconf/status.m4:1008: AC_CONFIG_COMMANDS is expanded from... + configure.ac:2621: the top level + +* add AM_GNU_GETTEXT_VERSION as well to resolve warning with autoconf-2.71 + configure.ac: warning: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + ABOUT-NLS | 1 + + Makefile.am | 6 +--- + configure.ac | 6 ++-- + pidgin/Makefile.am | 7 ++-- + po/Makevars | 82 ++++++++++++++++++++++++++++++++++++++++++++++ + po/POTFILES.in | 1 - + 6 files changed, 92 insertions(+), 11 deletions(-) + create mode 100644 ABOUT-NLS + create mode 100644 po/Makevars + +diff --git a/ABOUT-NLS b/ABOUT-NLS +new file mode 100644 +index 0000000..0a9d56d +--- /dev/null ++++ b/ABOUT-NLS +@@ -0,0 +1 @@ ++<https://www.gnu.org/software/gettext/manual/html_node/Users.html> +diff --git a/Makefile.am b/Makefile.am +index f8e2bc9..a74145f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,9 +13,6 @@ EXTRA_DIST = \ + fix-casts.sh \ + gaim.pc.in \ + gaim-uninstalled.pc.in \ +- intltool-extract.in \ +- intltool-merge.in \ +- intltool-update.in \ + package_revision.h \ + pidgin.apspec.in \ + pidgin.spec.in \ +@@ -139,5 +136,4 @@ endif + distuninstallcheck_listfiles = \ + find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm + +-DISTCLEANFILES= intltool-extract intltool-merge intltool-update \ +- package_revision_raw.txt ++DISTCLEANFILES=package_revision_raw.txt +diff --git a/configure.ac b/configure.ac +index 81d8592..e2280cd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,7 @@ fi + + AC_CANONICAL_HOST + AC_CONFIG_HEADERS([config.h]) +-AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2]) ++AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 foreign]) + dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11 + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +@@ -257,12 +257,12 @@ dnl ####################################################################### + AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes) + + if test x$enable_i18n = xyes; then +- AC_PROG_INTLTOOL + GETTEXT_PACKAGE=pidgin + AC_SUBST(GETTEXT_PACKAGE) + + ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW" +- AM_GLIB_GNU_GETTEXT ++ AM_GNU_GETTEXT([external]) ++ AM_GNU_GETTEXT_VERSION([0.21]) + + dnl If we don't have msgfmt, then po/ is going to fail -- ensure that + dnl AM_GLIB_GNU_GETTEXT found it. +diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am +index 2278b88..4d32c53 100644 +--- a/pidgin/Makefile.am ++++ b/pidgin/Makefile.am +@@ -192,13 +192,16 @@ DESKTOP_FILE=data/pidgin.desktop + appsdir = $(datadir)/applications + apps_in_files = data/pidgin.desktop.in + apps_DATA = $(apps_in_files:.desktop.in=.desktop) +-@INTLTOOL_DESKTOP_RULE@ ++ ++data/pidgin.desktop: data/pidgin.desktop.in ++ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + + appdatadir = $(datarootdir)/appdata + appdata_DATA = $(appdata_in_files:.xml.in=.xml) + appdata_in_files = data/pidgin.appdata.xml.in + +-@INTLTOOL_XML_RULE@ ++data/pidgin.appdata.xml: data/pidgin.appdata.xml.in ++ $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@ + + endif # INSTALL_I18N + +diff --git a/po/Makevars b/po/Makevars +new file mode 100644 +index 0000000..970237a +--- /dev/null ++++ b/po/Makevars +@@ -0,0 +1,82 @@ ++# Makefile variables for PO directory in any package using GNU gettext. ++# ++# Copyright (C) 2003-2019 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to use, copy, distribute, and modify it. ++ ++# Usually the message domain is the same as the package name. ++DOMAIN = $(PACKAGE) ++ ++# These two variables depend on the location of this directory. ++subdir = po ++top_builddir = .. ++ ++# These options get passed to xgettext. ++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 ++ ++# This is the copyright holder that gets inserted into the header of the ++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding ++# package. (Note that the msgstr strings, extracted from the package's ++# sources, belong to the copyright holder of the package.) Translators are ++# expected to transfer the copyright for their translations to this person ++# or entity, or to disclaim their copyright. The empty string stands for ++# the public domain; in this case the translators are expected to disclaim ++# their copyright. ++COPYRIGHT_HOLDER = Free Software Foundation, Inc. ++ ++# This tells whether or not to prepend "GNU " prefix to the package ++# name that gets inserted into the header of the $(DOMAIN).pot file. ++# Possible values are "yes", "no", or empty. If it is empty, try to ++# detect it automatically by scanning the files in $(top_srcdir) for ++# "GNU packagename" string. ++PACKAGE_GNU = ++ ++# This is the email address or URL to which the translators shall report ++# bugs in the untranslated strings: ++# - Strings which are not entire sentences, see the maintainer guidelines ++# in the GNU gettext documentation, section 'Preparing Strings'. ++# - Strings which use unclear terms or require additional context to be ++# understood. ++# - Strings which make invalid assumptions about notation of date, time or ++# money. ++# - Pluralisation problems. ++# - Incorrect English spelling. ++# - Incorrect formatting. ++# It can be your email address, or a mailing list address where translators ++# can write to without being subscribed, or the URL of a web page through ++# which the translators can contact you. ++MSGID_BUGS_ADDRESS = ++ ++# This is the list of locale categories, beyond LC_MESSAGES, for which the ++# message catalogs shall be used. It is usually empty. ++EXTRA_LOCALE_CATEGORIES = ++ ++# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' ++# context. Possible values are "yes" and "no". Set this to yes if the ++# package uses functions taking also a message context, like pgettext(), or ++# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. ++USE_MSGCTXT = no ++ ++# These options get passed to msgmerge. ++# Useful options are in particular: ++# --previous to keep previous msgids of translated messages, ++# --quiet to reduce the verbosity. ++MSGMERGE_OPTIONS = ++ ++# These options get passed to msginit. ++# If you want to disable line wrapping when writing PO files, add ++# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and ++# MSGINIT_OPTIONS. ++MSGINIT_OPTIONS = ++ ++# This tells whether or not to regenerate a PO file when $(DOMAIN).pot ++# has changed. Possible values are "yes" and "no". Set this to no if ++# the POT file is checked in the repository and the version control ++# program ignores timestamps. ++PO_DEPENDS_ON_POT = no ++ ++# This tells whether or not to forcibly update $(DOMAIN).pot and ++# regenerate PO files on "make dist". Possible values are "yes" and ++# "no". Set this to no if the POT file and PO files are maintained ++# externally. ++DIST_DEPENDS_ON_UPDATE_PO = no +diff --git a/po/POTFILES.in b/po/POTFILES.in +index a5691a1..b494bf3 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,4 +1,3 @@ +-[encoding: UTF-8] + finch/finch.c + finch/gntaccount.c + finch/gntblist.c diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch new file mode 100644 index 000000000..99c523d5d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch @@ -0,0 +1,49 @@ +From 861c8a63c36f9ee7d46238c9bc13a2c1f14372c3 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 7 Feb 2021 14:35:14 +0000 +Subject: [PATCH] configure.ac: disable few languages not compatible with + modern gettext + +* as pidgin-3 development is moving to meson and probably + most of these changes won't be applicable there, lets just + disable them until someone interested steps-up to maintain it + +* these 3 fail with: +cd ../../pidgin-2.14.1/po && rm -f brx.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o brx.1po brx.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o brx.gmo brx.1po && rm -f brx.1po +cd ../../pidgin-2.14.1/po && rm -f zh_HK.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o zh_HK.1po zh_HK.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o zh_HK.gmo zh_HK.1po && rm -f zh_HK.1po +cd ../../pidgin-2.14.1/po && rm -f zh_TW.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o zh_TW.1po zh_TW.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o zh_TW.gmo zh_TW.1po && rm -f zh_TW.1po +zh_HK.1po:2790: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications. +pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 1 fatal error +zh_TW.1po:2790: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications. +pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 1 fatal error +zh_HK.1po: 3234 translated messages. +make[3]: *** [Makefile:415: ../../pidgin-2.14.1/po/zh_HK.gmo] Error 1 +make[3]: *** Waiting for unfinished jobs.... +zh_TW.1po: 3234 translated messages. +make[3]: *** [Makefile:415: ../../pidgin-2.14.1/po/zh_TW.gmo] Error 1 +brx.1po:778: number of format specifications in 'msgid' and 'msgstr' does not match +brx.1po:3179: number of format specifications in 'msgid' and 'msgstr' does not match +brx.1po:5175: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same +brx.1po:5184: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same +brx.1po:7754: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same +pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 8 fatal errors +brx.1po: 3246 translated messages. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e2280cd..9332932 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -260,7 +260,7 @@ if test x$enable_i18n = xyes; then + GETTEXT_PACKAGE=pidgin + AC_SUBST(GETTEXT_PACKAGE) + +- ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW" ++ ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN" + AM_GNU_GETTEXT([external]) + AM_GNU_GETTEXT_VERSION([0.21]) + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch deleted file mode 100644 index 312fc8593..000000000 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 855cc20bafa30597ae7a62f7672d42654b25cde0 Mon Sep 17 00:00:00 2001 -From: Herrie <github.com@herrie.org> -Date: Mon, 24 Jul 2017 21:30:16 +0200 -Subject: [PATCH] Use pkg-config instead of ${PYTHON}-config to find python - ---- - configure.ac | 21 ++++++++------------- - 1 file changed, 8 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d20a18e..c741829 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1567,20 +1567,15 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") - dnl Check for Python headers (currently useful only for libgnt) - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then -- AC_MSG_CHECKING(for Python compile flags) -- if test -f ${PYTHON}-config; then -- PY_CFLAGS=`${PYTHON}-config --includes` -- PY_LIBS=`${PYTHON}-config --libs` -- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) -- AC_MSG_RESULT(ok) -- else -- AC_MSG_RESULT([Cannot find ${PYTHON}-config]) -- PY_CFLAGS="" -- PY_LIBS="" -- fi -+ AC_MSG_CHECKING(for Python compile flags) -+ PKG_CHECK_MODULES(PY, python, [ -+ AC_SUBST(PY_CFLAGS) -+ AC_SUBST(PY_LIBS) -+ ], [ -+ AC_MSG_RESULT(no) -+ AC_MSG_ERROR([Can't find python]) -+ ]) - fi --AC_SUBST(PY_CFLAGS) --AC_SUBST(PY_LIBS) - - dnl ####################################################################### - dnl # Check for Mono support diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch deleted file mode 100644 index c7b4163cb..000000000 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1488,7 +1488,7 @@ AC_ARG_WITH([python], - - if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then - if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then -- AC_PATH_PROG([PYTHON], [python], [no]) -+ AC_PATH_PROG([PYTHON], [python3], [no]) - fi - - if test x"$PYTHON" = x"no" ; then -@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then - AC_MSG_CHECKING(for Python compile flags) -- PKG_CHECK_MODULES(PY, python, [ -+ PKG_CHECK_MODULES(PY, python3, [ - AC_SUBST(PY_CFLAGS) - AC_SUBST(PY_LIBS) - ], [ diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb index fdc79e81b..d22380eb0 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb @@ -1,4 +1,5 @@ SUMMARY = "multi-protocol instant messaging client" + SECTION = "x11/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -10,12 +11,11 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ - file://pidgin-cross-python-265.patch \ - file://use_py3.patch \ + file://0001-configure.ac-fix-build-with-autoconf-2.71.patch \ + file://0002-configure.ac-disable-few-languages-not-compatible-wi.patch \ " -SRC_URI[md5sum] = "423403494fe1951e47cc75231f743bb0" -SRC_URI[sha256sum] = "2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f" +SRC_URI[sha256sum] = "f132e18d551117d9e46acce29ba4f40892a86746c366999166a3862b51060780" PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ @@ -34,13 +34,14 @@ PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" +PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,libgnt" PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls,libpurple-plugin-ssl-gnutls" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss" EXTRA_OECONF = " \ + --with-python=python3 \ --disable-perl \ --disable-tcl \ --disable-gevolution \ @@ -51,17 +52,12 @@ EXTRA_OECONF = " \ --disable-screensaver \ " -do_configure_prepend() { - touch ${S}/po/Makefile - sed -i "s#PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`#PY_VERSION=${PYTHON_BASEVERSION}#g" ${S}/configure.ac -} - OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" OE_LT_RPATH_ALLOW[export]="1" -PACKAGES =+ "libpurple-dev libpurple libgnt libgnt-dev finch finch-dev ${PN}-data" +PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" -RPROVIDES_${PN}-dbg += "libpurple-dbg libgnt-dbg finch-dbg" +RPROVIDES_${PN}-dbg += "libpurple-dbg finch-dbg" LEAD_SONAME = "libpurple.so.0" FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" @@ -72,8 +68,6 @@ FILES_libpurple-dev = "${libdir}/libpurple*.la \ ${libdir}/purple-2/liboscar.so \ ${libdir}/purple-2/libymsg.so \ ${datadir}/aclocal" -FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" -FILES_libgnt-dev = "${libdir}/gnt/*.la" FILES_finch = "${bindir}/finch" FILES_finch-dev = "${libdir}/finch/*.la" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.02.0.bb index 4d4c310a4..c85fbf2af 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.02.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3" +SRC_URI[sha256sum] = "5c14759c99891e6e472aced6d5f0ff1dacf85d80cd9026d365c55c653edf792c" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb index dae912252..a33aa2c96 100644 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb @@ -10,8 +10,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" SRC_URI = "git://github.com/mchehab/zbar.git;branch=master \ - file://0001-qt-Create-subdir-in-Makefile.patch \ - file://0002-zbarcam-Create-subdir-in-Makefile.patch \ + file://0001-qt-Create-subdir-in-Makefile.patch \ + file://0002-zbarcam-Create-subdir-in-Makefile.patch \ " SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" @@ -21,15 +21,15 @@ PV = "0.23.1+git${SRCPV}" DEPENDS += "xmlto-native" PACKAGECONFIG ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " PACKAGECONFIG ??= "video python3" inherit autotools pkgconfig gettext \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" @@ -40,20 +40,19 @@ PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extra PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" FILES_${PN} += "${bindir} \ - ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ + ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ " CPPFLAGS_append = "\ - ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ - -I${STAGING_INCDIR}/QtX11Extras \ - -I${STAGING_INCDIR}/dbus-1.0 \ - -I${STAGING_LIBDIR}/dbus-1.0/include \ - ', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ + -I${STAGING_INCDIR}/QtX11Extras \ + -I${STAGING_INCDIR}/dbus-1.0 \ + -I${STAGING_LIBDIR}/dbus-1.0/include \ + ', '', d)} \ " TARGET_CXXFLAGS_append = " -fPIC" -do_prepare_recipe_sysroot_gettext() { - install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ +do_configure_prepend() { + install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ } -addtask do_prepare_recipe_sysroot_gettext after do_prepare_recipe_sysroot before do_configure
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb index ee2d8801e..ab7b71ef7 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" -SRCREV = "5715157da35898a7cb3293b7a5394ba23715b5a4" +SRCREV = "fe3e3af49fd30b68c21a9fcaac340ad8e7f91055" S = "${WORKDIR}/git" DEPENDS = "\ diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.67.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb index 57b5fbf89..595160744 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.67.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://README;beginline=3;endline=5;md5=4d6588c2fa0d38ae162f SRC_URI = "${CPAN_MIRROR}/authors/id/M/MA/MARSCHAP/perl-ldap-${PV}.tar.gz" -SRC_URI[md5sum] = "a949a2bab07b44cc043b965485fe493a" -SRC_URI[sha256sum] = "19a2f7f7959fe23d16367475772c325109f8604d2949e34b96dddb2dfa031170" +SRC_URI[md5sum] = "d091ed00302f0276069bca9df9478744" +SRC_URI[sha256sum] = "e2f389fe3e7a9e4b61488692919ad723b98f3b479b5288f610daa8c27995b351" S = "${WORKDIR}/perl-ldap-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002003.bb b/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002004.bb index 531e77a10..db8646d7c 100644 --- a/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002003.bb +++ b/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002004.bb @@ -9,8 +9,8 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=197;endline=234;md5=26df7e7c20551fb1906e2286624f0b71" SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Role-Tiny-${PV}.tar.gz" -SRC_URI[md5sum] = "065e459cdc3c6e163c6e8359baf69f45" -SRC_URI[sha256sum] = "6981e5f2d0beded157840199d678da462b22a9a3753333cab322ab6efb0fbb89" +SRC_URI[md5sum] = "9ee45591befa3d0b1094ac75d282b6ba" +SRC_URI[sha256sum] = "d7bdee9e138a4f83aa52d0a981625644bda87ff16642dfa845dcb44d9a242b45" S = "${WORKDIR}/Role-Tiny-${PV}" diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in deleted file mode 100644 index 4503da422..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -// Some custom Gate One settings for OpenEmbedded -{ - "*": { - "gateone": { // These settings apply to all of Gate One - "log_file_prefix": "@localstate@/log/gateone.log", // default would be /var/log/gateone/gateone.log - "log_file_max_size": 5242880, // 5 megabyte logs for OE by default (default would normally be 100Mb) - "log_file_num_backups": 2, // Default is normally 10 - "origins": ["*"], // Every device has a unique origin - "logging": "info", - "pid_file": "/run/gateone.pid", - "session_dir": "/tmp/gateone", - "user_dir": "@localstate@/lib/gateone/users" - }, - "terminal": { - // Disabling session logging for embedded devices is a good idea (limited/slow storage) - "session_logging": false, - "syslog_session_logging": false -// "commands": { -// // For some reason this doesn't work (never asks for the password) -// "login": "setsid /bin/login" // Normally this would emulate logging into the host console -// } - } - } -} diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service deleted file mode 100644 index 0f613d18e..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" standalone='no'?><!--*-nxml-*--> -<!DOCTYPE service-group SYSTEM "avahi-service.dtd"> - -<service-group> - <name replace-wildcards="yes">GateOne on %h</name> - <service> - <type>_https._tcp</type> - <port>443</port> - </service> -</service-group> diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in deleted file mode 100644 index 86d655c94..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -e -### BEGIN INIT INFO -# Provides: gateone -# Required-Start: networking -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Gateone HTML5 ssh client -# Description: Gateone HTML5 terminal emulator and SSH client. -### END INIT INFO - -. /etc/init.d/functions - -NAME=gateone -DAEMON=@bindir@/gateone -PIDFILE=/run/gateone.pid -WORKDIR=@localstate@/lib/gateone - -do_start() { - cd $WORKDIR - @bindir@/python $DAEMON > /dev/null 2>&1 & - cd $OLDPWD -} - -do_stop() { - kill -TERM `cat $PIDFILE` -} - -case "$1" in - start) - echo "Starting gateone" - do_start - ;; - stop) - echo "Stopping gateone" - do_stop - ;; - restart|force-reload) - echo "Restart gateone" - do_stop - sleep 1 - do_start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac diff --git a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in deleted file mode 100644 index 44667275a..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=GateOne daemon -ConditionPathExists=|@localstate@/lib/gateone - -[Service] -WorkingDirectory=@localstate@/lib/gateone -ExecStart=@bindir@/python @bindir@/gateone - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch index d4e144a61..61aeaca5f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch @@ -1,4 +1,4 @@ -From b394003d31a7187767b7d6cc7b871968d2674be9 Mon Sep 17 00:00:00 2001 +From efae4e08d13e0958d929ea524e21c0a210b31982 Mon Sep 17 00:00:00 2001 From: Leon Anavi <leon.anavi@konsulko.com> Date: Fri, 22 Jan 2021 11:41:12 +0200 Subject: [PATCH] setup.py: Adjust _add_rpath @@ -8,15 +8,16 @@ Fix error: unrecognized command-line option '-R' Upstream-Status: Inappropriate [oe specific] Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> + --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py -index 22f582d..2d28655 100755 +index b634d94..7f6a2f1 100755 --- a/setup.py +++ b/setup.py -@@ -231,9 +231,6 @@ def _add_rpath(settings, path): +@@ -235,9 +235,6 @@ def _add_rpath(settings, path): """ if sys.platform == 'darwin': settings['extra_link_args'].extend(['-Wl,-rpath', '-Wl,%s' % path]) @@ -24,8 +25,5 @@ index 22f582d..2d28655 100755 - settings['runtime_library_dirs'].append(path) - - def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): + def settings_from_prefix(prefix=None): """load appropriate library/include settings from ZMQ prefix""" --- -2.17.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.4.2.bb index de336af22..05afed8b6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.4.2.bb @@ -1,9 +1,9 @@ SUMMARY = "jinja2 template renderer for aiohttp.web (http server for asyncio)" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c82758543767c96574b6e29fc478fb73" +LIC_FILES_CHKSUM = "file://LICENSE;md5=29dca541e03964615590ca7b50392d97" -SRC_URI[sha256sum] = "2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79" +SRC_URI[sha256sum] = "9c22a0e48e3b277fc145c67dd8c3b8f609dab36bce9eb337f70dfe716663c9a0" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.4.bb index 9e30cc131..9a0991d3c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.5.4.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c4ece55266dcdd02ce165b1ee0e490bb" inherit pypi setuptools3 -SRC_URI[sha256sum] = "a4de8d3525a95a96d59342e14b95cab5956c25b0907dce1549bb4e3e7958f4c2" +SRC_URI[sha256sum] = "e871118b6174681f7e9a9ea67cfcae954c6d18e05b49c6b17f662d2530c76bf5" PYPI_PACKAGE = "alembic" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.9.bb index f763067cf..5408c5aa8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.9.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "\ file://AWSIoTPythonSDK/core/protocol/paho/client.py;endline=14;md5=5a3c8a1a4bb71bd934f450ecff972ad9 \ " -SRC_URI[md5sum] = "d05596f02774ea39517765c5dced874a" -SRC_URI[sha256sum] = "bcd68cb7fdb044dbd5e5d3a02c311b25717c0376168e7c992982130f19c51b03" +SRC_URI[sha256sum] = "84b440c5929f33da1cd204f3ad0ea891e208637dd63de9fb039ed7d49d78c303" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.2.0.bb index b2f3fd6d8..632175cc4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "3c4c2652907c48e7013f825cc3068b5d47a38b62f01bd04aaab1d9f69a8f53f5" +SRC_URI[sha256sum] = "31bcdd56cbb5e26decab42f0624c8cead9b94991f6ee922512b0acd6ae7d6da2" PYPI_PACKAGE = "cantools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb index dfe493bd2..18c7a6699 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -SRC_URI[md5sum] = "520afccc1d46f833d117a23fab76ed8f" -SRC_URI[sha256sum] = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687" +SRC_URI[sha256sum] = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.6.bb index bfe1f1d4c..d3b6fa1f4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.6.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "12f9fd52e7cfb623d0788956d137a3de26e5583a25820fa7710fb6b58d32b213" +SRC_URI[sha256sum] = "e79bcc9681d2345e71360241aebe19ed6c5475fec40cc59a7998fe1a2ca568d0" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.1.3.bb index f47f15222..2cba4fb5c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.1.3.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[md5sum] = "887f60e9c4fb9b0804a38372b2798101" -SRC_URI[sha256sum] = "23e1fed8d196d9a6cc4d220ef11fbe7eb8cff3a27848621c447e9d96134b2085" +SRC_URI[sha256sum] = "b729d9376cc0f76479c9b0cef30cc0d3c9082ccb4507caa0da1a5e4964926960" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.6.0.bb index 54fa1dd97..810f0eb27 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.5.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.6.0.bb @@ -2,8 +2,7 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[md5sum] = "707d4a5fd4e11d3113a1228aa7793176" -SRC_URI[sha256sum] = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee" +SRC_URI[sha256sum] = "8626af845e6071ef80c70b0dc16d373f761c981f0ad61bb143a529cab649e725" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_4.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.1.bb index b8631bf50..4c5d0a3fb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_4.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.1.bb @@ -9,8 +9,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "Flask-SocketIO" -SRC_URI[md5sum] = "d7992b0b4aaf473b7eff21fc14e8d1b2" -SRC_URI[sha256sum] = "36c1d5765010d1f4e4f05b4cc9c20c289d9dc70698c88d1addd0afcfedc5b062" +SRC_URI[sha256sum] = "5c4319f5214ada20807857dc8fdf3dc7d2afe8d6dd38f5c516c72e2be47d2227" RDEPENDS_${PN} += "\ ${PYTHON_PN}-flask \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_21.1.2.bb index 06c45f2ed..5edd96b34 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_21.1.2.bb @@ -20,8 +20,7 @@ SRC_URI_append = " \ file://libev-conf.patch;patch=1;pnum=1 \ " -SRC_URI[md5sum] = "9366ee7eebed48003f8a748568ef1f70" -SRC_URI[sha256sum] = "5f6d48051d336561ec08995431ee4d265ac723a64bba99cc58c3eb1a4d4f5c8d" +SRC_URI[sha256sum] = "520cc2a029a9eef436e4e56b007af7859315cafa21937d43c1d5269f12f2c981" # The python-gevent has no autoreconf ability # and the logic for detecting a cross compile is flawed diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.16.bb index 0de4c8f40..1af657098 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.16.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://graphviz.readthedocs.io/en/stable/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f7831c564aeff14e68aa4ff7a93dc89f" -SRC_URI[md5sum] = "7123efabb68270f579525df74bf8b0c9" -SRC_URI[sha256sum] = "92b7637ece63c77e3d39221ae1f4df98e9256cb449e9860c598335b34496d195" +SRC_URI[sha256sum] = "d2d25af1c199cad567ce4806f0449cb74eb30cf451fd7597251e1da099ac6e57" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenstalk_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenstalk_2.0.0.bb index 9447c1836..9af5a0b4e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenstalk_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenstalk_2.0.0.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/mayhewj/greenstalk" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8f98432ba1fce3933c556430fd47298f" -SRC_URI[md5sum] = "3374649586a8016fecaf0ce5ecf9985d" -SRC_URI[sha256sum] = "0c9f2af79ac8ea526891ae8d7e9500341a0f657465a541d6eaedb35ff70f4fe3" +SRC_URI[sha256sum] = "0020970abdb6f400586938573cbbec80410e83805d61e46cf76ea3ed71129257" RDEPENDS_${PN} += "python3-io python3-core" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch new file mode 100644 index 000000000..da95ee7af --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch @@ -0,0 +1,30 @@ +From b5d5a7efc7aaa2be830731001ed17c5b71bcefb1 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 29 Jan 2021 02:33:06 +0000 +Subject: [PATCH] setup_build.py: avoid absolute path + +Prevent absolute path from ending up in the egg-info SOURCES.txt. + +Upstream-Status: Submitted [https://github.com/h5py/h5py/pull/1803] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + setup_build.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup_build.py b/setup_build.py +index ffd3bef..fb196c0 100644 +--- a/setup_build.py ++++ b/setup_build.py +@@ -20,7 +20,7 @@ import api_gen + + + def localpath(*args): +- return op.abspath(op.join(op.dirname(__file__), *args)) ++ return op.join(*args) + + + MODULES = ['defs','_errors','_objects','_proxy', 'h5fd', 'h5z', +-- +2.29.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.10.0.bb index 3904abbb4..b812b323f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_2.10.0.bb @@ -9,6 +9,7 @@ SRC_URI[sha256sum] = "84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6 SRC_URI_append = " \ file://0001-cross-compiling-support.patch \ + file://0001-setup_build.py-avoid-absolute-path.patch \ " inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.20.0.bb index d3ce9f5ff..42795b9bf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.19.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.20.0.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[md5sum] = "33bdc8287c827aae23699751b0ed3f7a" -SRC_URI[sha256sum] = "cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a" +SRC_URI[sha256sum] = "1923af00820a8cf58e91d56b89efc59780a6e81363b94464a0f17c039dffff9e" RDEPENDS_${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.2.bb index c83140a89..2f2421981 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.2.bb @@ -7,8 +7,7 @@ HOMEPAGE = "https://github.com/tcalmant/python-javaobj" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87" -SRC_URI[md5sum] = "47632071c3c3ca14b6c42f2a4e2e1309" -SRC_URI[sha256sum] = "419ff99543469e68149f875abb0db5251cecd350c03d2bfb4c94a5796f1cbc14" +SRC_URI[sha256sum] = "ed3b1ffcfd39f165729cb53587cca02ab0bfa4c332c837a92d5ffe6aef5c8010" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.4.bb index 25709a117..a4df9a6fe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.4.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/matplotlib/matplotlib" SECTION = "devel/python" LICENSE = "PSF" LIC_FILES_CHKSUM = "\ - file://setup.py;beginline=259;endline=259;md5=e0ef37de7122ce842bcd1fb54482b353 \ + file://setup.py;beginline=273;endline=273;md5=e0ef37de7122ce842bcd1fb54482b353 \ file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \ " DEPENDS = "\ @@ -19,8 +19,8 @@ DEPENDS = "\ python3-certifi-native \ " -SRC_URI[md5sum] = "a85791908e78818bd425ba9ab38500fa" -SRC_URI[sha256sum] = "3d2edbf59367f03cd9daf42939ca06383a7d7803e3993eb5ff1bee8e8a3fbb6b" +SRC_URI[md5sum] = "0b48f34ec623e765a1bda15924ce0b56" +SRC_URI[sha256sum] = "3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0" inherit pypi setuptools3 pkgconfig diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.2.0.bb index 3cd9004df..a01071151 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.2.0.bb @@ -4,11 +4,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fea92e2e010ccb151792c29fadc2db7b" -SRC_URI[md5sum] = "27cdd7e026438067a238fb04ed5766a3" -SRC_URI[sha256sum] = "57baa82e6bc59b67747317d16ad0cf9626826e8d43233af13bce924660500bd6" +SRC_URI[md5sum] = "0a5b866443edab0dab62cea56ed96f1e" +SRC_URI[sha256sum] = "391e5bdfe2511aa7369002d4861df795dbb2889426b1b2cc1e6c9d85939da4dd" inherit pypi setuptools3 PYPI_PACKAGE = "python-periphery" -RDEPENDS_${PN} += "${PYTHON_PN}-mmap" +RDEPENDS_${PN} += "${PYTHON_PN}-mmap \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-fcntl" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch index 775ae1b2e..98d250c74 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch @@ -1,4 +1,4 @@ -From 9a16800738547d117284354bbcad7dd77d9d0344 Mon Sep 17 00:00:00 2001 +From 5f3911737c63a098caf73f1365320fe1b3a7638b Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 21 Apr 2016 03:05:57 -0400 Subject: [PATCH] support cross-complication @@ -6,12 +6,13 @@ Subject: [PATCH] support cross-complication Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- setup.py | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/setup.py b/setup.py -index 658d1a5..e8be7eb 100755 +index eb83cfe..3f9567b 100755 --- a/setup.py +++ b/setup.py @@ -13,41 +13,6 @@ import sys @@ -38,13 +39,13 @@ index 658d1a5..e8be7eb 100755 - sys.stderr.write("You need to install gcc to build this module\n") - sys.exit(1) - --sp = subprocess.Popen(['cpp'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +-sp = subprocess.Popen(['cpp'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os.environ) -sp.communicate('#include <sys/prctl.h>\n'.encode()) -if sp.returncode: - sys.stderr.write("You need to install libc development headers to build this module\n") - exit = True - --sp = subprocess.Popen(['cpp'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +-sp = subprocess.Popen(['cpp'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os.environ) -sp.communicate('#include <sys/capability.h>\n'.encode()) -if sp.returncode: - sys.stderr.write("You need to install libcap development headers to build this module\n") @@ -57,5 +58,5 @@ index 658d1a5..e8be7eb 100755 sources = ['_prctlmodule.c'], depends = ['securebits.h'], -- -2.8.1 +2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.8.1.bb index 54620a066..b87a470b4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.8.1.bb @@ -5,15 +5,15 @@ limitations in C and linux. This module provides a nice non-messy python(ic) \ interface." SECTION = "devel/python" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=23ff9f50449d4bd0e513df16e4d9755f" +LIC_FILES_CHKSUM = "file://COPYING;md5=1475481f9ec754d758859bd2c75f6f6f" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "57cd0a7cad76e8f8792eea22ee5b5d17bae0a90f" -PV = "1.7+git${SRCPV}" +SRCREV = "5e12e398eb5c4e30d7b29b02458c76d2cc780700" +PV = "1.8.1+git${SRCPV}" -SRC_URI = "git://github.com/seveas/python-prctl;branch=master \ +SRC_URI = "git://github.com/seveas/python-prctl;branch=main\ file://0001-support-cross-complication.patch \ " inherit setuptools3 python3native diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.14.bb index 0b832c064..e5ad069d3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.14.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" -SRC_URI[sha256sum] = "dc83e6368b0edd9ceabe17a055f2e22f6ed95b9aa39dbd59d0b4f3585bdfe9ed" +SRC_URI[sha256sum] = "7e966747c18ececaec785699626b771c1ba8344c8d31759a1915d6b12fad6525" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch index 6455c95e7..761422e07 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 3abfa65517959ad279481021fafefba28f955e76 Mon Sep 17 00:00:00 2001 +From 2e9318f7a70699eed239aee6301d1d0bbd2457ee Mon Sep 17 00:00:00 2001 From: Philip Balister <philip@balister.org> Date: Fri, 10 Jul 2020 10:14:59 -0400 Subject: [PATCH] Do not check pointer size when cross compiling. @@ -8,23 +8,24 @@ It is reasonable to build for 32 machine on a 64 bit build machine. Prevents: | Python config failure: Python is 64-bit, chosen compiler is 32-bit Signed-off-by: Philip Balister <philip@balister.org> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- tools/FindPythonLibsNew.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake -index d0c8fa2..8479e70 100644 +index 3605aebc..67f4d4a0 100644 --- a/tools/FindPythonLibsNew.cmake +++ b/tools/FindPythonLibsNew.cmake -@@ -123,7 +123,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) +@@ -156,7 +156,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) # Make sure the Python has the same pointer-size as the chosen compiler # Skip if CMAKE_SIZEOF_VOID_P is not defined -if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) +if((NOT CMAKE_CROSSCOMPILING) AND CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) - if(PythonLibsNew_FIND_REQUIRED) - math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") - math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") + if(PythonLibsNew_FIND_REQUIRED) + math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") + math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") -- -2.25.4 +2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch index 07ab9a03b..699eb6155 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch @@ -1,4 +1,4 @@ -From 918f3ef01c7a67f3beb67307966698474f144581 Mon Sep 17 00:00:00 2001 +From debd676cd94f92a30b3be45f1245aa13d8c398c0 Mon Sep 17 00:00:00 2001 From: Philip Balister <philip@balister.org> Date: Wed, 8 Jul 2020 09:41:43 -0400 Subject: [PATCH] Do not strip binaries. @@ -6,34 +6,43 @@ Subject: [PATCH] Do not strip binaries. * OpenEmbedded strips them after creating debug packages. Signed-off-by: Philip Balister <philip@balister.org> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- - tools/pybind11Tools.cmake | 13 ------------- - 1 file changed, 13 deletions(-) + tools/pybind11NewTools.cmake | 5 ----- + tools/pybind11Tools.cmake | 4 ---- + 2 files changed, 9 deletions(-) +diff --git a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake +index 18da8be1..82ebf5e7 100644 +--- a/tools/pybind11NewTools.cmake ++++ b/tools/pybind11NewTools.cmake +@@ -246,11 +246,6 @@ function(pybind11_add_module target_name) + endif() + endif() + +- if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) +- # Strip unnecessary sections of the binary on Linux/macOS +- pybind11_strip(${target_name}) +- endif() +- + if(MSVC) + target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) + endif() diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake -index a3603ab..b4c8f63 100644 +index 32313539..a7d81012 100644 --- a/tools/pybind11Tools.cmake +++ b/tools/pybind11Tools.cmake -@@ -230,19 +230,6 @@ function(pybind11_add_module target_name) - - _pybind11_add_lto_flags(${target_name} ${ARG_THIN_LTO}) +@@ -201,10 +201,6 @@ function(pybind11_add_module target_name) + endif() + endif() -- if (NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) -- # Strip unnecessary sections of the binary on Linux/Mac OS -- if(CMAKE_STRIP) -- if(APPLE) -- add_custom_command(TARGET ${target_name} POST_BUILD -- COMMAND ${CMAKE_STRIP} -x $<TARGET_FILE:${target_name}>) -- else() -- add_custom_command(TARGET ${target_name} POST_BUILD -- COMMAND ${CMAKE_STRIP} $<TARGET_FILE:${target_name}>) -- endif() -- endif() +- if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) +- pybind11_strip(${target_name}) - endif() - if(MSVC) - # /MP enables multithreaded builds (relevant when there are many files), /bigobj is - # needed for bigger binding projects due to the limit to 64k addressable sections + target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) + endif() -- -2.25.4 +2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.6.2.bb index 5d57590a1..bd16a6d0d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.6.2.bb @@ -1,15 +1,15 @@ SUMMARY = "Seamless operability between C++11 and Python" HOMEPAGE = "https://github.com/wjakob/pybind11" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62" +LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" DEPENDS = "boost" SRC_URI = "git://github.com/pybind/pybind11.git \ file://0001-Do-not-strip-binaries.patch \ file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \ - " -SRCREV = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" +" +SRCREV = "8de7772cc72daca8e947b79b83fea46214931604" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_8.0.0.bb index c0ff58cfd..939db5768 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_8.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" -SRC_URI[sha256sum] = "aad4b145cb8c76b629c700877e49c418810aaabb26ace5035c49940f9657f2f0" +SRC_URI[sha256sum] = "21e9295b2e8088a7f19f82b22c7abcc07ab329914d647cc5dcac08790a7c9d36" PYPI_PACKAGE = "PyChromecast" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb index aa14cdd4b..4d4d2b79c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb @@ -13,7 +13,7 @@ inherit setuptools3 pypi RDEPENDS_${PN} = "\ ${PYTHON_PN}-docopt \ ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-ruamel-yaml \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.137.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.137.3.bb index 9b2efa2cd..e363729fd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.137.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.137.3.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" SRC_URI = "git://github.com/MISP/PyMISP.git;protocol=https;branch=main" -SRCREV = "7b64c1c9a4fec8ed37c1522b31ab56f30b83f0e1" +SRCREV = "f675e2096182532bb5870e4f773476b2d8065986" S = "${WORKDIR}/git" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.3.bb index 5372ac0ff..3549adce7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.3.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "c2b67881392a9e85aa108e75f62cdbe372d5a3f17ea5f8d3436dcf4662052f14" +SRC_URI[sha256sum] = "db5098587f58fbf8582d9bda2462762b367207246d3e19623782fb449c3c5fcc" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_2.1.1.bb deleted file mode 100644 index 27b768155..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_2.1.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "pytest plugin for generating html reports from test results" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://../pytest-html.LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" - -# Per README.rst the license statement is fetched from -# https://raw.githubusercontent.com/davehunt/pytest-html/master/LICENSE -SRC_URI += "https://raw.githubusercontent.com/davehunt/pytest-html/master/LICENSE;name=license;downloadfilename=pytest-html.LICENSE" -SRC_URI[license.md5sum] = "5d425c8f3157dbf212db2ec53d9e5132" -SRC_URI[license.sha256sum] = "2bfdca60adf803108d4c7f009000bea76ad00e621e163197881b0eaae91b530e" - -SRC_URI[sha256sum] = "6a4ac391e105e391208e3eb9bd294a60dd336447fd8e1acddff3a6de7f4e57c5" - - -PYPI_PACKAGE = "pytest-html" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb new file mode 100644 index 000000000..bd543d2f0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "pytest plugin for generating html reports from test results" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +SRC_URI[sha256sum] = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3" + + +PYPI_PACKAGE = "pytest-html" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-pytest \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2021.1.bb index 198626311..cc4dfecfa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2021.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" inherit pypi setuptools3 ptest -SRC_URI[md5sum] = "0349106ac02f2bfe565dd6d5594e3a15" -SRC_URI[sha256sum] = "c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048" +SRC_URI[md5sum] = "8c849bdf95414fe708a84473e42d4406" +SRC_URI[sha256sum] = "83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da" RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_21.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.0.2.bb index 8bde98247..555f27cb4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_21.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.0.2.bb @@ -8,7 +8,7 @@ DEPENDS = "zeromq" FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" SRC_URI += "file://club-rpath-out.patch" -SRC_URI[sha256sum] = "098c13c6198913c2a0690235fa74d2e49161755f66b663beaec89651554cc79c" +SRC_URI[sha256sum] = "d7b82a959e5e22d492f4f5a1e650e909a6c8c76ede178f538313ddb9d1e92963" inherit pypi pkgconfig setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.12.bb index ec8545dae..7593ce7f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.12.bb @@ -8,9 +8,13 @@ PYPI_PACKAGE = "ruamel.yaml" inherit pypi setuptools3 +BBCLASSEXTEND = "native nativesdk" + SRC_URI[md5sum] = "c7e4b216d9554d80be42011b448b7c61" SRC_URI[sha256sum] = "076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e" do_install_prepend() { export RUAMEL_NO_PIP_INSTALL_CHECK=1 } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.23.bb index cf127241d..d962ea7d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.22.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.23.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ application developers the full power and flexibility of SQL" HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c19467890539ff718c00a019c9c7a7b2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3359ed561ac16aaa25b6c6eff84df595" -SRC_URI[sha256sum] = "758fc8c4d6c0336e617f9f6919f9daea3ab6bb9b07005eda9a1a682e24a6cacc" +SRC_URI[sha256sum] = "6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.51.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.56.0.bb index e4510ad44..d4baf6f22 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.51.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.56.0.bb @@ -5,9 +5,10 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=7ea57584e3f8bbde2ae3e1537551de25" -SRC_URI[md5sum] = "b188c2dc7802c19b262971e566c265ce" -SRC_URI[sha256sum] = "ef54779f1c09f346b2b5a8e5c61f96fbcb639929e640e59f8cf810794f406432" +SRC_URI[sha256sum] = "fe3d08dd00a526850568d542ff9de9bbc2a09a791da3c334f3213d8d0bbbca65" inherit pypi setuptools3 +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.10.0.bb index 01bbf831a..94fd65649 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_3.10.0.bb @@ -4,8 +4,7 @@ DESCRIPTION = "Python module to support twitter API" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "b5bc640fa9f6baff6471c127aba1fec0" -SRC_URI[sha256sum] = "bfd19a5c11f35f7f199c795f99d9cbf8a52eb33f0ecfb6c91ee10b601180f604" +SRC_URI[sha256sum] = "76e6954b806ca470dda877f57db8792fff06a0beba0ed43efc3805771e39f06a" PYPI_PACKAGE = "tweepy" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.3.bb index fcd670901..739cf24f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" -SRC_URI[sha256sum] = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08" +SRC_URI[sha256sum] = "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb index 571dba6fa..8587ea8f3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb @@ -4,16 +4,19 @@ DESCRIPTION = "Extract data from Excel spreadsheets (.xls and .xlsx,\ Strong support for Excel dates. Unicode-aware." HOMEPAGE = "http://www.python-excel.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5f4244d51fcc1e7cc2d43e96891b2f80" +LIC_FILES_CHKSUM = "file://LICENSE;md5=00ea1e843a43c20d9b63a8112239b0d1" -SRC_URI[md5sum] = "e5d5b96924d791b22898b622eb3e918e" -SRC_URI[sha256sum] = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2" +SRC_URI[sha256sum] = "f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88" -SRC_URI += " \ - file://run-ptest \ + +SRC_URI = "git://github.com/python-excel/xlrd.git \ + file://run-ptest \ " +SRCREV = "b8d573e11ec149da695d695c81a156232b89a949" + +S = "${WORKDIR}/git" -inherit ptest pypi setuptools3 +inherit ptest setuptools3 RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" @@ -24,8 +27,6 @@ RDEPENDS_${PN}-ptest += " \ do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - install -d ${D}${PTEST_PATH}/examples - cp -rf ${S}/examples/* ${D}${PTEST_PATH}/examples/ } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.49.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.bb index 7fba21f7d..64a24ade3 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.49.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master \ " -SRCREV = "50c09e5c4c76757099d686c316b4bf42f72db71b" +SRCREV = "11980776c5ad757401ea1d12fd1f331d96428105" FILES_${PN} += "${datadir}/*" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.3.bb index d68ae9abf..fd7341953 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.3.bb @@ -16,8 +16,7 @@ HOMEPAGE = "http://pywbem.github.io" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SRC_URI[md5sum] = "6ade0cda6a997542d61f15713c2dd971" -SRC_URI[sha256sum] = "4e2baa4b4b88943cca32c7eb588fffff22ce86c748ba7544e01149f9638014fe" +SRC_URI[sha256sum] = "2abb6443f4debae56af7abefadb9fa5b8af9b53fc9bcf67f6c01a78db1064300" inherit pypi setuptools3 update-alternatives diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.1.bb index 03caec539..c5cabdb13 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.1.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" -SRC_URI[md5sum] = "e41ef654a0af0461d6c164752963fdfb" -SRC_URI[sha256sum] = "b869bb217613cdfee1e97e8afc28fe3f9bf3b88f8fc99e588d03c4be0922c319" +SRC_URI[sha256sum] = "3cbee091f0a4917394814d7e639ab9fe13ad0859e47288deabf2b09a4382c4ae" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.1.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.2.bb index 47bf1e221..a7e96851a 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.2.bb @@ -7,7 +7,7 @@ DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native" inherit xfce-app gsettings mime-xdg -SRC_URI[sha256sum] = "3d2e277b1ae82dd0f0fa25e27169491fc38c2b70a9a624f2ea472604b317a582" +SRC_URI[sha256sum] = "30adc5631a4e551df7b3e17ddc1d10e9980080f96518dedccc32170cb18efb8e" FILES_${PN} += " \ ${datadir}/glib-2.0/schemas \ diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.1.bb index 55941d74b..ebcdc2166 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.1.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7" +SRC_URI[sha256sum] = "615adf9abd91417a44319d8e4dadc6012fa22a3778f2f379717512dcb7ef924a" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb new file mode 100644 index 000000000..cd7212f65 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Notes plugin for the Xfce Panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +DEPENDS += "gtk+3 libxfce4ui xfce4-panel xfconf" + +SRC_URI[sha256sum] = "13f909c948b639f96de64cf793eb74cb1779589201d3933eff214ee8f35ab088" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.3.bb index 366597731..5c48101d1 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.3.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[sha256sum] = "a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515" +SRC_URI[sha256sum] = "39cc34c8a83381997c6faaacb6bf792339234303438a1fccd15c9a1770b87daf" RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index cd3fa26aa..7f1c17261 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -40,6 +40,7 @@ RRECOMMENDS_${PN} = " \ xfce4-mount-plugin \ xfce4-powermanager-plugin \ xfce4-closebutton-plugin \ + xfce4-notes-plugin \ xfce4-whiskermenu-plugin \ xfce4-mailwatch-plugin \ xfce4-smartbookmark-plugin \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb index 39198306b..4b5523895 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb @@ -8,6 +8,6 @@ inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "37b92aaaeeec8220ed23163cf89321168d3b49e0c48b4c10f12dc4a21fdf0954" +SRC_URI[sha256sum] = "bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec" FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.1.bb index 0b210ffcc..b92ebde00 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.1.bb @@ -8,7 +8,7 @@ inherit xfce gtk-doc gobject-introspection features_check remove-libtool mime-xd REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "5e979aeeb37d306d72858b1bc67448222ea7a68de01409055b846cd31f3cc53d" +SRC_URI[sha256sum] = "fa099bc6be6592dbb828747a473c2e1b0e7f85afd945a98002b475bb6f975991" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb index 36b5bc2d0..4f6bde2a9 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b0 ALTERNATIVE_${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" -ALTERNATIVE_PRIORITY_${PN} = "100" +ALTERNATIVE_PRIORITY_${PN} = "150" FILES_${PN} += " \ ${libdir}/xfce4/*/*/*.so \ |