diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
89 files changed, 1277 insertions, 247 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb index 9437b4523a..75cf215909 100644 --- a/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb @@ -7,7 +7,7 @@ BUGTRACKER = "https://github.com/spkr-beep/beep/issues" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https \ +SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https;branch=master \ file://0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch \ " SRCREV = "8b85ddd09f73b9fd7caa5679298781a57af194ac" diff --git a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.42.bb b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.43.bb index 04d4ca6e40..f473ccaf5a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.42.bb +++ b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.43.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitwise-v${PV}.tar.gz \ file://0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch \ " -SRC_URI[sha256sum] = "d3d43cef47bf8f49e85f7ed381c3eaf1df921ca51805e0962f1a97a517e1d1d2" +SRC_URI[sha256sum] = "f524f794188a10defc4df673d8cf0b3739f93e58e93aff0cdb8a99fbdcca2ffb" UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb index 92d6d9f186..4e2813dded 100644 --- a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb @@ -6,7 +6,7 @@ BUGTRACKER = "https://github.com/google/brotli/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b" -SRC_URI = "git://github.com/google/brotli.git \ +SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https \ file://838.patch " # tag 1.0.9 SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb index eeed39f633..85e5072716 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb @@ -4,7 +4,7 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=80ce98c6ab91cc4a93a9d2cfb7c14463" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=e13dd32663e3159031608d536530a080" require byacc.inc -SRC_URI[sha256sum] = "f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83" +SRC_URI[sha256sum] = "7bc42867a095df2189618b64497016298818e88e513fca792cb5adc9a68ebfb8" diff --git a/meta-openembedded/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb b/meta-openembedded/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb new file mode 100644 index 0000000000..39cdaea1a3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Terminal based 'The Matrix' screen implementation" +AUTHOR = "Abishek V Ashok" + +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "git://github.com/abishekvashok/cmatrix.git;branch=stable;protocol=https" +SRCREV = "adfdf1656f23e5ab3b52c7d7edf91249a4477e8d" +S = "${WORKDIR}/git" + +inherit cmake + +DEPENDS += "ncurses" + +FILES:${PN} += "${datadir}/* ${libdir}/kbd/*" diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 5c9ea129c0..464d25ad08 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" DEPENDS = "swig-native python3 sblim-cmpi-devel" -SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http \ +SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http;branch=master;protocol=https \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ file://cmpi-bindings-0.9.5-python-lib-dir.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index b443afdb18..1c613b0977 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -70,8 +70,8 @@ do_install:append() { # Fix configuration file to allow collectd to start up sed -i 's!^#FQDNLookup[ \t]*true!FQDNLookup false!g' ${D}${sysconfdir}/collectd.conf - rmdir "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + rmdir ${D}${localstatedir}/run ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} # Install systemd unit files install -d ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb index 6b906a21c3..e5a3c7c298 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "zlib gzip-native json-c" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ +SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ file://317.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb index 7a6b0bf95d..28db39ac20 100644 --- a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb @@ -18,7 +18,7 @@ SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196" PV = "0.6.3+git${SRCPV}" SRC_URI = "\ - git://github.com/docopt/docopt.cpp.git;protocol=https \ + git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.6.0.bb b/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.6.0.bb new file mode 100644 index 0000000000..95df28ef2b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.6.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Duktape embeddable Javascript engine" +DESCRIPTION = "Duktape is an embeddable Javascript engine, with a focus on portability and compact footprint." +HOMEPAGE = "https://duktape.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c83446610de1f63c7ca60cfcc82dec9d" + +SRC_URI = "https://duktape.org/duktape-${PV}.tar.xz \ + file://0001-Support-makefile-variables.patch \ +" +SRC_URI[md5sum] = "01ee8ecf3dd5c6504543c8679661bb20" +SRC_URI[sha256sum] = "96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7" + +do_compile () { + oe_runmake -f Makefile.sharedlibrary INSTALL_PREFIX="${prefix}" DESTDIR="${D}" +} + +do_install () { + oe_runmake -f Makefile.sharedlibrary INSTALL_PREFIX="${prefix}" DESTDIR="${D}" install + # libduktaped is identical to libduktape but has an hard-coded -g build flags, remove it + rm -f ${D}${libdir}/libduktaped.so* +} diff --git a/meta-openembedded/meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patch b/meta-openembedded/meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patch new file mode 100644 index 0000000000..f3fe40bc46 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patch @@ -0,0 +1,297 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luca Boccassi <luca.boccassi@microsoft.com> +Date: Mon, 17 Jan 2022 18:12:03 +0000 +Subject: [PATCH] Support makefile variables + +Makefile*: use CFLAGS/CPPFLAGS/LDFLAGS +Makefile*: allow compiler and install variables to be overridden +Makefile.sharedlibrary: allow destdir and libdir to be overridden +Makefile.sharedlibrary: generate pkg-config file + +Forwarded: https://github.com/svaarala/duktape/pull/2457 +--- + Makefile.cmdline | 5 ++-- + Makefile.codepage | 5 ++-- + Makefile.dukdebug | 5 ++-- + Makefile.eval | 5 ++-- + Makefile.eventloop | 5 ++-- + Makefile.hello | 5 ++-- + Makefile.jsoncbor | 5 ++-- + Makefile.jxpretty | 5 ++-- + Makefile.sandbox | 5 ++-- + Makefile.sharedlibrary | 48 ++++++++++++++++++++----------- + duktape.pc.in | 10 +++++++ + 11 files changed, 68 insertions(+), 35 deletions(-) + create mode 100644 duktape.pc.in + +diff --git a/Makefile.cmdline b/Makefile.cmdline +index 235566b8..0b020510 100644 +--- a/Makefile.cmdline ++++ b/Makefile.cmdline +@@ -8,7 +8,8 @@ DUKTAPE_SOURCES = src/duktape.c + CMDLINE_SOURCES = \ + examples/cmdline/duk_cmdline.c + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + CCOPTS = -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer + CCOPTS += -I./examples/cmdline -I./src # duktape.h and duk_config.h must be in include path + CCLIBS = -lm +@@ -40,7 +41,7 @@ CMDLINE_SOURCES += extras/module-duktape/duk_module_duktape.c + # http://wiki.duktape.org/Configuring.html + + duk: $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) +- $(CC) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) $(CCLIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) $(CCLIBS) + + linenoise/linenoise.c: linenoise + linenoise: +diff --git a/Makefile.codepage b/Makefile.codepage +index f6ef1582..29fa6ffc 100644 +--- a/Makefile.codepage ++++ b/Makefile.codepage +@@ -1,6 +1,7 @@ +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + codepage: +- $(CC) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ + src/duktape.c examples/codepage-conv/duk_codepage_conv.c \ + examples/codepage-conv/test.c -lm +diff --git a/Makefile.dukdebug b/Makefile.dukdebug +index 9fafcc3f..aa289d2e 100644 +--- a/Makefile.dukdebug ++++ b/Makefile.dukdebug +@@ -10,7 +10,8 @@ CMDLINE_SOURCES = \ + examples/cmdline/duk_cmdline.c \ + examples/debug-trans-socket/duk_trans_socket_unix.c + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + CCOPTS = -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer + CCOPTS += -I./prep -I./examples/cmdline -I./examples/debug-trans-socket + CCOPTS += -DDUK_CMDLINE_DEBUGGER_SUPPORT # enable --debugger in ./duk +@@ -38,4 +39,4 @@ duk: $(CMDLINE_SOURCES) + -DDUK_USE_INTERRUPT_COUNTER \ + -DDUK_USE_DEBUGGER_DUMPHEAP \ + -DDUK_USE_DEBUGGER_INSPECT +- $(CC) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) $(CCLIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) $(CMDLINE_SOURCES) $(CCLIBS) +diff --git a/Makefile.eval b/Makefile.eval +index 530f74a8..ce831a69 100644 +--- a/Makefile.eval ++++ b/Makefile.eval +@@ -2,8 +2,9 @@ + # Example Makefile for building the eval example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + eval: +- $(CC) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ + src/duktape.c examples/eval/eval.c -lm +diff --git a/Makefile.eventloop b/Makefile.eventloop +index 1a75587b..ab1b2f72 100644 +--- a/Makefile.eventloop ++++ b/Makefile.eventloop +@@ -2,14 +2,15 @@ + # Example Makefile for building the eventloop example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + evloop: + @echo "NOTE: The eventloop is an example intended to be used on Linux" + @echo " or other common UNIX variants. It is not fully portable." + @echo "" + +- $(CC) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc \ + examples/eventloop/main.c \ + examples/eventloop/c_eventloop.c \ + examples/eventloop/poll.c \ +diff --git a/Makefile.hello b/Makefile.hello +index c12b8e09..61269337 100644 +--- a/Makefile.hello ++++ b/Makefile.hello +@@ -13,7 +13,8 @@ DUKTAPE_SOURCES = src/duktape.c + # Compiler options are quite flexible. GCC versions have a significant impact + # on the size of -Os code, e.g. gcc-4.6 is much worse than gcc-4.5. + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + CCOPTS = -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer + CCOPTS += -I./src # for combined sources + CCLIBS = -lm +@@ -29,4 +30,4 @@ DEFINES = + # For debugging, use -O0 -g -ggdb, and don't add -fomit-frame-pointer + + hello: $(DUKTAPE_SOURCES) examples/hello/hello.c +- $(CC) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) examples/hello/hello.c $(CCLIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(DEFINES) $(CCOPTS) $(DUKTAPE_SOURCES) examples/hello/hello.c $(CCLIBS) +diff --git a/Makefile.jsoncbor b/Makefile.jsoncbor +index 30387a2f..8f234004 100644 +--- a/Makefile.jsoncbor ++++ b/Makefile.jsoncbor +@@ -2,9 +2,10 @@ + # Example Makefile for building the jsoncbor example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + jsoncbor: +- $(CC) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc -Iextras/cbor \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc -Iextras/cbor \ + src/duktape.c extras/cbor/duk_cbor.c extras/cbor/jsoncbor.c \ + -lm +diff --git a/Makefile.jxpretty b/Makefile.jxpretty +index 7ab00cec..aa53aa8b 100644 +--- a/Makefile.jxpretty ++++ b/Makefile.jxpretty +@@ -2,9 +2,10 @@ + # Example Makefile for building the jxpretty example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + jxpretty: +- $(CC) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -Wall -Wextra -O2 -Isrc \ + src/duktape.c examples/jxpretty/jxpretty.c \ + -lm +diff --git a/Makefile.sandbox b/Makefile.sandbox +index 26bb5ffc..d1d69ce4 100644 +--- a/Makefile.sandbox ++++ b/Makefile.sandbox +@@ -2,8 +2,9 @@ + # Example Makefile for building the sandbox example + # + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + sandbox: +- $(CC) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -std=c99 -O2 -Wall -Wextra -Isrc/ \ + src/duktape.c examples/sandbox/sandbox.c -lm +diff --git a/Makefile.sharedlibrary b/Makefile.sharedlibrary +index ace206a1..11620aa7 100644 +--- a/Makefile.sharedlibrary ++++ b/Makefile.sharedlibrary +@@ -24,7 +24,9 @@ + # convention is to set soname version to (100*MAJOR + MINOR), e.g. 104 for + # Duktape 1.4.x, so that it gets automatically bumped for major and minor + # releases (potentially binary incompatible), but not for patch releases. ++# The formatted version is used for the pkg-config file. + DUK_VERSION = 20600 ++DUK_VERSION_FORMATTED = 2.6.0 + SONAME_VERSION = 206 + REAL_VERSION = $(SONAME_VERSION).$(DUK_VERSION) + +@@ -45,44 +45,58 @@ else + endif + + # Change to actual path for actual distribution packaging. +-INSTALL_PREFIX = /usr/local ++INSTALL_PREFIX ?= /usr/local ++INSTALL_PREFIX := $(INSTALL_PREFIX) ++DESTDIR ?= ++DESTDIR := $(DESTDIR) ++LIBDIR ?= /lib ++LIBDIR := $(LIBDIR) + + # The 'noline' variant may be more appropriate for some distributions; it + # doesn't have #line directives in the combined source. + DUKTAPE_SRCDIR = ./src + #DUKTAPE_SRCDIR = ./src-noline + +-CC = gcc ++CC ?= gcc ++CC := $(CC) + + .PHONY: all +-all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) ++all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) duktape.pc + + # If the default duk_config.h is not suitable for the distribution, modify it + # before compiling the shared library and copy the same, edited duk_config.h + # to $INSTALL_PREFIX/include on installation. + + libduktape.$(SO_REALNAME_SUFFIX): +- $(CC) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \ + -o $@ $(DUKTAPE_SRCDIR)/duktape.c + + libduktaped.$(SO_REALNAME_SUFFIX): +- $(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \ + -o $@ $(DUKTAPE_SRCDIR)/duktape.c + ++duktape.pc: ++ sed -e "s|@PREFIX@|$(INSTALL_PREFIX)|" \ ++ -e "s|@LIBDIR@|$(LIBDIR)|" \ ++ -e "s|@VERSION@|$(DUK_VERSION_FORMATTED)|" \ ++ duktape.pc.in \ ++ > duktape.pc ++ + # Symlinks depend on platform conventions. + .PHONY: install +-install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) +- mkdir -p $(INSTALL_PREFIX)/lib/ +- cp $+ $(INSTALL_PREFIX)/lib/ +- rm -f $(INSTALL_PREFIX)/lib/libduktape.so $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX) +- ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.so +- ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX) +- rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX) +- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.so +- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX) +- mkdir -p $(INSTALL_PREFIX)/include/ +- cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(INSTALL_PREFIX)/include/ ++install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) duktape.pc ++ mkdir -p $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/pkgconfig ++ cp $+ $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/ ++ rm -f $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktape.so $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktape.$(SO_SONAME_SUFFIX) ++ ln -s libduktape.$(SO_REALNAME_SUFFIX) $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktape.so ++ ln -s libduktape.$(SO_REALNAME_SUFFIX) $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktape.$(SO_SONAME_SUFFIX) ++ rm -f $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktaped.so $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktaped.$(SO_SONAME_SUFFIX) ++ ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktaped.so ++ ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/libduktaped.$(SO_SONAME_SUFFIX) ++ mv $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/duktape.pc $(DESTDIR)$(INSTALL_PREFIX)$(LIBDIR)/pkgconfig/ ++ mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/include/ ++ cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(DESTDIR)$(INSTALL_PREFIX)/include/ + + CCOPTS = -I./examples/cmdline + duk: +- $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm ++ $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)$(LIBDIR) -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm +diff --git a/duktape.pc.in b/duktape.pc.in +new file mode 100644 +index 00000000..0985c67e +--- /dev/null ++++ b/duktape.pc.in +@@ -0,0 +1,10 @@ ++prefix=@PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}@LIBDIR@ ++includedir=${prefix}/include ++ ++Name: duktape ++Description: Embeddable Javascript engine ++Version: @VERSION@ ++Libs: -L${libdir} -lduktape ++Cflags: -I${includedir} diff --git a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb index d88775f9d9..310081b822 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" SRCREV = "89c1502b9d40b5cb4a844498b14d74ba1dd559bf" -SRC_URI = "git://github.com/Yelp/dumb-init" +SRC_URI = "git://github.com/Yelp/dumb-init;branch=master;protocol=https" S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'" diff --git a/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb b/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb index 4611646b9b..61b050aac6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.figlet.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1688bcd97b27704f1afcac7336409857" -SRC_URI = "git://github.com/cmatsuoka/figlet.git \ +SRC_URI = "git://github.com/cmatsuoka/figlet.git;branch=master;protocol=https \ file://0001-build-add-autotools-support-to-allow-easy-cross-comp.patch" SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.2.bb index 775125575d..5504515e98 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.2.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-target = " \ file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ " -SRC_URI[archive.sha256sum] = "6b690485567eaeb938c26936e5e0681cf70c856d273cc2c45fabf64d8bc6590e" +SRC_URI[archive.sha256sum] = "e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba" SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" # for building docs (they deserve it) we need *doc2* tools native diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb index 30e126db1d..ba436c2776 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # v1.9.14 SRCREV = "4da3080ad4587860e5da73072d6ed54d0052938c" -SRC_URI = "git://github.com/jirka-h/haveged.git \ +SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb index 7928df4485..658392374f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb @@ -6,7 +6,7 @@ DEPENDS = "ncurses" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://github.com/pixel/hexedit.git \ +SRC_URI = "git://github.com/pixel/hexedit.git;branch=master;protocol=https \ " SRCREV = "baf45a289360a39a05253949fb9d1b50e4668d8a" diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb index 93bda3372d..2ff4946883 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" DEPENDS = "redis" -SRC_URI = "git://github.com/redis/hiredis;protocol=git" +SRC_URI = "git://github.com/redis/hiredis;protocol=https;branch=master" SRCREV = "b731283245f3183af527237166261ad0768ba7d4" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.0.bb index 259187b0cd..e8e157658d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ " -SRC_URI[sha256sum] = "12b7cce67b95b09f34873f46948e7f1cef9edd88682139e054b79ba165c53e49" +SRC_URI[sha256sum] = "c76a8c9965a1edde4f2446b47ee17c8564e0e20f3d8474465f6d4c54d1125ac4" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb deleted file mode 100644 index d1b288cf2e..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Simple top-like I/O monitor" -DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \ - It watches I/O usage information output by the Linux kernel and displays \ - a table of current I/O usage by processes on the system." -HOMEPAGE = "http://guichaz.free.fr/iotop/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -PV .= "+git${SRCPV}" - -SRCREV = "1bfb3bc70febb1ffb95146b6dcd65257228099a3" -SRC_URI = "git://repo.or.cz/iotop.git" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "http://repo.or.cz/iotop.git/tags" -UPSTREAM_CHECK_REGEX = "iotop-(?P<pver>\d+(\.\d+)+)" - -inherit distutils3 - -do_install:append() { - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py || true -} - -RDEPENDS:${PN} = "python3-curses \ - python3-codecs python3-ctypes python3-pprint \ - python3-shell python3-core" diff --git a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.20.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.20.bb new file mode 100644 index 0000000000..b05c8cd35d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.20.bb @@ -0,0 +1,21 @@ +SUMMARY = "A top utility for I/O" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=48e7be78bd2671d08c9c3bad71f1cfaa" + +DEPENDS = "ncurses" + +SRC_URI = "https://github.com/Tomas-M/iotop/releases/download/v1.20/iotop-1.20.tar.xz" +SRC_URI[sha256sum] = "e0227dd4b71ce3ffe50225b85cf9abb38a99c1d2dff69e3f1db7d059d7490d51" +UPSTREAM_CHECK_URI = "https://github.com/Tomas-M/iotop/releases" + +inherit pkgconfig + +EXTRA_OEMAKE = "V=1 STRIP=true" + +# Workaround BFD linker crash with clang on arm +# revisit when upgrading binutils and see if its fixed +LDFLAGS:append:toolchain-clang:arm = " -fuse-ld=lld" + +do_install() { + oe_runmake install DESTDIR=${D} +} diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb index 0c8aaef7db..b0042b6586 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb @@ -7,7 +7,7 @@ RDEPENDS:${BPN} = "openssl curl" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master \ +SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master;protocol=https \ file://0001-tweak-install-prefix.patch \ file://0002-fix-parallel-error.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb index f2805a1b8d..caa13958dd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" PV = "2.3.6+git${SRCPV}" -SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http" +SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http;branch=master;protocol=https" SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index 99cf6ab08a..15a7965935 100644 --- a/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" DEPENDS:append:class-target = " swig-native sblim-cmpi-devel python3" DEPENDS:append:class-native = " cmpi-bindings-native" -SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \ +SRC_URI = "git://github.com/rnovacek/konkretcmpi.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \ file://0001-drop-including-rpath-cmake-module.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb index d930b43480..609e55f4ac 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=24b5b3feec63c4be0975e1fea5100440" DEPENDS += "libunwind" -SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https" +SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=master" PV = "1.0+git${SRCPV}" SRCREV = "4f57c999716847e45505b3df170150876b545088" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch new file mode 100644 index 0000000000..e608358bf7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch @@ -0,0 +1,100 @@ +From d10fb2c0ee60c97f4dfeab4506a347c26cb389df Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <vtrefny@redhat.com> +Date: Tue, 7 Dec 2021 15:50:45 +0800 +Subject: [PATCH] lvm: Do not include duplicate entries in bd_lvm_lvs output + +We use "-o segtypes" for the "lvs" command which means multisegment +LVs will be twice in the output. + +Signed-off-by: Vojtech Trefny <vtrefny@redhat.com> + +Upstream-Status: Backport [https://github.com/storaged-project/libblockdev/pull/671] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/plugins/lvm.c | 17 +++++++++++++++-- + tests/lvm_test.py | 41 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/lvm.c b/src/plugins/lvm.c +index 2be1dbd..acd5b84 100644 +--- a/src/plugins/lvm.c ++++ b/src/plugins/lvm.c +@@ -1810,8 +1810,21 @@ BDLVMLVdata** bd_lvm_lvs (const gchar *vg_name, GError **error) { + if (table && (num_items == 15)) { + /* valid line, try to parse and record it */ + lvdata = get_lv_data_from_table (table, TRUE); +- if (lvdata) +- g_ptr_array_add (lvs, lvdata); ++ if (lvdata) { ++ /* ignore duplicate entries in lvs output, these are caused by multi segments LVs */ ++ for (gsize i = 0; i < lvs->len; i++) { ++ if (g_strcmp0 (((BDLVMLVdata *) g_ptr_array_index (lvs, i))->lv_name, lvdata->lv_name) == 0) { ++ g_debug("Duplicate LV entry for '%s' found in lvs output", ++ lvdata->lv_name); ++ bd_lvm_lvdata_free (lvdata); ++ lvdata = NULL; ++ break; ++ } ++ } ++ ++ if (lvdata) ++ g_ptr_array_add (lvs, lvdata); ++ } + } else + if (table) + g_hash_table_destroy (table); +diff --git a/tests/lvm_test.py b/tests/lvm_test.py +index eb94c91..ab0de21 100644 +--- a/tests/lvm_test.py ++++ b/tests/lvm_test.py +@@ -915,6 +915,47 @@ class LvmTestLVs(LvmPVVGLVTestCase): + lvs = BlockDev.lvm_lvs("testVG") + self.assertEqual(len(lvs), 1) + ++class LvmTestLVsMultiSegment(LvmPVVGLVTestCase): ++ def _clean_up(self): ++ try: ++ BlockDev.lvm_lvremove("testVG", "testLV2", True, None) ++ except: ++ pass ++ ++ LvmPVVGLVTestCase._clean_up(self) ++ ++ def test_lvs(self): ++ """Verify that it's possible to gather info about LVs""" ++ ++ succ = BlockDev.lvm_pvcreate(self.loop_dev, 0, 0, None) ++ self.assertTrue(succ) ++ ++ succ = BlockDev.lvm_vgcreate("testVG", [self.loop_dev], 0, None) ++ self.assertTrue(succ) ++ ++ succ = BlockDev.lvm_lvcreate("testVG", "testLV", 10 * 1024**2) ++ self.assertTrue(succ) ++ ++ lvs = BlockDev.lvm_lvs("testVG") ++ self.assertEqual(len(lvs), 1) ++ self.assertListEqual([lv.lv_name for lv in lvs], ["testLV"]) ++ ++ # add second LV ++ succ = BlockDev.lvm_lvcreate("testVG", "testLV2", 10 * 1024**2) ++ self.assertTrue(succ) ++ ++ lvs = BlockDev.lvm_lvs("testVG") ++ self.assertEqual(len(lvs), 2) ++ self.assertListEqual([lv.lv_name for lv in lvs], ["testLV", "testLV2"]) ++ ++ # by resizing the first LV we will create two segments ++ succ = BlockDev.lvm_lvresize("testVG", "testLV", 20 * 1024**2, None) ++ self.assertTrue(succ) ++ ++ lvs = BlockDev.lvm_lvs("testVG") ++ self.assertEqual(len(lvs), 2) ++ self.assertListEqual([lv.lv_name for lv in lvs], ["testLV", "testLV2"]) ++ + class LvmPVVGthpoolTestCase(LvmPVVGTestCase): + def _clean_up(self): + try: +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb index 7325b26e35..b9c3bbb407 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb @@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection pkgconfig -SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \ + file://0001-lvm-Do-not-include-duplicate-entries-in-bd_lvm_lvs-o.patch \ +" SRCREV = "47ff12242c89e36a33259d18b7068b26c3bb1c64" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb index 1e20338827..eabe1d476a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb @@ -10,7 +10,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', ' DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9" -SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release \ +SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release;protocol=https \ file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \ file://0001-Enhance-reproducibility.patch \ file://0001-Remove-buggy-test-confusing-host-and-target.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index 116ecd84a8..7ca2a5f2c6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig PV = "0.7.0" SRCREV = "47cbed5355ffda7b952193a770a9a9fa9f89b25b" -SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https \ +SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb index 41147647bf..a7d2922dd3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb @@ -9,7 +9,7 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native python3targetconfig SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd" -SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb index f94c76797e..171e555863 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig gitpkgv PKGV = "${GITPKGVTAG}" SRCREV = "ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af" -SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb b/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb index 32d509b4ad..60aa07b8b2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=18;endline=21;md5=de4f705f12cdedb DEPENDS += "libbacktrace" -SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https \ +SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \ file://0001-respect-environment-variables.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb index 7fc5997983..bbfee1ff7a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit cmake pkgconfig -SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https \ +SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https;branch=master \ file://0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch \ " SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81" diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch deleted file mode 100644 index 384a4a40bd..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: =?utf-8?b?IlNaIExpbiAo5p6X5LiK5pm6KSI=?= <szlin@debian.org> -Date: Thu, 27 Sep 2018 14:51:32 +0800 -Subject: Fix typo - ---- - doc/modbus_mapping_new_start_address.txt | 4 ++-- - doc/modbus_reply.txt | 2 +- - doc/modbus_reply_exception.txt | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/doc/modbus_mapping_new_start_address.txt b/doc/modbus_mapping_new_start_address.txt -index 4fa196a..94a81fb 100644 ---- a/doc/modbus_mapping_new_start_address.txt -+++ b/doc/modbus_mapping_new_start_address.txt -@@ -21,9 +21,9 @@ The _modbus_mapping_new_start_address()_ function shall allocate four arrays to - store bits, input bits, registers and inputs registers. The pointers are stored - in modbus_mapping_t structure. All values of the arrays are initialized to zero. - --The different starting adresses make it possible to place the mapping at any -+The different starting addresses make it possible to place the mapping at any - address in each address space. This way, you can give access to values stored --at high adresses without allocating memory from the address zero, for eg. to -+at high addresses without allocating memory from the address zero, for eg. to - make available registers from 10000 to 10009, you can use: - - [source,c] -diff --git a/doc/modbus_reply.txt b/doc/modbus_reply.txt -index 0b29d6f..6b71d11 100644 ---- a/doc/modbus_reply.txt -+++ b/doc/modbus_reply.txt -@@ -3,7 +3,7 @@ modbus_reply(3) - - NAME - ---- --modbus_reply - send a reponse to the received request -+modbus_reply - send a response to the received request - - - SYNOPSIS -diff --git a/doc/modbus_reply_exception.txt b/doc/modbus_reply_exception.txt -index 7e6324f..b2170be 100644 ---- a/doc/modbus_reply_exception.txt -+++ b/doc/modbus_reply_exception.txt -@@ -3,7 +3,7 @@ modbus_reply_exception(3) - - NAME - ---- --modbus_reply_exception - send an exception reponse -+modbus_reply_exception - send an exception response - - - SYNOPSIS diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch deleted file mode 100644 index 7fae34e7d3..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d Mon Sep 17 00:00:00 2001 -From: i-ky <gl.ivanovsky@gmail.com> -Date: Tue, 10 Jul 2018 15:58:45 +0300 -Subject: [PATCH] Fixed MODBUS_GET_* macros in case of negative values - -In case resulting value should be negative it is incorrect to use '+' operator to construct it from pieces, because highest bytes will result in negative number after bitwise shift while others will stay positive. Replacing addition with '|' should solve the issue. ---- - src/modbus.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/modbus.h b/src/modbus.h -index f6e9a5f5..c63f5ceb 100644 ---- a/src/modbus.h -+++ b/src/modbus.h -@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req, - #define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF) - #define MODBUS_GET_LOW_BYTE(data) ((data) & 0xFF) - #define MODBUS_GET_INT64_FROM_INT16(tab_int16, index) \ -- (((int64_t)tab_int16[(index) ] << 48) + \ -- ((int64_t)tab_int16[(index) + 1] << 32) + \ -- ((int64_t)tab_int16[(index) + 2] << 16) + \ -+ (((int64_t)tab_int16[(index) ] << 48) | \ -+ ((int64_t)tab_int16[(index) + 1] << 32) | \ -+ ((int64_t)tab_int16[(index) + 2] << 16) | \ - (int64_t)tab_int16[(index) + 3]) --#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) + tab_int16[(index) + 1]) --#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) + tab_int8[(index) + 1]) -+#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) | tab_int16[(index) + 1]) -+#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) | tab_int8[(index) + 1]) - #define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value) \ - do { \ - tab_int8[(index)] = (value) >> 8; \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb deleted file mode 100644 index 8e42fdc5d2..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb +++ /dev/null @@ -1,12 +0,0 @@ -require libmodbus.inc - -SRC_URI += "file://f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch \ - file://Fix-float-endianness-issue-on-big-endian-arch.patch \ - file://Fix-typo.patch" -SRC_URI[md5sum] = "15c84c1f7fb49502b3efaaa668cfd25e" -SRC_URI[sha256sum] = "d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16" - -# this file has been created one minute after the configure file, so it doesn't get recreated during configure step -do_configure:prepend() { - rm -rf ${S}/tests/unit-test.h -} diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.7.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.7.bb new file mode 100644 index 0000000000..6c0e315d79 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.7.bb @@ -0,0 +1,9 @@ +require libmodbus.inc + +SRC_URI += "file://Fix-float-endianness-issue-on-big-endian-arch.patch" +SRC_URI[sha256sum] = "7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd" + +# this file has been created one minute after the configure file, so it doesn't get recreated during configure step +do_configure:prepend() { + rm -rf ${S}/tests/unit-test.h +} diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb index 7ff0725a20..ec427a9a73 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" DEPENDS = "cracklib virtual/gettext" -inherit autotools distutils3-base gettext +inherit autotools setuptools3-base gettext B = "${S}" diff --git a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.3.bb b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.4.bb index 18d6a4f27c..48a7d086b5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.4.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" inherit autotools pkgconfig -SRCREV = "404adbcd998ec83643e47d92b3ea8d9c3970e68b" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ +SRCREV = "a2691b96188033b5ad5c08871982048ae1f4f4e8" +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=main;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index 7741305f01..631860a903 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -11,7 +11,7 @@ DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://github.com/abrt/libreport.git;protocol=https" +SRC_URI = "git://github.com/abrt/libreport.git;protocol=https;branch=master" SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ file://0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch \ file://0003-without-build-plugins.patch \ 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 deleted file mode 100644 index 46493bb9e7..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch +++ /dev/null @@ -1,33 +0,0 @@ -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.1.bb index 3f15a259bf..61f159c574 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb @@ -9,11 +9,9 @@ DEPENDS = "ncurses" 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 = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92_1/libstatgrab-${PV}.tar.gz \ " -SRC_URI[md5sum] = "5362b2ddbec54b3901e7d70c22cda249" -SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" +SRC_URI[sha256sum] = "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb index 781e7aab71..c93c8b0be3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "git://git.code.sf.net/p/libuio/code \ +SRC_URI = "git://git.code.sf.net/p/libuio/code;branch=master \ file://replace_inline_with_static-inline.patch \ file://0001-include-fcntl.h-for-O_RDWR-define.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb index 6c675c4067..2f5e4615f2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" SRCREV = "69d9fff65abb58beb0bb6aa9ecacd572ca1dfc56" -SRC_URI = "git://github.com/CESNET/libyang.git \ +SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ file://libyang-skip-pcre2-config-add-stdint-h.patch \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb index e8c6864c1f..cc31323c3f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb @@ -9,7 +9,7 @@ PV = "4.4+git${SRCPV}" SRCREV = "877613493ff44807888ce1928129574be393cbb0" -SRC_URI = "git://github.com/jessek/hashdeep.git \ +SRC_URI = "git://github.com/jessek/hashdeep.git;branch=master;protocol=https \ file://wrong-variable-expansion.patch \ file://0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch \ " 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 596ec0b43c..671d320195 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 @@ -11,7 +11,7 @@ DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2 nettle lz4" RDEPENDS:${PN} = "python3-core" SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" -SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ +SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=https \ https://curl.haxx.se/download/curl-7.64.0.tar.bz2;name=curl;subdir=git/thirdparty \ https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz;name=libressl;subdir=git/thirdparty \ ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=git/thirdparty \ diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch new file mode 100644 index 0000000000..e09848f403 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch @@ -0,0 +1,29 @@ +From 9e37248870b2b955293754933c789ca00bca06ef Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 1 Oct 2021 13:00:24 +0200 +Subject: [PATCH] Cargo.toml: do not abort on panic + +OE's rust is configured to unwind, and this setting clashes with it/ + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + Cargo.toml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -51,13 +51,11 @@ opt-level = 1 + rpath = false + lto = false + debug-assertions = true +-panic = "abort" + + [profile.release] + opt-level = 2 + rpath = false + debug-assertions = false +-panic = "abort" + + # Optimize build dependencies, because bindgen and proc macros / style + # compilation take more to run than to build otherwise. diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch new file mode 100644 index 0000000000..a2ccf6b916 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch @@ -0,0 +1,28 @@ +From e5b95b3918588e2930c9af7ba304c57e871b2d55 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Thu, 7 Oct 2021 12:44:18 +0200 +Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize' + names + +The outcome is that processed names no longer match our custom rust +target definitions, and the build fails. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + build/moz.configure/init.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 3a164c6558..99dfc9054a 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -823,7 +823,7 @@ def help_host_target(help, host, target): + + def config_sub(shell, triplet): + config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") +- return check_cmd_output(shell, config_sub, triplet).strip() ++ return triplet + + + @depends("--host", shell) diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch new file mode 100644 index 0000000000..7b938179c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch @@ -0,0 +1,56 @@ +From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 18 Nov 2021 07:16:39 +0000 +Subject: [PATCH] Rewrite cargo-host-linker in python3 + +Mozjs compile failed with this failure: +/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5) + +Root Cause: +cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd +with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links +libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But +host libc is older libc. So the incompatible problem occurred. + +Solution: +rewrite cargo-host-linker in python3 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + build/cargo-host-linker | 24 +++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/build/cargo-host-linker b/build/cargo-host-linker +index cbd0472bf7..ccd8bffec1 100755 +--- a/build/cargo-host-linker ++++ b/build/cargo-host-linker +@@ -1,3 +1,21 @@ +-#!/bin/sh +-# See comment in cargo-linker. +-eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"' ++#!/usr/bin/env python3 ++ ++import os,sys ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip(): ++ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0] ++else: ++ sys.exit(0) ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip(): ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++else: ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] ++ ++os.execvp(binary, args) +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch new file mode 100644 index 0000000000..5472eddbbb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch @@ -0,0 +1,50 @@ +From b13cad4abc53f816f64c8b0af70cb46820746c72 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 11 Nov 2021 16:05:54 +0800 +Subject: [PATCH] util.configure: fix one occasionally reproduced configure + failure + +error: +| checking whether the C++ compiler supports -Wno-range-loop-analysis... +| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: +| DEBUG: | int +| DEBUG: | main(void) +| DEBUG: | { +| DEBUG: | +| DEBUG: | ; +| DEBUG: | return 0; +| DEBUG: | } +| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c +| DEBUG: The command returned non-zero exit status 1. +| DEBUG: Its error output was: +... +| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler +| os.remove(path) +| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' + +It should be another process that deleted this file by using +"rm -rf conftest*" inappropriately + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + build/moz.configure/util.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure +index 8f35e89c73..84e256647d 100644 +--- a/build/moz.configure/util.configure ++++ b/build/moz.configure/util.configure +@@ -222,7 +222,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): + "C++": ".cpp", + }[language] + +- fd, path = mkstemp(prefix="conftest.", suffix=suffix, text=True) ++ fd, path = mkstemp(prefix="try_invoke_compiler_conftest.", suffix=suffix, text=True) + try: + source = source.encode("ascii", "replace") + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch new file mode 100644 index 0000000000..6ff83e3bb2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch @@ -0,0 +1,43 @@ +From 0133ddb86eb6e0741e02b0032c41468db6438530 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 1 Oct 2021 13:01:10 +0200 +Subject: [PATCH] moz.configure: do not look for llvm-objdump + +This avoid dragging in a dependency that isn't even needed +for js builds. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + moz.configure | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/moz.configure b/moz.configure +index fc66b520d0..15de9a2ee0 100755 +--- a/moz.configure ++++ b/moz.configure +@@ -994,15 +994,15 @@ def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths): + return (llvm_objdump,) + + +-llvm_objdump = check_prog( +- "LLVM_OBJDUMP", +- llvm_objdump, +- what="llvm-objdump", +- when="--enable-compile-environment", +- paths=clang_search_path, +-) +- +-add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) ++#llvm_objdump = check_prog( ++# "LLVM_OBJDUMP", ++# llvm_objdump, ++# what="llvm-objdump", ++# when="--enable-compile-environment", ++# paths=clang_search_path, ++#) ++ ++#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) + + + option("--enable-dtrace", help="Build with dtrace support") diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch new file mode 100644 index 0000000000..c440bf178f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch @@ -0,0 +1,65 @@ +From 749ba11fd6a69c8180945d4866415d16ae06a9c0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 1 Oct 2021 13:02:17 +0200 +Subject: [PATCH] rust.configure: do not try to find a suitable upstream target + +OE is using custom targets and so this is bound to fail. + +Upstream-Status: Inapppropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + build/moz.configure/rust.configure | 34 ++---------------------------- + 1 file changed, 2 insertions(+), 32 deletions(-) + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index cd77d72bb7..4b6481cbe3 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -459,33 +459,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): + def rust_host_triple( + rustc, host, compiler_info, rustc_host, rust_supported_targets, arm_target + ): +- rustc_target = detect_rustc_target( +- host, compiler_info, arm_target, rust_supported_targets +- ) +- if rustc_target != rustc_host: +- if host.alias == rustc_target: +- configure_host = host.alias +- else: +- configure_host = "{}/{}".format(host.alias, rustc_target) +- die( +- dedent( +- """\ +- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}). +- +- You can solve this by: +- * Set your configure host to match the rust compiler host by editing your +- mozconfig and adding "ac_add_options --host={rustc}". +- * Or, install the rust toolchain for {configure}, if supported, by running +- "rustup default stable-{rustc_target}" +- """.format( +- rustc=rustc_host, +- configure=configure_host, +- rustc_target=rustc_target, +- ) +- ) +- ) +- assert_rust_compile(host, rustc_target, rustc) +- return rustc_target ++ return rustc_host + + + @depends( +@@ -495,11 +469,7 @@ def rust_host_triple( + def rust_target_triple( + rustc, target, compiler_info, rust_supported_targets, arm_target + ): +- rustc_target = detect_rustc_target( +- target, compiler_info, arm_target, rust_supported_targets +- ) +- assert_rust_compile(target, rustc_target, rustc) +- return rustc_target ++ return target.alias + + + set_config("RUST_TARGET", rust_target_triple) diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..b56f0b95b5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch @@ -0,0 +1,35 @@ +From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <amccurdy@gmail.com> +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use <asm/sgidefs.h> + +Build fix for MIPS with musl libc + +The MIPS specific header <sgidefs.h> is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide +<asm/sgidefs.h> which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mfbt/RandomNum.cpp ++++ b/mfbt/RandomNum.cpp +@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PV + # elif defined(__s390__) + # define GETRANDOM_NR 349 + # elif defined(__mips__) +-# include <sgidefs.h> ++# include <asm/sgidefs.h> + # if _MIPS_SIM == _MIPS_SIM_ABI32 + # define GETRANDOM_NR 4353 + # elif _MIPS_SIM == _MIPS_SIM_ABI64 diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch new file mode 100644 index 0000000000..f308b4863f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch @@ -0,0 +1,21 @@ +Fix build when JIT is disabled on 32bit systems + +This fixes a compile time assert +js/src/wasm/WasmFrame.cpp:57:3: error: static_assert failed due to requirement '(__builtin_offsetof(js::wasm::DebugFrame, frame_) + sizeof(js::wasm::Frame)) % Alignment == 0' "Aligned after pushing DebugFrame" + static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/js/src/wasm/WasmFrame.h ++++ b/js/src/wasm/WasmFrame.h +@@ -230,6 +230,8 @@ class DebugFrame { + // Avoid -Wunused-private-field warnings. + protected: + #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ ++ (defined(JS_CODEGEN_NONE) && \ ++ (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ + defined(JS_CODEGEN_X86) || defined(__wasi__) + // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only + // 4-byte aligned, so we add another word to get up to 8-byte diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch new file mode 100644 index 0000000000..80bf746e40 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch @@ -0,0 +1,36 @@ +From 0e0548e3f95e22a39db8d5b934afe0672a3f801b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 1 Nov 2021 08:13:29 +0100 +Subject: [PATCH] Fix build on powerpc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Another fix for (this time JIT enabled) +| <...>/irefox-91.2.0/js/src/wasm/WasmFrame.cpp:57:76: error: static assertion failed: Aligned after pushing DebugFrame +| 57 | static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, +| | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + js/src/wasm/WasmFrame.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h +index 893762e..2d90656 100644 +--- a/js/src/wasm/WasmFrame.h ++++ b/js/src/wasm/WasmFrame.h +@@ -232,7 +232,7 @@ class DebugFrame { + #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ + (defined(JS_CODEGEN_NONE) && \ + (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ +- defined(JS_CODEGEN_X86) || defined(__wasi__) ++ defined(JS_CODEGEN_X86) || defined(__wasi__) || defined(__powerpc__) + // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only + // 4-byte aligned, so we add another word to get up to 8-byte + // alignment. +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch new file mode 100644 index 0000000000..c0834af589 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/fix-musl-build.patch @@ -0,0 +1,15 @@ +Upstream: No +Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: +https://github.com/void-linux/void-packages/issues/2598 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1072,6 +1072,9 @@ if test "$ac_cv_thread_keyword" = yes; t + *-android*|*-linuxandroid*) + : + ;; ++ *-musl*) ++ : ++ ;; + *) + AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) + ;; diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/riscv32.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/riscv32.patch new file mode 100644 index 0000000000..fe9c332a00 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91/riscv32.patch @@ -0,0 +1,45 @@ +Add RISCV32 support + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -765,6 +765,9 @@ def split_triplet(triplet, allow_msvc=Fa + elif cpu.startswith("aarch64"): + canonical_cpu = "aarch64" + endianness = "little" ++ elif cpu in ("riscv32", "riscv32gc"): ++ canonical_cpu = "riscv32" ++ endianness = "little" + elif cpu in ("riscv64", "riscv64gc"): + canonical_cpu = "riscv64" + endianness = "little" +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -52,6 +52,7 @@ CPU_bitness = { + "mips64": 64, + "ppc": 32, + "ppc64": 64, ++ 'riscv32': 32, + "riscv64": 64, + "s390": 32, + "s390x": 64, +@@ -94,6 +95,7 @@ CPU_preprocessor_checks = OrderedDict( + ("m68k", "__m68k__"), + ("mips64", "__mips64"), + ("mips32", "__mips__"), ++ ("riscv32", "__riscv && __riscv_xlen == 32"), + ("riscv64", "__riscv && __riscv_xlen == 64"), + ("sh4", "__sh__"), + ("wasm32", "__wasm32__"), +--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +@@ -1186,6 +1186,7 @@ class LinuxCrossCompileToolchainTest(Bas + "m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1}, + "mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1}, + "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, ++ "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32}, + "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64}, + "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1}, + } diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb new file mode 100644 index 0000000000..dd02ed94cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb @@ -0,0 +1,74 @@ +SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" + +SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ + file://0001-Cargo.toml-do-not-abort-on-panic.patch \ + file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ + file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ + file://0004-use-asm-sgidefs.h.patch \ + file://fix-musl-build.patch \ + file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ + file://riscv32.patch \ + file://0005-nojit-32bit-arch-fix.patch \ + file://0006-Fix-build-on-powerpc.patch \ + file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ + file://0001-rewrite-cargo-host-linker-in-python3.patch \ + " +SRC_URI[sha256sum] = "e722829db490f9332712a81c35996541737bbfb05232d47190fee779c4fcb327" + +S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" + +inherit pkgconfig perlnative python3native rust + +DEPENDS += "zlib cargo-native python3" + +B = "${WORKDIR}/build" + +export PYTHONPATH = "${S}/build:${S}/third_party/python/PyYAML/lib3:${S}/testing/mozbase/mozfile:${S}/python/mozboot:${S}/third_party/python/distro:${S}/testing/mozbase/mozinfo:${S}/config:${S}/testing/mozbase/manifestparser:${S}/third_party/python/pytoml:${S}/testing/mozbase/mozprocess:${S}/third_party/python/six:${S}/python/mozbuild:${S}/python/mozbuild/mozbuild:${S}/python/mach:${S}/third_party/python/jsmin:${S}/python/mozversioncontrol" + +export HOST_CC = "${BUILD_CC}" +export HOST_CXX = "${BUILD_CXX}" +export HOST_CFLAGS = "${BUILD_CFLAGS}" +export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}" +export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" + +export AS = "${CC}" + +export RUSTFLAGS + +JIT ?= "" + +JIT:mipsarch = "--disable-jit" + +do_configure() { + cd ${B} + python3 ${S}/configure.py \ + --enable-project=js \ + --target=${HOST_SYS} \ + --host=${BUILD_SYS} \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --disable-jemalloc \ + ${JIT} + +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +inherit multilib_script multilib_header + +MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js91-config" + +do_install:append() { + oe_multilib_header mozjs-91/js-config.h + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/js91-config + rm -f ${D}${libdir}/libjs_static.ajs +} + +PACKAGES =+ "lib${BPN}" +FILES:lib${BPN} += "${libdir}/lib*" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index dcfbabc8a8..2a50550a0e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1" PV = "2.2.0+git${SRCPV}" -SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ file://0001-include-Declare-gVERSION-global-as-extern.patch \ " @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" # CMakeLists.txt checks the architecture, only x86 and ARM supported for now COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" -inherit cmake distutils3-base +inherit cmake setuptools3-base DEPENDS += "json-c" diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb index 23db7c679b..af0a3c2bd2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -17,7 +17,7 @@ REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" -SRC_URI = "git://github.com/Openwsman/openwsman.git \ +SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=master;protocol=https \ file://libssl-is-required-if-eventint-supported.patch \ file://openwsmand.service \ file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.5.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.6.bb index 08cfb136e5..d2d5dc0aa0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.6.bb @@ -17,15 +17,11 @@ DEPENDS = " \ bison-native \ " -# The Yocto mirror has an old export of ostree: -# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz -PREMIRRORS = "" - SRC_URI = " \ - gitsm://github.com/ostreedev/ostree;branch=main \ + gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "63bf5e606b24c7343bfe622bf6af2110ee6beabc" +SRCREV = "f1155c8d283c3c85d74d5e1050b0dcf8198f750a" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" @@ -33,6 +29,14 @@ S = "${WORKDIR}/git" inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd +# Workaround compile failure: +# |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] +# so remove -Og and use -O2 as workaround +DEBUG_OPTIMIZATION:remove = "-Og" +DEBUG_OPTIMIZATION:append = " -O2" +BUILD_OPTIMIZATION:remove = "-Og" +BUILD_OPTIMIZATION:append = " -O2" + # Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems PACKAGECONFIG ??= " \ @@ -52,6 +56,13 @@ PACKAGECONFIG:class-native ??= " \ soup \ " +PACKAGECONFIG:class-nativesdk ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + builtin-grub2-mkconfig \ + gpgme \ + soup \ +" + PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" @@ -89,6 +100,11 @@ EXTRA_OECONF:class-native = " \ --disable-otmpfile \ " +EXTRA_OECONF:class-nativesdk = " \ + --enable-wrpseudo-compat \ + --disable-otmpfile \ +" + # Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the # do_configure stage so we do depend on it SYSROOT_DIR = "${STAGING_DIR_TARGET}" @@ -106,6 +122,10 @@ do_install:append:class-native() { create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" } +do_install:append:class-nativesdk() { + create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="\$OECORE_NATIVE_SYSROOT/usr/lib/ostree/ostree-grub-generator" +} + PACKAGE_BEFORE_PN = " \ ${PN}-dracut \ ${PN}-grub \ @@ -186,4 +206,4 @@ RRECOMMENDS:${PN} += "kernel-module-overlay" SYSTEMD_SERVICE:${PN} = "ostree-remount.service ostree-finalize-staged.path" SYSTEMD_SERVICE:${PN}-switchroot = "ostree-prepare-root.service" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb index b18e52ff41..eca7d874bf 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" PV = "2.1.0.1" -SRC_URI = "git://github.com/Pulse-Eight/platform.git \ +SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https \ file://0001-Make-resulting-cmake-config-relocatable.patch" SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index f98c4a7be8..dc7b84986f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "e2145df09469bf84878e4729b4ecd814efb797d1" -SRC_URI = "git://github.com/PADL/pam_ccreds" +SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index 53745394a8..6985590068 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -11,7 +11,7 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" -SRC_URI = "git://github.com/rmbreak/pam_ldapdb \ +SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https \ file://0001-include-stdexcept-for-std-invalid_argument.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb index e456603c1c..4354c83371 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb @@ -11,7 +11,7 @@ DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.11" +SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.11;protocol=https" SRCREV = "5b21904a257eff47f2e87fcbf2de46111f03ddd8" inherit autotools-brokensep pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb index a41b0fecad..d76361732a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4" -DEPENDS = "expat glib-2.0 intltool-native mozjs" +DEPENDS = "expat glib-2.0 intltool-native mozjs-91" inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection features_check diff --git a/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb index 450bbb918f..d7e59e9637 100644 --- a/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" PV = "0.0.1+git${SRCPV}" SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77" -SRC_URI = "git://github.com/lib-cpp/${BPN}.git" +SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb index 2a6bb57ed7..c135105f90 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb @@ -4,8 +4,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/sewenew/redis-plus-plus" -SRCREV = "e29c63db54653a660d7a0f556f670b7a6fce0a78" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" +SRCREV = "389ffdf9e72035ea2096b03cda7f4a6809ae6363" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb index e96138ea83..bb72316cf8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb @@ -10,7 +10,7 @@ SRCREV = "56a83f4f52e6745cd4352f9ee008be3183a6dedf" PV = "1.7.2" SRC_URI = "\ - git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http; \ + git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http;;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb index 88ba9edaa1..24ad172674 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f" DEPENDS = "" -SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https" +SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https;branch=master" SRCREV = "0293afb3913f760c449348551cca4d2df59c1a00" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch new file mode 100644 index 0000000000..bc2c68c1c5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/setuptools.patch @@ -0,0 +1,18 @@ +Switch to setuptools as distutils is deprecated. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/python/setup.py b/python/setup.py +index b3bfaf1..dfbaf21 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -4,7 +4,7 @@ + # modify, copy, or redistribute it subject to the terms and conditions + # of the GNU General Public License v.2. + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + + sanlocklib = ['sanlock'] + sanlock = Extension(name='sanlock', diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb index fa08d0f98e..3c08c4e003 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb @@ -9,31 +9,32 @@ HOMEPAGE = "https://pagure.io/sanlock" SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://../README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" +LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" 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=../ \ +SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ + file://setuptools.patch \ " SRCREV = "a181e951376d49a82eef17920c8ebedec80b4823" -S = "${WORKDIR}/git/python" +S = "${WORKDIR}/git" DEPENDS = "libaio util-linux" -inherit distutils3 useradd +inherit setuptools3 useradd -do_configure[noexec] = "1" +SETUPTOOLS_SETUP_PATH = "${S}/python" do_compile:prepend () { - oe_runmake -C ${S}/../wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" - oe_runmake -C ${S}/../src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" + oe_runmake -C ${S}/wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" + oe_runmake -C ${S}/src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" } do_install:prepend () { - oe_runmake -C ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install - oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install + oe_runmake -C ${S}/wdmd DESTDIR=${D} LIBDIR=${libdir} install + oe_runmake -C ${S}/src DESTDIR=${D} LIBDIR=${libdir} install } SANLOCKGROUP ?= "sanlock" diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb index 99e358648f..e4323ec83c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae5 BASEPV = "1.15.1" PV = "1.20.0" SRCREV = "d3de8e45e06a21d31cca0046ceb16ced1ef3563a" -SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git \ +SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;protocol=https \ file://0001-Fix-build-on-big-endian-architectures.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb index 5c786d8913..252ba9f3dc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb @@ -10,7 +10,7 @@ compression ratio." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https \ +SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=master \ file://0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch \ " SRCREV = "2b63814b15a2aaae54b7943f0cd935892fae628f" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index eed79ae7fe..0e53cfa8d0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" SRCREV = "beb4650660179963a8ed5b5cbf2085cc1b34f608" PV = "1.0+git${SRCPV}" -SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" +SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 1a2d330904..45978bb2c5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61 DEPENDS = "libsocketcan" -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master" SRCREV = "3615bac17e539a06835dcb90855eae844ee18053" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb index 65e1fde0bf..59114b0278 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libsocketcan" SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d" -SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git \ +SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;branch=master \ file://0001-canutils-candump-Add-error-frame-s-handling.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb index b7a7f6f471..27380ee19d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38ad SRCREV = "077def398ad303043d73339112968e5112d8d7c8" -SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git" +SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch new file mode 100644 index 0000000000..055b0c1c29 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch @@ -0,0 +1,155 @@ +From a5c8e2676b94d2ea41b44b4e05943bee6459f337 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 09:46:35 -0700 +Subject: [PATCH] libsinsp: Fix a lot of -Werror=format-security errors with + mvprintw/mvwprintw + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + userspace/libsinsp/cursescomponents.cpp | 4 ++-- + userspace/libsinsp/cursesspectro.cpp | 2 +- + userspace/libsinsp/cursestable.cpp | 6 +++--- + userspace/libsinsp/cursesui.cpp | 14 +++++++------- + 4 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/userspace/libsinsp/cursescomponents.cpp b/userspace/libsinsp/cursescomponents.cpp +index 4003cb4e..372b4526 100644 +--- a/userspace/libsinsp/cursescomponents.cpp ++++ b/userspace/libsinsp/cursescomponents.cpp +@@ -877,7 +877,7 @@ void curses_textbox::print_no_data() + string wstr = "No Data For This Selection"; + mvprintw(m_parent->m_screenh / 2, + m_parent->m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + refresh(); + } +@@ -1100,7 +1100,7 @@ void curses_textbox::render() + attrset(m_parent->m_colors[sinsp_cursesui::LARGE_NUMBER]); + mvprintw(0, + m_parent->m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + } + + // +diff --git a/userspace/libsinsp/cursesspectro.cpp b/userspace/libsinsp/cursesspectro.cpp +index 6858bc95..32012963 100644 +--- a/userspace/libsinsp/cursesspectro.cpp ++++ b/userspace/libsinsp/cursesspectro.cpp +@@ -227,7 +227,7 @@ void curses_spectro::print_error(string wstr) + mvwprintw(m_tblwin, + m_parent->m_screenh / 2, + m_parent->m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + } + + void curses_spectro::update_data(vector<sinsp_sample_row>* data, bool force_selection_change) +diff --git a/userspace/libsinsp/cursestable.cpp b/userspace/libsinsp/cursestable.cpp +index 69c2aa32..54667554 100644 +--- a/userspace/libsinsp/cursestable.cpp ++++ b/userspace/libsinsp/cursestable.cpp +@@ -254,7 +254,7 @@ void curses_table::print_line_centered(string line, int32_t off) + mvwprintw(m_tblwin, + m_parent->m_screenh / 2 + off, + m_parent->m_screenw / 2 - line.size() / 2, +- line.c_str()); ++ "%s", line.c_str()); + } + else + { +@@ -268,7 +268,7 @@ glogf("2, %d %s\n", spos, ss.c_str()); + mvwprintw(m_tblwin, + m_parent->m_screenh / 2 + off + j, + 0, +- ss.c_str()); ++ "%s", ss.c_str()); + + spos += m_parent->m_screenw; + if(spos >= line.size()) +@@ -328,7 +328,7 @@ void curses_table::print_error(string wstr) + mvwprintw(m_tblwin, + m_parent->m_screenh / 2, + m_parent->m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + } + + void curses_table::render(bool data_changed) +diff --git a/userspace/libsinsp/cursesui.cpp b/userspace/libsinsp/cursesui.cpp +index 1eeb0864..69652edc 100644 +--- a/userspace/libsinsp/cursesui.cpp ++++ b/userspace/libsinsp/cursesui.cpp +@@ -825,7 +825,7 @@ void sinsp_cursesui::render_header() + attrset(m_colors[sinsp_cursesui::LARGE_NUMBER]); + mvprintw(0, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + } + + // +@@ -1123,7 +1123,7 @@ void sinsp_cursesui::render_filtersearch_main_menu() + + m_cursor_pos = cursor_pos; + +- mvprintw(m_screenh - 1, m_cursor_pos, str->c_str()); ++ mvprintw(m_screenh - 1, m_cursor_pos, "%s", str->c_str()); + + m_cursor_pos += str->size(); + } +@@ -2189,7 +2189,7 @@ void sinsp_cursesui::print_progress(double progress) + string wstr = "Processing File"; + mvprintw(m_screenh / 2, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + // + // Using sprintf because to_string doesn't support setting the precision +@@ -2199,7 +2199,7 @@ void sinsp_cursesui::print_progress(double progress) + wstr = "Progress: " + string(numbuf); + mvprintw(m_screenh / 2 + 1, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + refresh(); + } +@@ -2308,7 +2308,7 @@ sysdig_table_action sinsp_cursesui::handle_textbox_input(int ch) + attrset(m_colors[sinsp_cursesui::FAILED_SEARCH]); + mvprintw(m_screenh / 2, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + // + // Restore the cursor +@@ -2363,7 +2363,7 @@ sysdig_table_action sinsp_cursesui::handle_textbox_input(int ch) + + mvprintw(m_screenh / 2, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + render(); + } +@@ -2436,7 +2436,7 @@ sysdig_table_action sinsp_cursesui::handle_textbox_input(int ch) + + mvprintw(m_screenh / 2, + m_screenw / 2 - wstr.size() / 2, +- wstr.c_str()); ++ "%s", wstr.c_str()); + + render(); + } +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb index a12f8ba5e1..340a124965 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -21,9 +21,10 @@ JIT:powerpc64 = "" DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS:${PN} = "bash" -SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ +SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https \ file://0001-fix-build-with-LuaJIT-2.1-betas.patch \ file://aarch64.patch \ + file://0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch \ " SRCREV = "67833b2aca06bd9d11cff7cb29f04fbf4ef96cad" PV = "0.27.1" diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index e2e6de6b5f..271fe7a284 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Transparent Inter-Process Communication protocol" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1b466cce98" -SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ +SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils;branch=master \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch new file mode 100644 index 0000000000..6d5e293c7f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch @@ -0,0 +1,31 @@ +From 42e99eb6c727df7c9d49586803a4bf9933a9796b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 10:52:42 -0700 +Subject: [PATCH] Fix a lot of -Werror=format-security errors with mvwprintw + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/helpwin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/helpwin.c b/src/helpwin.c +index 0d660f9..1623d9c 100644 +--- a/src/helpwin.c ++++ b/src/helpwin.c +@@ -61,7 +61,7 @@ void show_help_win(WINDOW* win, screen_t* screen) + wattroff(win, A_REVERSE); + + /* screen description */ +- mvwprintw(win, 2, 1, screen->desc); ++ mvwprintw(win, 2, 1, "%s", screen->desc); + + /* max size of column headers */ + for(i = 0; i < n; i++) { +-- +2.33.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb index 31d0dae25c..13aa92e116 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb @@ -1,17 +1,19 @@ SUMMARY = "Hardware performance monitoring counters" -HOMEPAGE = "http://tiptop.gforge.inria.fr/" +HOMEPAGE = "https://team.inria.fr/pacap/software/tiptop/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses libxml2 bison-native flex-native" -SRC_URI = "http://tiptop.gforge.inria.fr/releases/${BP}.tar.gz \ +SRC_URI = "http://files.inria.fr/pacap/${BPN}/${BP}.tar.gz \ file://0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch \ file://0002-fix-reproducibility-of-build-process.patch \ file://0001-Fix-build-when-S-B.patch \ + file://0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch \ " -SRC_URI[md5sum] = "46ca0fdf0236f02dd2b96d347626d2a2" SRC_URI[sha256sum] = "51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182" +UPSTREAM_CHECK_URI = "https://team.inria.fr/pacap/software/tiptop/" + inherit autotools EXTRA_OECONF = "CFLAGS="$CFLAGS -I${STAGING_INCDIR}/libxml2"" diff --git a/meta-openembedded/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb index 7ae8c51508..6dc5c0c7e5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f7d9aab84ec6567139a4755c48d147fb" DEPENDS:append = " libevent libssh msgpack-c ncurses" SRC_URI = "\ - git://github.com/tmate-io/tmate.git;protocol=https \ + git://github.com/tmate-io/tmate.git;protocol=https;branch=master \ " SRCREV = "5e00bfa5e137e76c81888727712ced2b3fd99f5b" diff --git a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb index 472a39589e..c8d585729f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # matches debian/0.5.0-1 tag SRCREV = "44a173195986d0d853316cb02a58785ded66c12b" PV = "0.5.0+git${SRCPV}" -SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian" +SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index cd7dd9ae0f..61e2e38b05 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libjpeg-turbo mraa" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" -SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ file://0001-Use-stdint-types.patch \ file://0001-initialize-local-variables-before-use.patch \ @@ -25,7 +25,7 @@ S = "${WORKDIR}/git" # Depends on mraa which only supports x86 and ARM for now COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" -inherit distutils3-base cmake pkgconfig +inherit setuptools3-base cmake pkgconfig EXTRA_OECMAKE += "-UPYTHON_EXECUTABLE -DWERROR=off" diff --git a/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb index 831d514a4e..3ccc5afd5c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_0.24.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://lambda-diode.com/software/wipe/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://github.com/berke/wipe.git;branch=master \ +SRC_URI = "git://github.com/berke/wipe.git;branch=master;protocol=https \ file://support-cross-compile-for-linux.patch \ file://makefile-add-ldflags.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb index 9d9fab2eae..404ab2605b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb @@ -22,7 +22,7 @@ DEPENDS += " \ " SRC_URI = " \ - git://github.com/wxWidgets/wxWidgets.git \ + git://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https \ file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ " PV = "3.1.4" diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb index 7dde4182fb..1a77665e99 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRCREV = "876099f3c66033f3de11d79f63814766b1021dbe" -SRC_URI = "git://github.com/HardySimpson/zlog" +SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb index adb72d5de2..84593387d3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb @@ -5,7 +5,7 @@ DEPENDS = "curl" LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://src/COPYING;md5=71c0ac4d86266533509aa0825b8d323c" -SRC_URI = "git://github.com/probonopd/zsync-curl;protocol=https \ +SRC_URI = "git://github.com/probonopd/zsync-curl;protocol=https;branch=master \ file://fixes.patch \ file://make.patch" SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f" |