diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
124 files changed, 1410 insertions, 751 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb index a65d324ea..9d78c3457 100644 --- a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -2,8 +2,10 @@ DESCRIPTION="Anthy is a system for Japanese input method. It converts Hiragana t AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>" HOMEPAGE = "http://anthy.sourceforge.jp" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a \ + file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ +" SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ file://not_build_elc.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.0.bb index 35f875fdc..7709075fe 100644 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.0.bb @@ -1,3 +1,4 @@ +SUMMARY = "Asio is C++ library for network and low-level I/O programming" DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ I/O programming that provides developers with a consistent asynchronous \ model using a modern C++ approach." @@ -14,13 +15,15 @@ inherit autotools ALLOW_EMPTY_${PN} = "1" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e73f311a3af69e6df275e8c3b1c09b5" +LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" -SRC_URI[md5sum] = "312e53385e2daad10f08d57f91ad3431" -SRC_URI[sha256sum] = "4e27dcb37456ba707570334b91f4798721111ed67b69915685eac141895779aa" +SRC_URI[md5sum] = "ed1f2dc4cf24aa2da8361179ade01682" +SRC_URI[sha256sum] = "9d539e7c09aa6394d512c433c5601c1f26dc4975f022ad7d5e8e57c3b635b370" SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" PACKAGECONFIG ??= "boost" -PACKAGECONFIG[boost] = "--with-boost,--without-boost,boost" +PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb index e235b9b95..67dd70180 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb @@ -12,7 +12,7 @@ SRC_URI = "\ file://cmake-install-libcares.pc.patch \ file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ " -SRCREV = "077a587dccbe2f0d8a1987fbd3525333705c2249" +SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb new file mode 100644 index 000000000..621e174ff --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" +DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" + +HOMEPAGE = "https://github.com/vsergeev/c-periphery" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" + +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" +SRCREV = "d34077d7ee45fa7d1947cc0174919452fac31597" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb index 394d0e887..3c5889425 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb @@ -11,8 +11,8 @@ SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://0001-Add-build-rule-for-README.patch \ " -SRC_URI[md5sum] = "c4c70e928455f6ac3c4d02c4d2a654e9" -SRC_URI[sha256sum] = "545f4ab7887d512aa4b6967b80ef18a77b790c34769718452737a633cefc1639" +SRC_URI[md5sum] = "b11907894ce2d345439635e2b967e7e5" +SRC_URI[sha256sum] = "5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb index 151653b22..5f022d78a 100644 --- a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb @@ -3,10 +3,10 @@ DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich f HOMEPAGE = "https://github.com/CLIUtils/CLI11" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" -SRCREV = "13becaddb657eacd090537719a669d66d393b8b2" +SRCREV = "5cb3efabce007c3a0230e4cc2e27da491c646b6c" PV .= "+git${SRCPV}" -SRC_URI += "gitsm://github.com/CLIUtils/CLI11" +SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb b/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb new file mode 100644 index 000000000..90bd560c4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb @@ -0,0 +1,29 @@ +SUMMARY = "copy-paste for the Linux console" +DESCRIPTION = "Consolation is a daemon that provides copy-paste and scrolling \ +support to the Linux console. It is based on the libinput library and \ +supports all pointer devices and settings provided by this library. Similar \ +software include gpm and jamd." +HOMEPAGE = "https://salsa.debian.org/consolation-team/consolation" +SECTION = "console/utils" +LICENSE = "GPL-2.0+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=73ca626e1d9048abfc7d599370650827" + +DEPENDS = " \ + libevdev \ + libinput \ + udev \ +" + +SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git" +SRCREV = "4581eaece6e49fa2b687efbdbe23b2de452e7902" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig systemd + +do_install_append() { + install -d ${D}${systemd_system_unitdir} + install -m 644 ${B}/consolation.service ${D}${systemd_system_unitdir} +} + +SYSTEMD_SERVICE_${PN} = "consolation.service" diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb index feb16fa73..4305e3b40 100644 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb @@ -16,7 +16,6 @@ do_deploy() { addtask deploy before do_package after do_install -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" # cleandirs should possibly be in deploy.bbclass but we need it do_deploy[cleandirs] = "${DEPLOYDIR}" # clear stamp-extra-info since MACHINE_ARCH is normally put there by diff --git a/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb index cfbb2caaf..6f8c86a16 100644 --- a/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb +++ b/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb @@ -1,5 +1,6 @@ SUMMARY = "dhex is a hex editor that includes a diff mode" SECTION = "console/utils" +HOMEPAGE = "http://www.dettus.net/dhex/" DEPENDS = "ncurses" diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb new file mode 100644 index 000000000..cfc089b3b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb @@ -0,0 +1,262 @@ +SUMMARY = "Emacs is the extensible, customizable, self-documenting real-time display editor" +HOMEPAGE = "https://www.gnu.org/software/emacs/" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz" + +SRC_URI_append_class-target = " file://usemake-docfile-native.patch" + +SRC_URI[sha256sum] = "4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41" + +PACKAGECONFIG[gnutls] = "--with-gnutls=yes,--with-gnutls=no,gnutls" +PACKAGECONFIG[kerberos] = "--with-kerberos=yes,--with-kerberos=no,krb5" +PACKAGECONFIG[libgmp] = "--with-libgmp=yes,--with-libgmp=no,gmp" + +PACKAGECONFIG ??= "gnutls kerberos libgmp" + +# We could use --without-all but its better to +# split it into several packages (size of minimal doesnt change) +EXTRA_OECONF = " --with-x=no --with-dumping=none" + +DEPENDS = "ncurses" +DEPENDS_append_class-target = " emacs-native" + +inherit autotools mime-xdg + + +do_compile_class-native (){ + cd ${B}/lib-src + oe_runmake make-docfile + oe_runmake make-fingerprint +} +do_install_class-native(){ + install -d ${D}${bindir} + install -m 755 ${B}/lib-src/make-docfile ${D}/${bindir}/ + install -m 755 ${B}/lib-src/make-fingerprint ${D}/${bindir}/ +} + + +do_install_append(){ + # Delete systemd stuff, extend using DISTRO_FEATURES? + rm -rf ${D}/${libdir} + # Extra stuff which isnt needed + rm -rf ${D}/${datadir}/metainfo + rm -rf ${D}/${datadir}/info + # Emacs copies files to ${D} while building, which were unpacked + # by a different user, we need to restore those + chown -R root:root ${D}${datadir} +} + + +# Use a similar strategy to how we build python: +# Create three packages +# minimal - A working lisp based text editor +# base - What would probably work for most +# full - A fully working emacs +# The lists of files are long but are worth it +# Installing "emacs" installs the base package +PACKAGE_BEFORE_PN = "${PN}-minimal ${PN}-base ${PN}-full" +RPROVIDES_${PN}-base = "${PN}" +RDEPENDS_${PN}-base_class-target = "${PN}-minimal" +RDEPENDS_${PN}-full_class-target = "${PN}" + + +# A minimal version of emacs that works +FILES_${PN}-minimal = " \ + ${datadir}/${BPN}/${PV}/lisp/loadup.el \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-run.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/backquote.elc \ + ${datadir}/${BPN}/${PV}/lisp/subr.elc \ + ${datadir}/${BPN}/${PV}/lisp/version.elc \ + ${datadir}/${BPN}/${PV}/lisp/widget.elc \ + ${datadir}/${BPN}/${PV}/lisp/custom.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map-ynp.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule-conf.elc \ + ${datadir}/${BPN}/${PV}/lisp/env.elc \ + ${datadir}/${BPN}/${PV}/lisp/format.elc \ + ${datadir}/${BPN}/${PV}/lisp/bindings.elc \ + ${datadir}/${BPN}/${PV}/lisp/window.elc \ + ${datadir}/${BPN}/${PV}/lisp/files.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/macroexp.elc \ + ${datadir}/${BPN}/${PV}/lisp/cus-face.elc \ + ${datadir}/${BPN}/${PV}/lisp/faces.elc \ + ${datadir}/${BPN}/${PV}/lisp/button.elc \ + ${datadir}/${BPN}/${PV}/lisp/loaddefs.el \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/nadvice.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-preloaded.elc \ + ${datadir}/${BPN}/${PV}/lisp/obarray.elc \ + ${datadir}/${BPN}/${PV}/lisp/abbrev.elc \ + ${datadir}/${BPN}/${PV}/lisp/simple.elc \ + ${datadir}/${BPN}/${PV}/lisp/jka-cmpr-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/epa-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule-cmds.elc \ + ${datadir}/${BPN}/${PV}/lisp/case-table.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/charprop.el \ + ${datadir}/${BPN}/${PV}/lisp/international/characters.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/charscript.elc \ + ${datadir}/${BPN}/${PV}/lisp/composite.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/chinese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/cyrillic.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/indian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/sinhala.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/english.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/ethiopic.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/european.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/czech.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/slovak.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/romanian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/greek.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/hebrew.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/cp51932.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/eucjp-ms.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/japanese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/korean.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/lao.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/tai-viet.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/thai.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/tibetan.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/vietnamese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/misc-lang.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/utf-8-lang.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/georgian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/khmer.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/burmese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/cham.elc \ + ${datadir}/${BPN}/${PV}/lisp/indent.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-generic.elc \ + ${datadir}/${BPN}/${PV}/lisp/minibuffer.elc \ + ${datadir}/${BPN}/${PV}/lisp/frame.elc \ + ${datadir}/${BPN}/${PV}/lisp/startup.elc \ + ${datadir}/${BPN}/${PV}/lisp/term/tty-colors.elc \ + ${datadir}/${BPN}/${PV}/lisp/font-core.elc \ + ${datadir}/${BPN}/${PV}/lisp/facemenu.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/syntax.elc \ + ${datadir}/${BPN}/${PV}/lisp/font-lock.elc \ + ${datadir}/${BPN}/${PV}/lisp/jit-lock.elc \ + ${datadir}/${BPN}/${PV}/lisp/mouse.elc \ + ${datadir}/${BPN}/${PV}/lisp/select.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/timer.elc \ + ${datadir}/${BPN}/${PV}/lisp/isearch.elc \ + ${datadir}/${BPN}/${PV}/lisp/rfn-eshadow.elc \ + ${datadir}/${BPN}/${PV}/lisp/menu-bar.elc \ + ${datadir}/${BPN}/${PV}/lisp/tab-bar.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/page.elc \ + ${datadir}/${BPN}/${PV}/lisp/register.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/paragraphs.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/prog-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/elisp-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/text-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/fill.elc \ + ${datadir}/${BPN}/${PV}/lisp/newcomment.elc \ + ${datadir}/${BPN}/${PV}/lisp/replace.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/tabulated-list.elc \ + ${datadir}/${BPN}/${PV}/lisp/buff-menu.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/float-sup.elc \ + ${datadir}/${BPN}/${PV}/lisp/vc/vc-hooks.elc \ + ${datadir}/${BPN}/${PV}/lisp/vc/ediff-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/uniquify.elc \ + ${datadir}/${BPN}/${PV}/lisp/electric.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eldoc.elc \ + ${datadir}/${BPN}/${PV}/lisp/cus-start.elc \ + ${datadir}/${BPN}/${PV}/lisp/tooltip.elc \ + ${datadir}/${BPN}/${PV}/lisp/simple.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/regexp-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/term/xterm.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/bytecomp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cconv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/gv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/image.elc \ + ${datadir}/${BPN}/${PV}/lisp/ldefs-boot.el \ + ${datadir}/${BPN}/${PV}/lisp/help.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/uni*.el \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/vc/warnings.elc \ + ${datadir}/${BPN}/${PV}/etc/charsets/ \ + ${datadir}/${BPN}/${PV}/lisp/disp-table.elc \ + ${bindir}/emacs* \ + ${prefix}/libexec \ +" + + +# What works for "most" is relative, but this can be easily extended if needed +FILES_${PN}-base = " \ + ${datadir}/${BPN}/${PV}/etc/srecode \ + ${datadir}/${BPN}/${PV}/etc/e \ + ${datadir}/${BPN}/${PV}/etc/forms \ + ${datadir}/${BPN}/${PV}/lisp/cedet \ + ${datadir}/${BPN}/${PV}/site-lisp/ \ + ${datadir}/${BPN}/${PV}/lisp/subdirs.el \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-defs.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-vars.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-engine.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-styles.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-fonts.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-cmds.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-align.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-menus.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-guess.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-lib.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-macs.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easymenu.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/python* \ + ${datadir}/${BPN}/${PV}/lisp/ansi-color.elc \ + ${datadir}/${BPN}/${PV}/lisp/comint.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/ring.elc \ + ${datadir}/${BPN}/${PV}/lisp/json.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/subr-x.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-sh.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-compat.elc \ + ${datadir}/${BPN}/${PV}/lisp/auth-source.elc \ + ${datadir}/${BPN}/${PV}/lisp/password-cache.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio-core.elc \ + ${datadir}/${BPN}/${PV}/lisp/format-spec.elc \ + ${datadir}/${BPN}/${PV}/lisp/ls-lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/parse-time.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/iso8601.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/time-date.elc \ + ${datadir}/${BPN}/${PV}/lisp/shell.elc \ + ${datadir}/${BPN}/${PV}/lisp/pcomplete.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-integration.elc \ + ${datadir}/${BPN}/${PV}/lisp/files-x.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/trampver.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-loaddefs.el \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/*perl* \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/smie.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/*asm* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cpp* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/make* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/sh-script* \ + ${datadir}/${BPN}/${PV}/etc/themes/adwaita-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/wheatgrass-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/deeper-blue-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/light-blue-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/misterioso-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/tango-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/wombat-theme.el \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/prog* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/executable* \ +" + +# Restore FILES for the full package to catch everything left +FILES_${PN}-full = "${FILES_${PN}}" +FILES_${PN}-full_append = " ${datadir}/icons" + + +# The following does NOT build a native emacs. +# It only builds some parts of it that are +# required to by the build for target emacs. +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch b/meta-openembedded/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch new file mode 100644 index 000000000..cc0b05c79 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch @@ -0,0 +1,85 @@ +Upstream-Status: Inappropriate [OE-Specific] + +When building emacs, it builds some tools for the HOST +that are then used to build for target, such as +make-fingerprint and make-docfile, this needs to be +adapted to be used by bitbake, otherwise the compiled +executables arent compatible with the HOST. + +Use the above mentioned tools provided by the native +version of the recipe instead. + +Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-27.1/src/Makefile.in +=================================================================== +--- emacs-27.1.orig/src/Makefile.in ++++ emacs-27.1/src/Makefile.in +@@ -472,7 +472,7 @@ ifeq ($(CHECK_STRUCTS),true) + pdumper.o: dmpstruct.h + endif + dmpstruct.h: $(srcdir)/dmpstruct.awk +-dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) ++dmpstruct.h: $(dmpstruct_headers) + $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ + $(dmpstruct_headers) > $@ + +@@ -566,8 +566,7 @@ ${lispintdir}/characters.elc: ${charscri + ## Strictly speaking, emacs does not depend directly on all of $lisp, + ## since not all pieces are used on all platforms. But DOC depends + ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. +-emacs$(EXEEXT): temacs$(EXEEXT) \ +- lisp.mk $(etc)/DOC $(lisp) \ ++emacs$(EXEEXT): lisp.mk $(etc)/DOC $(lisp) \ + $(lispsource)/international/charprop.el ${charsets} + ifeq ($(DUMPING),unexec) + LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump +@@ -596,15 +595,15 @@ endif + ## for the first time, this prevents any variation between configurations + ## in the contents of the DOC file. + ## +-$(etc)/DOC: lisp.mk $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) ++$(etc)/DOC: lisp.mk $(obj) $(lisp) + $(AM_V_GEN)$(MKDIR_P) $(etc) + $(AM_V_at)rm -f $(etc)/DOC +- $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ ++ make-docfile -d $(srcdir) \ + $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC +- $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \ ++ make-docfile -a $(etc)/DOC -d $(lispsource) \ + $(shortlisp) + +-$(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ ++$(libsrc)/make-fingerprint$(EXEEXT): \ + $(lib)/libgnu.a + $(MAKE) -C $(dir $@) $(notdir $@) + +@@ -622,8 +621,8 @@ am__v_GLOBALS_ = $(am__v_GLOBALS_@AM_DEF + am__v_GLOBALS_0 = @echo " GEN " globals.h; + am__v_GLOBALS_1 = + +-gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) +- $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > globals.tmp ++gl-stamp: $(GLOBAL_SOURCES) ++ make-docfile -d $(srcdir) -g $(obj) > globals.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h + $(AM_V_at)echo timestamp > $@ + +@@ -637,7 +636,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) + $(MAKE) -C $(dir $@) all + + ifeq ($(HAVE_PDUMPER),yes) +- MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) ++ MAKE_PDUMPER_FINGERPRINT = make-fingerprint + else + MAKE_PDUMPER_FINGERPRINT = + endif +@@ -647,7 +646,7 @@ endif + ## This goes on to affect various things, and the emacs binary fails + ## to start if Vinstallation_directory has the wrong value. + temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(EMACSRES) \ +- $(charsets) $(charscript) $(MAKE_PDUMPER_FINGERPRINT) ++ $(charsets) $(charscript) + $(AM_V_CCLD)$(CC) -o $@.tmp \ + $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ + $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES) diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch new file mode 100644 index 000000000..96146a195 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch @@ -0,0 +1,40 @@ +From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 30 Jul 2020 23:03:51 +0200 +Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports + it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There have been some PRs they were either rejected or some general suggestion +for more flags suggested. So + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + cmake/compilerFlags.cmake | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake +index 12caf42..455525e 100644 +--- a/cmake/compilerFlags.cmake ++++ b/cmake/compilerFlags.cmake +@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN + # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 + if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) + if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) +- add_compile_options(-fstack-clash-protection -fcf-protection) ++ # Gcc does support -fcf-protection on few arches only ++ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) ++ if (COMPILER_SUPPORTS_FCF_PROTECTION) ++ add_compile_options(-fcf-protection) ++ endif() ++ add_compile_options(-fstack-clash-protection) + endif() + + if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 +-- +2.21.3 + diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb index 97116ee2d..ed1e8de5c 100644 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb @@ -5,8 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" DEPENDS = "zlib expat" SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[md5sum] = "56d064517ae5903dd963b84514a121c1" -SRC_URI[sha256sum] = "f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081" +SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" + +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +inherit dos2unix +SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch" S = "${WORKDIR}/${BPN}-${PV}-Source" diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.2.0.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb index 05dc94a99..d52731161 100644 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" SRC_URI += "git://github.com/fmtlib/fmt" -SRCREV = "9bdd1596cef1b57b9556f8bef32dc4a32322ef3e" +SRCREV = "cd4af11efc9c622896a3e4cb599fa28668ca3d05" S = "${WORKDIR}/git" @@ -13,3 +13,5 @@ inherit cmake inherit ptest EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb index 7cafbb799..d446a31a5 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb @@ -11,12 +11,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pkgconfig cmake gitpkgv PE = "1" -PV = "2.0.0+gitr${SRCPV}" PKGV = "${GITPKGVTAG}" -# 2.0.0 release -SRCREV = "5ab2bed8749747b8e4b2ed431fd102bc726be684" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \ +SRCREV = "d2ba84a6885f57674098fe8e76c5f99d880e580d" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0 \ file://winpr-makecert-Build-with-install-RPATH.patch \ " @@ -40,7 +38,7 @@ PACKAGECONFIG ??= " \ X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}" -PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native" +PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native libxkbcommon" PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb" PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.0.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb index 556a25aa1..56dc30acd 100644 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Provides improved implementations of std::function." HOMEPAGE = "https://naios.github.io/function2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "d2acdb6c3c7612a6133cd03464ef941161258f4e" +SRCREV = "3a0746bf5f601dfed05330aefcb6854354fce07d" PV .= "+git${SRCPV}" SRC_URI += "gitsm://github.com/Naios/function2" diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb index eec8a05ae..554e07fd3 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb @@ -35,7 +35,7 @@ EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" -do_install_append() { +do_install_append_class-target() { # cleanup buildpaths from gdlib.pc sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc } @@ -50,3 +50,5 @@ RPROVIDES_${PN}-tools = "${PN}-tools" RDEPENDS_${PN}-tools = "perl perl-module-strict" CVE_PRODUCT = "libgd" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb index 9a8332836..56bf51554 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb @@ -25,3 +25,10 @@ PACKAGECONFIG_remove_riscv32 = "unwind" PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure_append() { + # remove WORKDIR info to improve reproducibility + if [ -f "${B}/config.h" ] ; then + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + fi +} diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.90.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb index b7b783931..662777b47 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.90.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gperftools/gperftools" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" -SRCREV = "db7aa547abb5abdd558587a15502584cbc825438" +SRCREV = "180bfa10d7cb38e8b3784d60943d50e8fcef0dcb" SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-Support-Atomic-ops-on-clang.patch \ file://0001-fix-build-with-musl-libc.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch deleted file mode 100644 index a9198166a..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52e6cf052b1f938fcca1bc24d578fe0bfd972988 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 25 Jun 2017 07:25:33 -0700 -Subject: [PATCH] Use sigemptyset API instead of __sigemptyset - -__sigemptyset has been removed from glibc public -API headers in upcoming (2.26) release onwards - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/prog/gpm-root.y | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y -index 5126c65..76c896c 100644 ---- a/src/prog/gpm-root.y -+++ b/src/prog/gpm-root.y -@@ -1196,11 +1196,7 @@ int main(int argc, char **argv) - LOG_DAEMON : LOG_USER); - /* reap your zombies */ - childaction.sa_handler=reap_children; --#if defined(__GLIBC__) -- __sigemptyset(&childaction.sa_mask); --#else /* __GLIBC__ */ - sigemptyset(&childaction.sa_mask); --#endif /* __GLIBC__ */ - childaction.sa_flags=0; - sigaction(SIGCHLD,&childaction,NULL); - --- -2.13.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb index 3800d147f..600b25df8 100644 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb @@ -9,14 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" PV = "1.99.7+git${SRCREV}" PR = "r2" -SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" +SRCREV = "e82d1a653ca94aa4ed12441424da6ce780b1e530" DEPENDS = "ncurses bison-native" SRC_URI = "git://github.com/telmich/gpm;protocol=git \ file://init \ file://gpm.service.in \ - file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb index 0b4eac889..0249d09e4 100644 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.100.bb +++ b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ " -SRC_URI[md5sum] = "f0fc5394286753eff657cf62b46d024b" -SRC_URI[sha256sum] = "11b4f99d28392e3e1aeb29bfd006a4f1f40e7fdd7a3f3444ee69014d415f09f2" +SRC_URI[md5sum] = "0925d25bc455047b01d4fe9814d30173" +SRC_URI[sha256sum] = "4e74838baf5437e95ae17aa3efb48bd0621f483bff4424f6255fcf327ff80765" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb index 9af2b6714..11285451a 100644 --- a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb +++ b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb @@ -1,4 +1,5 @@ -SUMMARY = "Unique technology suite that makes possible the management of \ +SUMMARY = "Management suite for extremely large and complex data collections" +DESCRIPTION = "Unique technology suite that makes possible the management of \ extremely large and complex data collections" HOMEPAGE = "https://www.hdfgroup.org/" SECTION = "libs" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch deleted file mode 100644 index 6153bdedb..000000000 --- a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 08aca4816cc798fce58b6235c26585a0063fa8af Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 26 Nov 2019 10:43:49 -0800 -Subject: [PATCH] Ask for python3 specifically - -python2 is on its way out - -Upstream-Status: Submitted [https://github.com/hishamhm/htop/pull/968] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - scripts/MakeHeader.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py -index 7c48fdd..7a7586d 100755 ---- a/scripts/MakeHeader.py -+++ b/scripts/MakeHeader.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - import os, sys, string, io - try: - from StringIO import StringIO --- -2.24.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb index 64eb0c571..d677e36c0 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb @@ -1,27 +1,25 @@ SUMMARY = "Interactive process viewer" -HOMEPAGE = "http://hisham.hm/htop" +HOMEPAGE = "https://htop.dev" SECTION = "console/utils" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" +LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891" DEPENDS = "ncurses" -SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ +SRC_URI = "git://github.com/htop-dev/htop.git \ file://0001-Use-pkg-config.patch \ - file://0001-Ask-for-python3-specifically.patch \ " -SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" -SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" +SRCREV = "dace850fa6e27b5626115b366059258cfe4d60c9" + +S = "${WORKDIR}/git" inherit autotools pkgconfig -PACKAGECONFIG ??= "proc \ - cgroup \ +PACKAGECONFIG ??= "cgroup \ taskstats \ unicode \ linux-affinity \ delayacct" -PACKAGECONFIG[proc] = "--enable-proc,--disable-proc" PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup" PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" @@ -31,7 +29,3 @@ PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinit PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc" PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" - -do_configure_prepend () { - rm -rf ${S}/config.h -} diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index 5f3e3f686..cc12a6890 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.333" -SRCREV = "2de52be0d00015fa6cde70bb845fa9b86cf6f420" +PV = "0.340" +SRCREV = "60d9f39b0542607fcc436e7aebf6b05a9ca674ff" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index 3f7d06e26..70cb237d9 100644 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a" DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" -PV .= "_13" +PV .= "_25" SRC_URI = "git://github.com/ImageMagick/ImageMagick.git " -SRCREV = "15b935d64f613b5a0fc9d3fead5c6ec1b0e3908f" +SRCREV = "8b4e00829eb84d4e7b4da11acf1f98f1e8166e5b" S = "${WORKDIR}/git" @@ -46,7 +46,7 @@ BBCLASSEXTEND = "native" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "animate compare composite conjure convert display \ - identify import mogrify montage stream" + identify import magick-script mogrify montage stream" ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7" ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7" @@ -56,12 +56,13 @@ ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7" ALTERNATIVE_TARGET[display] = "${bindir}/display.im7" ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7" ALTERNATIVE_TARGET[import] = "${bindir}/import.im7" +ALTERNATIVE_TARGET[magick-script] = "${bindir}/magick-script.im7" ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7" ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7" ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7" ALTERNATIVE_${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ - convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 stream.1" + convert.1 display.1 identify.1 import.1 magick-script.1 mogrify.1 montage.1 stream.1" ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1" ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1" @@ -79,6 +80,8 @@ ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1" ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1" ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1" ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1" +ALTERNATIVE_LINK_NAME[magick-script.1] = "${mandir}/man1/magick-script.1" +ALTERNATIVE_TARGET[magick-script.1] = "${mandir}/man1/magick-script.im7.1" ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1" ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1" ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1" diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch new file mode 100644 index 000000000..ceda8394a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch @@ -0,0 +1,16 @@ +Append to LDFLAGS so it can respect the LDFLAGS passed from environment. This helps +with using propert GNU_HASH settings during link on mips/arm + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/Makefile ++++ b/src/Makefile +@@ -24,7 +24,7 @@ CFLAGS = -Wall -Wextra -O \ + -DCONFIG_SSL_CAPATH='"$(SSLCAPATH)"' \ + -DCONFIG_SSL_CAFILE='"$(SSLCAFILE)"' \ + $(INCDIRS) $(MYCFLAGS) +-LDFLAGS = $(LIBDIRS) $(MYLDFLAGS) ++LDFLAGS += $(LIBDIRS) $(MYLDFLAGS) + LIBS = -lm -ldl $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS) + + MAN1 = imapfilter.1 diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb index 7d4e12dfb..86553b5a8 100644 --- a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb @@ -2,7 +2,9 @@ SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ccca8573ead8e965c130b6b2946a36ab" -SRC_URI = "https://codeload.github.com/lefcha/${BPN}/tar.gz/v${PV};downloadfilename=v${PV}.tar.gz" +SRC_URI = "https://codeload.github.com/lefcha/${BPN}/tar.gz/v${PV};downloadfilename=${BP}.tar.gz \ + file://ldflags.patch \ +" SRC_URI[sha256sum] = "90af9bc9875e03fb5a09a3233287b74dd817867cb18ec9ff52fead615755563e" DEPENDS= "openssl lua libpcre" @@ -15,3 +17,5 @@ do_install(){ # No need for manuals at this point, MANDIR is hardcoded to depend on prefix rm -rf ${D}${prefix}/man } + +ASNEEDED = "" diff --git a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.9.bb b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.11.bb index be72d765e..4f10f3531 100644 --- a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.11.bb @@ -1,11 +1,11 @@ SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516" +LIC_FILES_CHKSUM = "file://COPYING;md5=9391499b030def18e7bb25bab4bee052" SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" -SRC_URI[md5sum] = "8de1b7724f578d2995c8fdfa35c3ad0e" -SRC_URI[sha256sum] = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20" +SRC_URI[md5sum] = "598dae499e58f877ff6788254320f43e" +SRC_URI[sha256sum] = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e" DEPENDS = "tiff" diff --git a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb index 14718184b..0cc8b31b3 100755 --- a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb @@ -9,8 +9,6 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" RDEPENDS_${PN} += " \ - gcov \ - gcov-symlinks \ libjson-perl \ libperlio-gzip-perl \ perl \ @@ -46,6 +44,11 @@ RDEPENDS_${PN} += " \ perl-module-tie-hash \ " +RDEPENDS_${PN}_append_class-target = " \ + gcov \ + gcov-symlinks \ +" + SRC_URI = " \ http://downloads.sourceforge.net/ltp/${BP}.tar.gz \ file://0001-geninfo-Add-intermediate-text-format-support.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.2.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb index a954499c6..0aaf188b6 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "e64e752a28a4a41b0a43cba3bedf9571c22af807" +SRCREV = "732ee8d28492e4bc9b52c29bcb81a5c19388d002" SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" inherit gettext autotools python3native diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb index f638848d1..6ce318d0b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb @@ -4,11 +4,11 @@ HOMEPAGE = "http://eigen.tuxfamily.org/" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" -SRC_URI = "https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2;downloadfilename=${BP}.tar.bz2" -SRC_URI[md5sum] = "05b1f7511c93980c385ebe11bd3c93fa" -SRC_URI[sha256sum] = "9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce" +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" -S = "${WORKDIR}/eigen-eigen-323c052e1731" +SRCREV = "21ae2afd4edaa1b69782c67a54182d34efe43f9c" + +S = "${WORKDIR}/git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb index 74343683f..363ed4d65 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" -SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0" +SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc deleted file mode 100644 index cae3145dd..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "C library and tools for interacting with the linux GPIO character device" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" - -SRC_URI = "https://www.kernel.org/pub/software/libs/libgpiod/${BP}.tar.xz" - -inherit autotools pkgconfig - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - -EXTRA_OECONF = "--enable-tools" - -PACKAGES =+ " ${PN}-tools" - -FILES_${PN}-tools = "${bindir}/*" - -PACKAGES =+ "libgpiodcxx" -FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb deleted file mode 100644 index c4d2bddf4..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libgpiod.inc - -PACKAGECONFIG ?= "" - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - -SRC_URI[md5sum] = "2aa1e1a80c3c919ae142ab9a55fb59ca" -SRC_URI[sha256sum] = "b773e557af1a497f786825462a776b7bf90168e67ee0a5bc5d2473a5674dc38c" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.3.bb deleted file mode 100644 index a6320da8e..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -require libgpiod.inc - -DEPENDS += "autoconf-archive-native" - -SRC_URI[md5sum] = "d4826720a8de13379436f9c207237bc0" -SRC_URI[sha256sum] = "0ad080d1eb89c422cf13001293ffa72869ca13028e85dab5f6b3ba90f88da46d" - -# enable cxx bindings -PACKAGECONFIG ?= "cxx" - -PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - -PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" - -inherit python3native - -PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" -RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" -RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb new file mode 100644 index 000000000..6433675ca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb @@ -0,0 +1,33 @@ +SUMMARY = "C library and tools for interacting with the linux GPIO character device" +AUTHOR = "Bartosz Golaszewski <bgolaszewski@baylibre.com>" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" + +SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz" +SRC_URI[md5sum] = "064c2627397e6641c52de09a26951112" +SRC_URI[sha256sum] = "f1cda2789e6a13a92aefc012a76e5a7cc57a1b402d66f71df8719ee314b67699" + +inherit autotools pkgconfig python3native + +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" +PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" +PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" + +# Enable cxx bindings by default. +PACKAGECONFIG ?= "cxx" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +DEPENDS += "autoconf-archive-native" + +PACKAGES =+ "${PN}-tools libgpiodcxx" +FILES_${PN}-tools = "${bindir}/*" +FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" +RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch new file mode 100644 index 000000000..41e64d7d8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch @@ -0,0 +1,53 @@ +From 76c23503ed1002d3aad0118795006fe2128006ae Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan <lantw@src.gnome.org> +Date: Sat, 21 Mar 2020 22:13:57 +0800 +Subject: [PATCH] generate-version-script: Don't hard-code the path of python3 + +Python can be installed in different directories on different operating +systems, so we can't hard-code the path of it. Instead, use meson to +find it to avoid 'no such file or directory' error on the bad path. + +Upstream-Status: Backport [https://github.com/hughsie/libgusb/pull/36] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + contrib/generate-version-script.py | 1 - + gusb/meson.build | 4 ++++ + 2 files changed, 4 insertions(+), 1 deletion(-) + mode change 100755 => 100644 contrib/generate-version-script.py + +diff --git a/contrib/generate-version-script.py b/contrib/generate-version-script.py +old mode 100755 +new mode 100644 +index c4ee238ab0ab..0fe2b24e47e3 +--- a/contrib/generate-version-script.py ++++ b/contrib/generate-version-script.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/python3 + # pylint: disable=invalid-name,missing-docstring + # + # Copyright (C) 2017 Richard Hughes <richard@hughsie.com> +diff --git a/gusb/meson.build b/gusb/meson.build +index 10a6f537a642..28ca3c63e595 100644 +--- a/gusb/meson.build ++++ b/gusb/meson.build +@@ -142,6 +142,9 @@ libgusb_girtarget = gnome.generate_gir(gusb, + libgusb_gir = libgusb_girtarget[0] + libgusb_typelib = libgusb_girtarget[1] + ++pymod = import('python') ++py_installation = pymod.find_installation('python3') ++ + # Verify the map file is correct -- note we can't actually use the generated + # file for two reasons: + # +@@ -154,6 +157,7 @@ mapfile_target = custom_target('gusb_mapfile', + input: libgusb_girtarget[0], + output: 'libgusb.ver', + command: [ ++ py_installation, + join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), + 'LIBGUSB', + '@INPUT@', +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_git.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb index e3c0bdd15..bd88c8ed4 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb @@ -6,7 +6,8 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala -SRC_URI = "git://github.com/hughsie/libgusb.git" -SRCREV = "636efc0624aa2a88174220fcabc9764c13d7febf" -PV = "0.3.0+git${SRCPV}" +SRC_URI = "git://github.com/hughsie/libgusb.git \ + file://0001-generate-version-script-Don-t-hard-code-the-path-of-.patch \ + " +SRCREV = "377917fed85476d615f72279d0c97bc391d0f191" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index f83d9c922..b308bde17 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,8 +4,8 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SRCREV = "5f5af2e417129ad8f4e05fc5c1b730f0694dca12" -PV = "0.19+git${SRCPV}" +SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7" +PV = "0.21+git${SRCPV}" SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb index 94976d2e9..2bd8148e3 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb @@ -8,8 +8,8 @@ DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ " -SRC_URI[md5sum] = "dcd6045ecb4ea18c120afedccbd1da74" -SRC_URI[sha256sum] = "90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307" +SRC_URI[md5sum] = "c7e230e9b899282b43d9a9faa41e893d" +SRC_URI[sha256sum] = "e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182" inherit autotools lib_package pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb index 7fe0640d9..1c5cc52bf 100644 --- a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" +SRCREV = "9ca6a71c890b5583c8af3b4900172626bca55e72" UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest new file mode 100644 index 000000000..2a7922f1a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest @@ -0,0 +1,7 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +for test in $(ls $ptestdir/tests) +do + ./test-driver --test-name $test --log-file $test.log --trs-file $test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./tests/$test +done diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index c1f337a44..a1d85617a 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -9,11 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://CVE-2019-17498.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF += "\ --with-libz \ @@ -26,3 +27,17 @@ PACKAGECONFIG[openssl] = "--with-crypto=openssl --with-libssl-prefix=${STAGING_L PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR}, , libgcrypt" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN}-ptest = "bash" + +do_compile_ptest() { + sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile + oe_runmake check +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.30.bb b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb index 9cd02b0c0..149cfb8d2 100644 --- a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.30.bb +++ b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/jpirko/libteam \ file://0001-team_basic_test.py-use-python3-interpreter.patch \ file://run-ptest \ " -SRCREV = "471fb50d206e5a3f2eef9e4247329b51edc5c493" +SRCREV = "3ee12c6d569977cf1cd30d0da77807a07aa77158" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb new file mode 100644 index 000000000..3a1eaef87 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb @@ -0,0 +1,24 @@ +SUMMARY = "This is the io_uring library, liburing." +DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ +instances, and also a simplified interface for applications that don't need \ +(or want) to deal with the full kernel side implementation." +HOMEPAGE = "https://github.com/axboe/liburing" +BUGTRACKER = "https://github.com/axboe/liburing/issues" +SECTION = "libs" + +LICENSE = "LGPLv2.1 | MIT" +LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e6a66ca50904cf9" + +SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" +SRCREV = "45f0735219a615ae848033c47c7e2d85d101d43e" +S = "${WORKDIR}/git" + +DEPENDS_append_libc-musl = " libucontext" +XCFLAGS = "-pthread" +XCFLAGS_append_libc-musl = " -lucontext" + +EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" + +do_install () { + oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} +} diff --git a/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb index 97d60a6a8..b1c466352 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" -inherit autotools +inherit autotools update-alternatives PV = "0.1.0" SRCREV = "a826d136e0e8fa53815f1ba05893e6dd74208c15" @@ -14,3 +14,6 @@ SRC_URI = "git://github.com/libusbg/libusbg.git \ S = "${WORKDIR}/git" +ALTERNATIVE_${PN} = "gadget-acm-ecm show-gadgets" +ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" +ALTERNATIVE_LINK_NAME[show-gadgets] = "${bindir}/show-gadgets" diff --git a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index d73ca6106..48fc91143 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ DEPENDS = "libconfig" -inherit autotools pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d update-alternatives PV = "0.2.0+git${SRCPV}" SRCREV = "45c14ef4d5d7ced0fbf984208de44ced6d5ed898" @@ -38,3 +38,8 @@ do_install_append() { } RDEPENDS_${PN} += "libusbgx-config" + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE_${PN} = "gadget-acm-ecm show-gadgets" +ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" +ALTERNATIVE_LINK_NAME[show-gadgets] = "${bindir}/show-gadgets" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links_2.20.2.bb b/meta-openembedded/meta-oe/recipes-support/links/links_2.21.bb index 1a36291e5..b6048c1d3 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links_2.20.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links_2.21.bb @@ -9,7 +9,7 @@ EXTRA_OECONF = "--enable-graphics \ --without-directfb --without-pmshell --without-atheos \ --without-x" -SRC_URI[md5sum] = "ee39e612249440d0497535d0dafc3c0e" -SRC_URI[sha256sum] = "4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424" +SRC_URI[md5sum] = "b88a46733d6932442ed8a6b751aac6b4" +SRC_URI[sha256sum] = "285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63" SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch new file mode 100644 index 000000000..3f53db9e5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch @@ -0,0 +1,28 @@ +configure.ac: override CONFIGURE_LINE + +For reproducible binaries, we need to report a constant CONFIGURE_LINE. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + + +--- git.orig/configure.ac ++++ git/configure.ac +@@ -15,7 +15,15 @@ AC_PREREQ(2.69) + ################################################################################ + dnl -- Process this file with autoconf to produce a configure script. + AC_INIT +-CONFIGURE_LINE="$0 $@" ++ ++dnl per reproducible-builds.org check SOURCE_DATE_EPOCH ++dnl ++if test -z "${SOURCE_DATE_EPOCH+set}" ; then ++ CONFIGURE_LINE="$0 $@" ++else ++ CONFIGURE_LINE="configure options are not available for reproducible builds" ++fi ++ + AC_CONFIG_SRCDIR([lib/device/dev-cache.h]) + AC_CONFIG_HEADERS([include/configure.h]) + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 01c9df45c..3c6c7edfc 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,7 +15,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ + file://reproducible-build.patch \ " + SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb index e2b551bbc..bc86810ec 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb @@ -32,7 +32,7 @@ PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - blk-availability.service lvm2-pvscan@.service" + blk-availability.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" @@ -52,7 +52,11 @@ FILES_libdevmapper = " \ ${sbindir}/dmstats \ " -FILES_${PN} += "${libdir}/device-mapper/*.so" +FILES_${PN} += " \ + ${libdir}/device-mapper/*.so \ + ${systemd_system_unitdir}/lvm2-pvscan@.service \ +" + FILES_${PN}-scripts = " \ ${sbindir}/blkdeactivate \ ${sbindir}/fsadm \ diff --git a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb index ff3047f32..537c45874 100644 --- a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb +++ b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb @@ -21,6 +21,11 @@ SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" SRC_URI[md5sum] = "d5701a1a541383c0eda328f4a6518751" SRC_URI[sha256sum] = "f7381516bc1a937348efd1d0e14618e0a2afc5d59fe821dd248632d5601b59b5" +inherit update-alternatives + do_install() { oe_runmake install DESTDIR=${D} sysconfdir=${sysconfdir} mandir=${mandir} } + +ALTERNATIVE_${PN} = "mime.types" +ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_168.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb index e2ef6ea58..bdb080f41 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_168.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; file://run-ptest \ " -SRCREV = "078d593b8b0c7d44afdd439aacfad6682913038f" +SRCREV = "391abaac9bdff385934b18134789bcc98b0adeb7" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch index 130267931..9c154a173 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch @@ -9,31 +9,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -diff --git a/GNUmakefile b/GNUmakefile -index 7bf7dca..0e10030 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -41,7 +41,6 @@ endif +@@ -45,7 +45,6 @@ endif CC?= gcc CFLAGS?= -O2 -pipe CFLAGS+= -g -Wall -CPPFLAGS= -DREGEX CPPFLAGS+= -D_GNU_SOURCE - CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2 + CPPFLAGS+= $(BSD_CPPFLAGS) LIBS= $(CURSES_LIBS) $(BSD_LIBS) -diff --git a/Makefile b/Makefile -index 94ce340..d516bbc 100644 --- a/Makefile +++ b/Makefile -@@ -10,7 +10,7 @@ DPADD+= ${LIBCURSES} ${LIBUTIL} - # REGEX -- create regular expression functions. +@@ -11,7 +11,7 @@ DPADD+= ${LIBUTIL} # STARTUPFILE -- look for and handle initialization file. + # MGLOG -- debug mg internals to a log file. # --CFLAGS+=-Wall -DREGEX -+CFLAGS+=-Wall +-CFLAGS+=-Wall -DREGEX `pkg-config --cflags-only-I ncurses` ++CFLAGS+=-Wall `pkg-config --cflags-only-I ncurses` SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \ echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \ --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch index 551f1df16..8e8c2b902 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch @@ -8,8 +8,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> fileio.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/fileio.c b/fileio.c -index 48a67a2..9b69665 100644 --- a/fileio.c +++ b/fileio.c @@ -12,6 +12,7 @@ @@ -20,6 +18,3 @@ index 48a67a2..9b69665 100644 #include <dirent.h> #include <errno.h> #include <fcntl.h> --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch index 907d67064..bdd7632be 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch @@ -8,13 +8,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> fileio.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/fileio.c b/fileio.c -index 9b69665..a852fd2 100644 --- a/fileio.c +++ b/fileio.c -@@ -28,6 +28,10 @@ - #include "kbd.h" - #include "pathnames.h" +@@ -36,6 +36,10 @@ + #define DEFFILEMODE 0666 + #endif +#if !defined(DEFFILEMODE) +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ @@ -23,6 +21,3 @@ index 9b69665..a852fd2 100644 static char *bkuplocation(const char *); static int bkupleavetmp(const char *); --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20200723.bb index dad1d008b..b73f93756 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg_20200723.bb @@ -5,15 +5,16 @@ LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" DEPENDS = "ncurses libbsd" SECTION = "console/editors" -SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \ +SRCREV = "60fa3582f5f735b9d43825f5bdcc4ea5f0740f91" +SRC_URI = "git://github.com/hboetes/mg \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ " SRC_URI_append_libc-musl = "\ file://0001-Undefine-REGEX-for-musl-based-systems.patch \ " -SRC_URI[md5sum] = "884388589fb38c2109ad9fed328be20a" -SRC_URI[sha256sum] = "0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab" + +S = "${WORKDIR}/git" # CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= EXTRA_OEMAKE = "\ diff --git a/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb index d617b6620..1137f5012 100644 --- a/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb +++ b/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb @@ -10,6 +10,8 @@ RRECOMMENDS_${PN} = "file" SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" S = "${WORKDIR}/${BPN}" +inherit update-alternatives + FILES_${PN} += " ${libdir}/mime" docdir_append = "/${BPN}" @@ -56,3 +58,7 @@ do_install () { SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d" SRC_URI[sha256sum] = "a529c7892cb786f514af71f4ca5a4c3ebc58b538a49ff959c0d97592d38f040a" + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE_${PN} = "mime.types" +ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-openembedded/meta-oe/recipes-support/mini-iconv/mini-iconv.bb b/meta-openembedded/meta-oe/recipes-support/mini-iconv/mini-iconv.bb deleted file mode 100644 index 44f55b58d..000000000 --- a/meta-openembedded/meta-oe/recipes-support/mini-iconv/mini-iconv.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2012 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "A minimal iconv implementation w/ support for UTF-8, ASCII, ISO-8859-1" -HOMEPAGE = "http://tinderbox.dev.gentoo.org/portage/local/misc/mini-iconv/" -LICENSE = "MPL-1.1" -SECTION = "libs" -DEPENDS = "" -PROVIDES = "virtual/libiconv" -LIC_FILES_CHKSUM = "file://iconv.c;beginline=1;endline=6;md5=35af9d9924327fe8a0a1fe3a2cb454c8" -SRC_URI = "http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/mini-iconv.tar.bz2" -SRC_URI[md5sum] = "84412221e26505a2b3855d4a1cdcd0e0" -SRC_URI[sha256sum] = "3552262bf1bcf8e859a2a3a7adfb0367af8593383e730c492e981477aac0a0d4" - - -S = "${WORKDIR}/${BPN}" - -do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIB=${base_libdir} -} diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit/monitrc b/meta-openembedded/meta-oe/recipes-support/monit/monit/monitrc index f8d6a4388..af7bd2be5 100644 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit/monitrc +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit/monitrc @@ -21,6 +21,12 @@ set daemon 30 # check services at 30 seconds intervals # # default Monit check immediately after Monit start) # # + +# set monit files in temporary locations +set pidfile /var/run/.monit.pid +set statefile /var/run/.monit.state +set idfile /var/run/.monit.id + ## Set syslog logging. If you want to log to a standalone log file instead, ## specify the full path to the log file # diff --git a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 276ad201f..49899edd7 100644 --- a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -16,3 +16,5 @@ inherit autotools gettext do_configure_prepend() { sed -i "s#AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)#AC_PATH_PROG([GDLIB_CONFIG],[gdlib-config], ,[${STAGING_BINDIR_CROSS}])#" ${S}/configure.ac } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch new file mode 100644 index 000000000..2827bb874 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch @@ -0,0 +1,40 @@ +From 04884263d1de8c427a7a15bd1cf6466ea65d3a0b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 25 May 2020 23:22:55 -0700 +Subject: [PATCH] add explicit dependency on libraries + +[snip] +gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist +collect2: error: ld returned 1 exit status +Makefile:36: recipe for target 'multipathd' failed +make[1]: *** [multipathd] Error 1 +make[1]: Leaving directory 'git/multipathd' +Makefile:29: recipe for target 'multipathd' failed +make: *** [multipathd] Error 2 +ln -sf libmpathpersist.so.0 libmpathpersist.so +[snip] + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index bea0a0b2..37a77129 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,8 @@ $(BUILDDIRS): + $(MAKE) -C $@ + + multipath multipathd mpathpersist libmpathpersist : libmultipath +-mpathpersist: libmpathpersist ++mpathpersist multipathd: libmpathpersist ++libdmmp libmultipath mpathpersist multipath multipathd: libmpathcmd + + DEPS_ON_MULTIPATH := \ + multipath \ +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch new file mode 100644 index 000000000..cf97b491e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch @@ -0,0 +1,42 @@ +From 5ae81386a8cfea4180738c261cd3f7944a631199 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Jun 2020 16:03:56 -0700 +Subject: [PATCH] fix boolean value with json-c 0.14 + +Patch from Christian Hesse posted here +https://www.spinics.net/lists/dm-devel/msg40646.html + +Upstream json-c 0.14+ removed the TRUE and FALSE defines in commit +0992aac61f8b087efd7094e9ac2b84fa9c040fcd. + +Upstream-Status: Submitted [https://www.spinics.net/lists/dm-devel/msg40646.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libdmmp/libdmmp_private.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h +index ac85b63f..29400826 100644 +--- a/libdmmp/libdmmp_private.h ++++ b/libdmmp/libdmmp_private.h +@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \ + do { \ + json_type j_type = json_type_null; \ + json_object *j_obj_tmp = NULL; \ +- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \ ++ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \ + _error(ctx, "Invalid JSON output from multipathd IPC: " \ + "key '%s' not found", key); \ + rc = DMMP_ERR_IPC_ERROR; \ +@@ -90,7 +90,7 @@ do { \ + } \ + if (j_obj_tmp == NULL) { \ + _error(ctx, "BUG: Got NULL j_obj_tmp from " \ +- "json_object_object_get_ex() while it return TRUE"); \ ++ "json_object_object_get_ex() while it return 1"); \ + rc = DMMP_ERR_BUG; \ + goto out; \ + } \ +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch new file mode 100644 index 000000000..b35d67cf5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch @@ -0,0 +1,40 @@ +From 35421d03898ac1b38f97a76241e6a29086d0c9f1 Mon Sep 17 00:00:00 2001 +From: Geoff Parker <geoffrey.parker@arthrex.com> +Date: Fri, 9 Oct 2020 17:48:47 +0000 +Subject: [PATCH] libdmmp/Makefile: replace perl with sed in install target to + work with pseudo + +The multipath-tools libdmmp/Makefile install target uses 'perl -i' instead +of 'sed -i' for string substitutions. The perl method creates a temporary file +and overwrites the original which changes the inodes and corrupts the pseudo +db. Changes to pseduo cause a build abort rather than allow possible bad +ownership or permissions settings on the files. 'sed -i' is compatible +with pseudo. + +Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com> +--- + libdmmp/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libdmmp/Makefile b/libdmmp/Makefile +index 1dd3f340..8166075c 100644 +--- a/libdmmp/Makefile ++++ b/libdmmp/Makefile +@@ -34,11 +34,11 @@ install: + $(LN) $(LIBS) $(DESTDIR)$(usrlibdir)/$(DEVLIB) + $(INSTALL_PROGRAM) -m 644 -D \ + $(PKGFILE).in $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ ++ sed -i 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__LIBDIR__|$(usrlibdir)|g' \ ++ sed -i 's|__LIBDIR__|$(usrlibdir)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \ ++ sed -i 's|__INCLUDEDIR__|$(includedir)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) + @for file in docs/man/*.3.gz; do \ + $(INSTALL_PROGRAM) -m 644 -D \ +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 2795a8d09..331c0cd01 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -43,7 +43,10 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ file://0030-Always-use-devmapper.patch \ file://0031-Always-use-devmapper-for-kpartx.patch \ + file://0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch \ file://0001-fix-bug-of-do_compile-and-do_install.patch \ + file://0001-add-explicit-dependency-on-libraries.patch \ + file://0001-fix-boolean-value-with-json-c-0.14.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" @@ -115,3 +118,4 @@ FILES_kpartx = "${base_sbindir}/kpartx \ " RDEPENDS_${PN} += "kpartx" +PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.2.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb index 2b236ba1e..48e92de4c 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb @@ -12,8 +12,7 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[md5sum] = "10df0100ebf4aa7bb4806428c11751eb" -SRC_URI[sha256sum] = "d8a25eea942ecee2d57b8e037eb4b28f030f818b78773b8fcb994ed5835d2ef6" +SRC_URI[sha256sum] = "c5c1cbcf622d9a96b6030d66409ed12b204e8bc01ef5e6554ebbe6fb1d734352" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb index 1de26e1ee..6307c159e 100644 --- a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb +++ b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb @@ -23,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" +SRC_URI[md5sum] = "a546926d3c8e887be02c668c1293da92" +SRC_URI[sha256sum] = "22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582" CVE_PRODUCT = "netscape_portable_runtime" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch deleted file mode 100644 index 90ec379c6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8cf7afb5417e23cd3ebf8141239bf020f5dd2ac8 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Thu, 30 Apr 2020 06:56:09 +0000 -Subject: [PATCH] Enable uint128 on mips64 - -Fix below error: -| verified/kremlin/kremlib/dist/minimal/FStar_UInt128.h:22:1: error: 'FStar_UInt128___proj__Mkuint128__item__low' declared 'static' but never defined [-Werror=unused-function] -| 22 | FStar_UInt128___proj__Mkuint128__item__low(FStar_UInt128_uint128 projectee); - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - .../freebl/verified/kremlin/include/kremlin/internal/types.h | 3 ++- - .../kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -index 801e78f..cdac61e 100644 ---- a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -+++ b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -@@ -57,7 +57,8 @@ typedef const char *Prims_string; - typedef __m128i FStar_UInt128_uint128; - #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ - (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -- (defined(__riscv) && __riscv_xlen == 64)) -+ (defined(__riscv) && __riscv_xlen == 64) || \ -+ defined(__mips64)) - typedef unsigned __int128 FStar_UInt128_uint128; - #else - typedef struct FStar_UInt128_uint128_s { -diff --git a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -index f38fda3..7ca67d2 100644 ---- a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -+++ b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -@@ -26,7 +26,8 @@ - #include <stdint.h> - #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ - (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -- (defined(__riscv) && __riscv_xlen == 64)) -+ (defined(__riscv) && __riscv_xlen == 64) || \ -+ defined(__mips64)) - - /* GCC + using native unsigned __int128 support */ - --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index c380c1449..65e1500ae 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -1,4 +1,4 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 +From 8b67c22b057e158f61c9fdd5b01f37195c6f5ca4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 18 Dec 2019 12:29:50 +0100 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto @@ -8,23 +8,26 @@ prior to armv8 does not. Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) + nss/lib/freebl/gcm.c | 2 ++ + 2 files changed, 5 insertions(+) +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index fe8c526..922f67c 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else +@@ -125,6 +125,8 @@ else DEFINES += -DNSS_X86 endif endif -+ +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) + ifdef CC_IS_CLANG + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 +@@ -166,6 +168,7 @@ endif endif endif endif @@ -32,9 +35,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index c2cc18d..b77f573 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #include <limits.h> @@ -42,7 +47,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ +@@ -27,6 +28,7 @@ /* We don't test on big endian platform, so disable this on big endian. */ #define USE_ARM_GCM #endif diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch index d5403397e..3d90e2d95 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -1,4 +1,4 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 +From 8cea16e7550ae14494fbb3a8fe9f5452e6bd1407 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 22 Feb 2017 11:36:11 +0200 Subject: [PATCH] nss: fix support cross compiling @@ -8,13 +8,14 @@ Let some make variables be assigned from outside makefile. Upstream-Status: Inappropriate [configuration] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- nss/coreconf/arch.mk | 2 +- nss/lib/freebl/Makefile | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 +index 790372d..2563134 100644 --- a/nss/coreconf/arch.mk +++ b/nss/coreconf/arch.mk @@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) @@ -27,7 +28,7 @@ index 06c276f..9c1eb51 100644 # diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 +index 52d827c..f99f769 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -36,6 +36,12 @@ ifdef USE_64 @@ -43,6 +44,3 @@ index 0ce1425..ebeb411 100644 ifdef USE_ABI32_FPU DEFINES += -DNSS_USE_ABI32_FPU endif --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch index de812d27b..e87dc9f76 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -1,3 +1,8 @@ +From c5b2c6327f3692ed07bf8d212123e0bf08485722 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss,nspr: Add recipes + clang 3.9 add this warning to rightly flag undefined behavior, we relegate this to be just a warning instead of error and keep the behavior as it was. Right fix would @@ -18,10 +23,14 @@ for more details Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk +--- + nss/coreconf/Werror.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Werror.mk b/nss/coreconf/Werror.mk +index a569a49..687fe58 100644 +--- a/nss/coreconf/Werror.mk ++++ b/nss/coreconf/Werror.mk @@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS ifdef CC_IS_CLANG # -Qunused-arguments : clang objects to arguments that it doesn't understand diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch index 547594d5b..6f02dbcb4 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -1,82 +1,56 @@ -nss: fix incorrect shebang of perl +From 028ec9c7e9f7a6f083eec987f3ad7e7623398d9d Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait <ovidiu.panait@windriver.com> +Date: Mon, 13 Jul 2020 12:12:31 +0300 +Subject: [PATCH] nss: fix incorrect shebang of perl Replace incorrect shebang of perl with `#!/usr/bin/env perl'. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Upstream-Status: Pending +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + --- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) + nss/cmd/signver/examples/1/form.pl | 2 +- + nss/cmd/signver/examples/1/signedForm.pl | 2 +- + nss/cmd/smimetools/smime | 2 +- + nss/coreconf/version.pl | 2 +- + nss/tests/clean_tbx | 2 +- + nss/tests/iopr/server_scr/client.cgi | 2 +- + nss/tests/path_uniq | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime +diff --git a/nss/cmd/signver/examples/1/form.pl b/nss/cmd/signver/examples/1/form.pl +index f2cfddc..af58d54 100755 +--- a/nss/cmd/signver/examples/1/form.pl ++++ b/nss/cmd/signver/examples/1/form.pl @@ -1,4 +1,4 @@ --#!/usr/local/bin/perl +-#! /usr/bin/perl +#!/usr/bin/env perl - # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/signver/examples/1/signedForm.pl b/nss/cmd/signver/examples/1/signedForm.pl +index 847814c..64a31ff 100755 +--- a/nss/cmd/signver/examples/1/signedForm.pl ++++ b/nss/cmd/signver/examples/1/signedForm.pl @@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl +-#! /usr/bin/perl +#!/usr/bin/env perl - # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +index e67f6be..6cd85e6 100755 +--- a/nss/cmd/smimetools/smime ++++ b/nss/cmd/smimetools/smime @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # + # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 +index d2a4942..3ba7323 100644 --- a/nss/coreconf/version.pl +++ b/nss/coreconf/version.pl @@ -1,4 +1,4 @@ @@ -86,7 +60,7 @@ index d2a4942..79359fe 100644 # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 +index 4de9555..c15a069 100755 --- a/nss/tests/clean_tbx +++ b/nss/tests/clean_tbx @@ -1,4 +1,4 @@ @@ -95,8 +69,18 @@ index 4de9555..a7def9f 100755 ####################################################################### # +diff --git a/nss/tests/iopr/server_scr/client.cgi b/nss/tests/iopr/server_scr/client.cgi +index 581ad06..34ea170 100644 +--- a/nss/tests/iopr/server_scr/client.cgi ++++ b/nss/tests/iopr/server_scr/client.cgi +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 +index f29f60a..850332a 100755 --- a/nss/tests/path_uniq +++ b/nss/tests/path_uniq @@ -1,4 +1,4 @@ @@ -105,6 +89,3 @@ index f29f60a..08fbffa 100755 ######################################################################## # --- -1.8.1.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch index 43c09d13e..fbfa828b2 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -1,4 +1,7 @@ -Fix nss multilib build on openSUSE 11.x 32bit +From 2701905e689cf7c1ee7ca2d116f20b5bbc146431 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will fail with error: @@ -16,10 +19,15 @@ Upstream-Status: Pending Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> =================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile + +--- + nss/coreconf/nsinstall/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 08dfbc2..e97fb5f 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile @@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 include $(DEPTH)/coreconf/config.mk @@ -33,4 +41,4 @@ Index: nss-3.24/nss/coreconf/nsinstall/Makefile + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) PROGRAM = - else + TARGETS = diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch index 7661dc93a..7dbc1a372 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -1,12 +1,17 @@ -nss:no rpath for cross compiling +From dc51214895bcd63fc8eb8d1fe7941cd3e5500620 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss:no rpath for cross compiling Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Upstream-Status: Inappropriate [configuration] + --- nss/cmd/platlibs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +index 6401778..e5c4e16 100644 --- a/nss/cmd/platlibs.mk +++ b/nss/cmd/platlibs.mk @@ -18,9 +18,9 @@ endif @@ -21,6 +26,3 @@ diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk endif endif --- -1.8.1.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch index 3a817faaa..5505ae36a 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -1,4 +1,8 @@ -nss does not build on mips with clang because wrong types are used? +From a550bdf458f11dff46ebddbac94cf48c27d3471e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss does not build on mips with clang because wrong types are + used? pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] if (addend < MP_DIGIT_MAX) { @@ -6,11 +10,16 @@ pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in + +--- + nss/lib/freebl/pqg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c +index 626b2fb..052ad36 100644 +--- a/nss/lib/freebl/pqg.c ++++ b/nss/lib/freebl/pqg.c +@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) static SECStatus addToSeed(const SECItem *seed, diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch deleted file mode 100644 index aef91a7c3..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch +++ /dev/null @@ -1,36 +0,0 @@ -Enable uint128 on riscv64 - -Fixes -| verified/kremlin/kremlib/dist/minimal/LowStar_Endianness.h:29:37: error: 'load128_be' declared 'static' but never defined [-Werror=unused-function] -| 29 | inline static FStar_UInt128_uint128 load128_be(uint8_t *x0); -| | ^~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -+++ b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -@@ -56,7 +56,8 @@ typedef const char *Prims_string; - #include <emmintrin.h> - typedef __m128i FStar_UInt128_uint128; - #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ -- (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__)) -+ (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -+ (defined(__riscv) && __riscv_xlen == 64)) - typedef unsigned __int128 FStar_UInt128_uint128; - #else - typedef struct FStar_UInt128_uint128_s { ---- a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -+++ b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -@@ -23,9 +23,10 @@ - #include "FStar_UInt128.h" - #include "FStar_UInt_8_16_32_64.h" - #include "LowStar_Endianness.h" -- -+#include <stdint.h> - #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ -- (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__)) -+ (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -+ (defined(__riscv) && __riscv_xlen == 64)) - - /* GCC + using native unsigned __int128 support */ - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/signlibs.sh b/meta-openembedded/meta-oe/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499f8..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb index 36e6cd8fc..5d9318a92 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb @@ -21,7 +21,6 @@ VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + ' SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ file://nss.pc.in \ - file://signlibs.sh \ file://0001-nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ @@ -32,12 +31,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://system-pkcs11.txt \ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - file://riscv.patch \ - file://0001-Enable-uint128-on-mips64.patch \ " - -SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233" -SRC_URI[sha256sum] = "085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78" +SRC_URI[sha256sum] = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" @@ -60,7 +55,6 @@ do_configure_prepend_libc-musl () { do_compile_prepend_class-native() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 } do_compile_prepend_class-nativesdk() { @@ -74,6 +68,7 @@ do_compile_prepend_class-native() { do_compile() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + export NSS_ENABLE_WERROR=0 export CROSS_COMPILE=1 export NATIVE_CC="${BUILD_CC}" @@ -127,7 +122,8 @@ do_compile() { export CC="${CC} ${CFLAGS}" make -C ./nss CCC="${CXX} -g" \ OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" + RPATH="${RPATH}" \ + autobuild } do_compile[vardepsexclude] += "SITEINFO_BITS" @@ -216,7 +212,6 @@ do_install_append() { touch ${D}/${libdir}/$file chmod 755 ${D}/${libdir}/$file done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh install -d ${D}${libdir}/pkgconfig/ sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc @@ -240,20 +235,17 @@ do_install_append_class-target() { } PACKAGE_WRITE_DEPS += "nss-native" + pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi + for I in $D${libdir}/lib*.chk; do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + shlibsign -i $FN + if [ $? -ne 0 ]; then + echo "shlibsign -i $FN failed" + fi + done } PACKAGES =+ "${PN}-smime" diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch deleted file mode 100644 index 506101711..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 68485f8516884377e54c623b0deff73f97321d96 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" <hongzhi.song@windriver.com> -Date: Thu, 19 Sep 2019 04:32:31 -0400 -Subject: [PATCH] numademo: fix error on 32bit system - -Error Info on 32bit: -root@intel-x86:~# numademo -t -e 1M -Configured Nodes does not match available memory nodes - -That's because sizeof(long)=4Word, but sizeof(long long)=8Word -on 32bit. So (long long) assigning to (long) maybe cause overflow. - -long numa_node_size(int node, long *freep) -{ - ... - long sz = numa_node_size64_int(node, &f2); - ~^^~ - return sz; - ... -} -long long numa_node_size64(int node, long long *freep) -~^^ ^^~ -{ - ... -} - -Unify the return type of above functions. - -Upstream-Status: Accepted [next version is after 2.0.13 or 2.0.14] -[https://github.com/numactl/numactl/commit/a7c4bc790a191d3e42b63850b409c1a72b75a4e1] - Submitted [https://github.com/numactl/numactl/pull/79] -[The first patch was merged but has a error, then the second fix it.] - -Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> ---- - libnuma.c | 4 ++-- - numa.h | 2 +- - numademo.c | 2 +- - test/move_pages.c | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libnuma.c b/libnuma.c -index cac8851..8b5c6aa 100644 ---- a/libnuma.c -+++ b/libnuma.c -@@ -791,10 +791,10 @@ long long numa_node_size64(int node, long long *freep) - - make_internal_alias(numa_node_size64); - --long numa_node_size(int node, long *freep) -+long long numa_node_size(int node, long long *freep) - { - long long f2; -- long sz = numa_node_size64_int(node, &f2); -+ long long sz = numa_node_size64_int(node, &f2); - if (freep) - *freep = f2; - return sz; -diff --git a/numa.h b/numa.h -index 3a8c543..268fb1d 100644 ---- a/numa.h -+++ b/numa.h -@@ -143,7 +143,7 @@ int numa_preferred(void); - - /* Return node size and free memory */ - long long numa_node_size64(int node, long long *freep); --long numa_node_size(int node, long *freep); -+long long numa_node_size(int node, long long *freep); - - int numa_pagesize(void); - -diff --git a/numademo.c b/numademo.c -index a720db0..8c56da8 100644 ---- a/numademo.c -+++ b/numademo.c -@@ -301,7 +301,7 @@ int max_node, numnodes; - int get_node_list(void) - { - int a, got_nodes = 0; -- long free_node_sizes; -+ long long free_node_sizes; - - numnodes = numa_num_configured_nodes(); - node_to_use = (int *)malloc(numnodes * sizeof(int)); -diff --git a/test/move_pages.c b/test/move_pages.c -index d1d8436..f8ff25d 100644 ---- a/test/move_pages.c -+++ b/test/move_pages.c -@@ -26,7 +26,7 @@ int *node_to_use; - int get_node_list() - { - int a, got_nodes = 0, max_node, numnodes; -- long free_node_sizes; -+ long long free_node_sizes; - - numnodes = numa_num_configured_nodes(); - node_to_use = (int *)malloc(numnodes * sizeof(int)); --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb index 20b7fed86..504fe0327 100644 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb @@ -10,15 +10,14 @@ inherit autotools-brokensep ptest LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" -SRCREV = "5d9f16722e3df49dc618a9f361bd482559695db7" -PV = "2.0.13+git${SRCPV}" +SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d" +PV = "2.0.14+git${SRCPV}" SRC_URI = "git://github.com/numactl/numactl \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ file://0001-define-run-test-target.patch \ - file://0001-numademo-fix-error-on-32bit-system.patch \ " S = "${WORKDIR}/git" @@ -26,6 +25,9 @@ S = "${WORKDIR}/git" # ARM does not currently support NUMA COMPATIBLE_HOST = "^((?!arm).*)$" +LDFLAGS_append_riscv64 = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" + do_install() { oe_runmake DESTDIR=${D} prefix=${D}/usr install #remove the empty man2 directory diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch new file mode 100644 index 000000000..d56b8ae67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch @@ -0,0 +1,42 @@ +From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 18 Jun 2020 05:51:38 +0000 +Subject: [PATCH] Make ts module external + +Make ts module external + +Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb + +Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + modules/ts/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt +index f95bed0793..66f315bcca 100644 +--- a/modules/ts/CMakeLists.txt ++++ b/modules/ts/CMakeLists.txt +@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) + ocv_module_disable(ts) + endif() + +-set(OPENCV_MODULE_TYPE STATIC) +-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) +- + if(WINRT) + # WINRT doesn't have access to environment variables + # so adding corresponding macros during CMake run +@@ -16,7 +13,7 @@ endif() + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) + +-ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) ++ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) + + ocv_glob_module_sources() + ocv_module_include_directories() +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch new file mode 100644 index 000000000..c5a64387f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch @@ -0,0 +1,31 @@ +From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Aug 2020 00:36:49 -0700 +Subject: [PATCH] Use -Os to compile tinyxml2.cpp + +This workarounds issue [1] seen on riscv with gcc + +[1] https://github.com/riscv/riscv-gnu-toolchain/issues/624 + +Upstream-Status: Inappropriate [ OE-Specific ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/datasets/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt +index 56ca9e310..99b7a33f6 100644 +--- a/modules/datasets/CMakeLists.txt ++++ b/modules/datasets/CMakeLists.txt +@@ -2,7 +2,7 @@ set(the_description "datasets framework") + + set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC ++ ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang + endif() +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch deleted file mode 100644 index 20d54d407..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 78e2fc167fd27ab17175dcfd6eccf6f74bd5e1c7 Mon Sep 17 00:00:00 2001 -From: Bian Naimeng <biannm@cn.fujitsu.com> -Date: Wed, 19 Apr 2017 03:11:37 +0900 -Subject: [PATCH] Make opencv-ts create share library intead of static. - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> - ---- - modules/ts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index f95bed0793..ee67858df8 100644 ---- a/modules/ts/CMakeLists.txt -+++ b/modules/ts/CMakeLists.txt -@@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) - ocv_module_disable(ts) - endif() - --set(OPENCV_MODULE_TYPE STATIC) -+#set(OPENCV_MODULE_TYPE STATIC) - set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) - - if(WINRT) diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb index 2587b189c..c83186de0 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "01b2c5a77ca6dbef3baef24ebc0a5984579231d9" -SRCREV_contrib = "e6f32c6a69043456a806a4e802ee3ce7b7059c93" +SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" +SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" @@ -44,13 +44,13 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ file://download.patch \ + file://0001-Make-ts-module-external.patch \ " -PV = "4.3.0" +SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" S = "${WORKDIR}/git" @@ -80,6 +80,8 @@ do_unpack_extra() { } addtask unpack_extra after do_unpack before do_patch +CMAKE_VERBOSE = "VERBOSE=1" + EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DWITH_1394=OFF \ -DENABLE_PRECOMPILED_HEADERS=OFF \ @@ -197,6 +199,13 @@ RDEPENDS_python3-opencv = "python3-core python3-numpy" RDEPENDS_${PN}-apps = "bash" +do_compile_prepend() { + # remove the build host info to improve reproducibility + if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then + sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc + fi +} + do_install_append() { # Move Python files into correct library folder (for multilib build) if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then @@ -204,3 +213,5 @@ do_install_append() { rm -rf ${D}/usr/lib fi } + +TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.51.bb index b62b13a44..d2c574608 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.51.bb @@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ file://remove-user-host-pwd-from-version.patch \ " -SRC_URI[md5sum] = "f9ed44ef373abed04c9e4c8586260f9e" -SRC_URI[sha256sum] = "5cb57d958bf5c55a678c6a0f06821e0e5504d5a92e6a33240841fbca1db586b8" +SRC_URI[md5sum] = "0d2025896cf1c17af7304ecc57ec9531" +SRC_URI[sha256sum] = "f490775ea4c6506b7210ee55a102c8f4aacfe9d1c8eaa633c7316d33a714be62" DEPENDS = "util-linux groff-native" @@ -172,9 +172,9 @@ FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" -FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp ${localstatedir}/run ${localstatedir}/volatile/run" +FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" FILES_${PN}-bin = "${bindir}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" do_install_append() { diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb index 91d77ac93..6f38d65e0 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb @@ -14,8 +14,8 @@ SRC_URI = "\ https://pcsclite.apdu.fr/files/${BP}.tar.bz2 \ file://0001-pcsc-spy-use-python3-only.patch \ " -SRC_URI[md5sum] = "9d36882998449daceec267c68a21ff0d" -SRC_URI[sha256sum] = "3eb7be7d6ef618c0a444316cf5c1f2f9d7227aedba7a192f389fe3e7c0dfbbd9" +SRC_URI[md5sum] = "eb595f2d398ff229207a6ec09fbc4e98" +SRC_URI[sha256sum] = "0148d403137124552c5d0f10f8cdab2cbb8dfc7c6ce75e018faf667be34f2ef9" inherit autotools systemd pkgconfig perlnative diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb new file mode 100644 index 000000000..bc82e49ea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb @@ -0,0 +1,16 @@ +SUMMARY = "Some tools to be used with smart cards and PC/SC" +HOMEPAGE = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https" + +SRCREV = "34ac207adbba0d1a951b314c1676610a1d0bba01" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +DEPENDS = "pcsc-lite" + +FILES_${PN} += "${datadir}/pcsc/smartcard_list.txt" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 092e6059b..277d12057 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -8,10 +8,10 @@ DEPENDS = "pidgin json-glib glib-2.0 zlib" inherit pkgconfig SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=git" -SRCREV = "14f1b69b6292bbdc98cca484b050ec8359394c4e" +SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" S = "${WORKDIR}/git" -PV = "1.5+git${SRCPV}" +PV = "1.7+git${SRCPV}" do_compile() { oe_runmake -C skypeweb; diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch index 3d6d7a8f1..4a18ba350 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch @@ -5,6 +5,9 @@ Subject: [PATCH 3/3] Minic GNU basename() API for non-glibc library e.g. musl Upstream-Status: Pending +Rework for poppler 0.90.1 +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> --- @@ -12,7 +15,7 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 1 file changed, 4 insertions(+) diff --git a/goo/gbasename.cc b/goo/gbasename.cc -index 830c1c80..e93eb368 100644 +index 69236d8..3858415 100644 --- a/goo/gbasename.cc +++ b/goo/gbasename.cc @@ -46,6 +46,10 @@ @@ -23,9 +26,9 @@ index 830c1c80..e93eb368 100644 +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + - std::string gbasename(const char* filename) + std::string gbasename(const char *filename) { #ifdef _MSC_VER -- -2.17.0 +2.21.3 diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.88.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb index d6a27f923..0f04b88f2 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.88.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb @@ -7,8 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[md5sum] = "d9aafddce4c079c9ebc7405e42ac25ba" -SRC_URI[sha256sum] = "b4453804e9a5a519e6ceee0ac8f5efc229e3b0bf70419263c239124474d256c7" +SRC_URI[sha256sum] = "434ecbbb539c1a75955030a1c9b24c7b58200b7f68d2e4269e29acf2f8f13336" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch new file mode 100644 index 000000000..5147f17c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch @@ -0,0 +1,44 @@ +From 9da8eb6663d0ba046bc0570172c549d421de043a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 23:39:32 -0700 +Subject: [PATCH] get-edid: define quiet once + +Fixes build with gcc 10 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + get-edid/classic.c | 2 +- + get-edid/i2c.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/get-edid/classic.c b/get-edid/classic.c +index 9cc8ee3..b13f5f0 100644 +--- a/get-edid/classic.c ++++ b/get-edid/classic.c +@@ -26,7 +26,7 @@ typedef byte* real_ptr; + #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length) + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } +-int quiet; ++extern int quiet; + + real_ptr far_ptr_to_real_ptr( uint32 farptr ) + { +diff --git a/get-edid/i2c.c b/get-edid/i2c.c +index 625d7cb..0929e98 100644 +--- a/get-edid/i2c.c ++++ b/get-edid/i2c.c +@@ -15,7 +15,7 @@ + + //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys. + +-int quiet; ++extern int quiet; + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb index e4c2cadc2..1aa492c31 100644 --- a/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=292c42e2aedc4af636636bf7af0e2b26" SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \ file://0001-Do-not-install-license-file.patch \ + file://0001-get-edid-define-quiet-once.patch \ " SRC_URI[md5sum] = "016546e438bf6c98739ff74061df9854" SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb index 3c93493f7..661673d6b 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb @@ -11,7 +11,7 @@ LDFLAGS_append_libc-musl = " -lexecinfo" SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ " -SRC_URI[sha256sum] = "3ed23be326be0bf3c98428c1b4f4c948c1ded2048bd27f107380e12574797930" +SRC_URI[sha256sum] = "7614d447dc588403aff2ff97b253f46c5f03a6347d024618e84490b8ab4cd87b" S = "${WORKDIR}/Remmina-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index efe95b101..33f5dccca 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -13,15 +13,17 @@ RDEPENDS_${PN} = "rsync \ perl-module-getopt-std \ perl-module-file-path \ perl-module-file-stat \ + perl-module-file-spec \ perl-module-posix \ perl-module-fcntl \ perl-module-io-file \ perl-module-constant \ perl-module-overloading \ + perl-module-ipc-open3 \ " -SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4" -PV = "1.4.2+git${SRCPV}" +SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" +PV = "1.4.3+git${SRCPV}" SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ file://configure-fix-cmd_rsync.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb index d893be223..9cba3a890 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools SRC_URI = "git://github.com/sass/libsass.git;branch=master" -SRCREV = "e1c16e09b4a953757a15149deaaf28a3fd81dc97" +SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396" +PV = "3.6.4" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.31.bb index fbf018d7f..e99f8ac6a 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.31.bb @@ -10,13 +10,16 @@ inherit autotools-brokensep python3native pkgconfig SRC_URI = "git://github.com/abrt/satyr.git \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " -SRCREV = "8b5547b89b712b39a59f1d8b366e7de0f5f46108" +SRCREV = "79506592fa61fa10aa2e186158eecfa10b39e905" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS += " \ gdb \ + gperf-native \ + json-c \ + nettle \ " PACKAGES += "python3-${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch new file mode 100644 index 000000000..9e2ebe756 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch @@ -0,0 +1,98 @@ +From b7dd97708b9d0ed09d8d7ac435f8b25eadbf6487 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=83=C2=ADsa=C3=85=E2=84=A2?= <address@hidden> +Date: Thu, 13 Aug 2020 11:20:38 -0700 +Subject: [PATCH 1/2] Fix building with GCC 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 10 defaults to -fno-common that results into errors on multiple +global variable definitions: + +/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: +shar-opts.o:(.data.rel.ro.local+0x0): multiple definition of +`program_name'; shar.o:(.rodata+0x10): first defined here + +This patch fixes it by changing the definitions in header files into extern +declarations. + +<https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00001.html> + +Signed-off-by: Petr PÃsaÅ™ <address@hidden> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/shar-opts.h | 2 +- + src/shar-std.def | 2 +- + src/unshar-opts.h | 2 +- + src/uudecode-opts.h | 2 +- + src/uuencode-opts.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/shar-opts.h b/src/shar-opts.h +index 172676f..f6e4e79 100644 +--- a/src/shar-opts.h ++++ b/src/shar-opts.h +@@ -352,7 +352,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + extern bool initialization_done; + extern int optidx; +diff --git a/src/shar-std.def b/src/shar-std.def +index ed06b77..a28f61c 100644 +--- a/src/shar-std.def ++++ b/src/shar-std.def +@@ -41,7 +41,7 @@ no-misuse-usage; + usage-message; + die-code; + +-export = '#include "local.h"'"\nchar const * const program_name;"; ++export = '#include "local.h"'"\nextern char const * const program_name;"; + + #shell + echo "include = 'char const * const program_name = \"${progname}\";';" +diff --git a/src/unshar-opts.h b/src/unshar-opts.h +index 568ffca..aa85833 100644 +--- a/src/unshar-opts.h ++++ b/src/unshar-opts.h +@@ -192,7 +192,7 @@ extern "C" { + extern size_t separator_str_len; + + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +diff --git a/src/uudecode-opts.h b/src/uudecode-opts.h +index 5b74419..289a366 100644 +--- a/src/uudecode-opts.h ++++ b/src/uudecode-opts.h +@@ -170,7 +170,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +diff --git a/src/uuencode-opts.h b/src/uuencode-opts.h +index 1a5b7bc..f2df0a8 100644 +--- a/src/uuencode-opts.h ++++ b/src/uuencode-opts.h +@@ -166,7 +166,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch new file mode 100644 index 000000000..d4a8d6fba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch @@ -0,0 +1,40 @@ +From ab981e1a973e83edb6ea19e6e84102f43ded0dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Aug 2020 11:22:40 -0700 +Subject: [PATCH 2/2] Do not include lib/md5.c into src/shar.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ib/md5.o is part of libgnu.a that is linked to shar. There is no +point in linking md5.o twice into shar executable. Moreover SuSE +reports that this triggers a linking error with GCC 10: + +/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: +../lib/libgnu.a(md5.o): in function `md5_stream': +[ 30s] md5.c:(.text+0x15d): multiple definition of `md5_stream'; +shar.o:shar.c:(.text+0x28): first defined here + +<https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00001.html> + +Signed-off-by: Petr PÃsaÅ™ <address@hidden> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/shar.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/shar.c b/src/shar.c +index 11cbada..6d7ed1d 100644 +--- a/src/shar.c ++++ b/src/shar.c +@@ -53,7 +53,6 @@ static const char cright_years_z[] = + + #include "inttostr.h" + #include "liballoca.h" +-#include "md5.c" + #include "md5.h" + #include "quotearg.h" + #include "xalloc.h" +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb index 930922ed4..8bbc6815e 100644 --- a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb @@ -4,12 +4,14 @@ SECTION = "console/utils" LICENSE="GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -inherit gettext autotools +inherit gettext autotools update-alternatives SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Fix-build-with-clang.patch \ file://CVE-2018-1000097.patch \ file://0001-Fix-build-with-recent-gettext.patch \ + file://0001-Fix-building-with-GCC-10.patch \ + file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ " SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" @@ -23,3 +25,7 @@ do_install_append() { } BBCLASSEXTEND = "native nativesdk" + +ALTERNATIVE_${PN} = "uudecode uuencode" +ALTERNATIVE_LINK_NAME[uudecode] = "${bindir}/uudecode" +ALTERNATIVE_LINK_NAME[uuencode] = "${bindir}/uuencode" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb index 39629cce0..7d28fff5e 100644 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb @@ -3,14 +3,16 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRCREV = "cf6f1dd01e660d5865d68bf5fa78f6376b89470a" +SRCREV = "cbe9448650176797739dbab13961ef4c07f4290f" SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" +DEPENDS += "fmt" + S = "${WORKDIR}/git" BBCLASSEXTEND = "native" # no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off" +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb index 625756873..06fb82b85 100644 --- a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb @@ -4,9 +4,9 @@ AUTHOR = "Christophe BLAESS" LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -BPV = "0.8.4" +BPV = "0.8.5" PV = "${BPV}" -SRCREV = "4a36a84f7df291ddaebd397aecf0c8515256a8e0" +SRCREV = "3c93b9038a7c4d9de4302ab6f14372e9fa381f3c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index ff6d9d26a..2b38f4d69 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -131,10 +131,6 @@ RDEPENDS_${PN} += "${PN}-libs" CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" -# syslog initscript is handled explicitly because order of -# update-rc.d and update-alternatives is important -RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" - RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" RCONFLICTS_${PN}-libs = "busybox-syslog sysklogd rsyslog" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch new file mode 100644 index 000000000..91d10cb7a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch @@ -0,0 +1,30 @@ +From f56eeb18a07df139864a99e1967d450cc5c8c0bb Mon Sep 17 00:00:00 2001 +From: Lee Chee Yang <chee.yang.lee@intel.com> +Date: Wed, 30 Sep 2020 16:18:35 +0800 +Subject: [PATCH] improve reproducibility + +remove the WORKDIR info from BUILD_COMMAND to improve reproducibility. +also use SOURCE_DATE_EPOCH as DATETIME wherever possible. + +Upstream-Status: Inappropriate [sed WORKDIR does not applies to upstream] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> +--- + build/version_info_linux.sh | 4 +- + 1 file changed, 2 insertion(+), 2 deletion(-) + +diff --git a/build/version_info_linux.sh b/build/version_info_linux.sh +index 793cad11..ed6f4b2a 100644 +--- a/build/version_info_linux.sh ++++ b/build/version_info_linux.sh +@@ -25,6 +25,6 @@ echo '#N": BUILD_GCC'"\t\t"`g++ --version </dev/null 2>&1 | grep 'g++'`'" ENDL \ + echo '#N": BUILD_LIBC'"\t"`getconf GNU_LIBC_VERSION | grep glibc | sed -e 's/^glibc //'`'" ENDL \' + echo '#N": BUILD_LD'"\t\t"`ld -v 2>&1 | grep 'version'`'" ENDL \' + echo '#N": BUILD_TARGET'"\t$arch on $runtime"'" ENDL \' +-echo '#N": BUILD_COMMAND'"\t"$*'" ENDL \' ++echo '#N": BUILD_COMMAND'"\t"$(echo $* | sed 's#'$WORKDIR'#/workdir#g')'" ENDL \' + echo "" +-echo "#define __TBB_DATETIME \""`date -u`"\"" ++echo "#define __TBB_DATETIME \""`$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u )`"\"" +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb index 2f9fd7f58..8e0094b31 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb @@ -7,12 +7,13 @@ HOMEPAGE = "https://software.intel.com/en-us/tbb" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" BRANCH = "tbb_2020" -SRCREV = "60b7d0a78f8910976678ba63a19fdaee22c0ef65" +SRCREV = "eca91f16d7490a8abfdee652dadf457ec820cc37" SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ file://cross-compile.patch \ file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ file://GLIBC-PREREQ-is-not-defined-on-musl.patch \ file://tbb.pc \ + file://improve-reproducibility.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb b/meta-openembedded/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb new file mode 100644 index 000000000..4a595e643 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb @@ -0,0 +1,9 @@ +SUMMARY = "uchardet is an encoding detector library" +LICENSE = "MPLv1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474" + +inherit cmake + +SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.7.tar.xz" +SRC_URI[md5sum] = "623406dac5c5ad89e40eedd7f279efae" +SRC_URI[sha256sum] = "3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb index ecaf01e71..196198c52 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb @@ -3,14 +3,15 @@ LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" DEPENDS = " \ + glib-2.0-native \ + libxslt-native \ acl \ libatasmart \ polkit \ libgudev \ - dbus-glib \ glib-2.0 \ + dbus-glib \ libblockdev \ - libxslt-native \ " DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -19,13 +20,13 @@ RDEPENDS_${PN} = "acl" SRC_URI = " \ git://github.com/storaged-project/udisks.git;branch=master \ " -PV = "2.8.4+git${SRCREV}" -SRCREV = "db5f487345da2eaa87976450ea51c2c465d9b82e" +PV = "2.9.1" +SRCREV = "95444ab6bf2b8d8c205b540dded4029fcb15f91b" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -inherit autotools systemd gtk-doc gobject-introspection gettext features_check +inherit autotools-brokensep systemd gtk-doc gobject-introspection gettext features_check REQUIRED_DISTRO_FEATURES = "polkit" diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb index b294d77ba..fb60446cb 100644 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb @@ -6,7 +6,7 @@ DEPENDS = "libusb1" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "c9fa3c68a1b2c9790c731602b8bae2b513e80605" +SRCREV = "5ee8260c71647f687b5e71af11f45244814835d7" SRC_URI = "git://github.com/mvp/${BPN}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb index 640841792..d6c89a65d 100644 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb @@ -10,7 +10,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" -inherit autotools pkgconfig gettext gobject-introspection systemd features_check +inherit autotools pkgconfig gettext gobject-introspection systemd PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" diff --git a/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb index da52bb5a3..d02cf5de8 100644 --- a/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb @@ -2,11 +2,10 @@ SUMMARY = "RFC 3986 compliant URI parsing library" HOMEPAGE = "https://uriparser.github.io" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=fc3bbde670fc6e95392a0e23bf57bda0" +LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "9874b64f6f4ff656f3f69598e38f12b7" -SRC_URI[sha256sum] = "6cef39d6eaf1a48504ee0264ce85f078758057dafb1edd0a898183b55ff76014" +SRC_URI[sha256sum] = "095e8a358a9ccbbef9d1f10d40495ca0fcb3d4490a948ba6449b213a66e08ef0" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb index 938c0f9c2..ca970e59b 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -11,9 +11,9 @@ SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17" SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d } RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)" -FILES_${PN} += "${base_libdir}/udev/rules.d/ \ +FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ \ ${datadir}/usb_modeswitch" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb index baad34090..6a5287af4 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb @@ -19,7 +19,7 @@ RDEPENDS_${PN} = "tcl" RRECOMMENDS_${PN} = "usb-modeswitch-data" do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} UDEVDIR=${D}/${nonarch_base_libdir}/udev install if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index 7c5a73439..a5a881d1f 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -14,6 +14,6 @@ SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" PV = "1.0.6+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 1ebebfa9f..ca74d911f 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -18,4 +18,4 @@ SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" PV = "1.1.2+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 5f07bf28e..04d1f3fc7 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -16,4 +16,4 @@ DEPENDS += "mtdev utouch-frame utouch-evemu libx11" PV = "1.1.7+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb index 89b1ee11e..9282f663b 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb @@ -14,10 +14,11 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ " -SRC_URI[md5sum] = "fe6328d22dfb20ea372daa4b58b12374" -SRC_URI[sha256sum] = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f" +SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe" +SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1" -S = "${WORKDIR}/vbox_module" +S ?= "${WORKDIR}/vbox_module" +S_task-patch = "${WORKDIR}/${VBOX_NAME}" export BUILD_TARGET_ARCH="${ARCH}" export BUILD_TARGET_ARCH_x86-64="amd64" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb index 20c7b2d37..93b0d6a67 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb @@ -32,7 +32,7 @@ inherit autotools-brokensep ptest pkgconfig PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" PACKAGECONFIG[gnutls] = ",,gnutls" PACKAGECONFIG[libgcrypt] = ",,libgcrypt" -PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},,nss nspr" +PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},--with-nss=no --with-nspr=no,nss nspr" PACKAGECONFIG[openssl] = ",,openssl" PACKAGECONFIG[des] = ",--disable-des,," diff --git a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb index 865adc5a1..e437d4d15 100644 --- a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb @@ -3,12 +3,12 @@ DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ working at speeds close to RAM limits." HOMEPAGE = "http://www.xxhash.com/" LICENSE = "BSD-2-Clause & GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=01a7eba4212ef1e882777a38585e7a9b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb" -SRC_URI = "git://github.com/Cyan4973/xxHash.git" +SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=git" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" -SRCREV = "d408e9b0606d07b1ddc5452ffc0ec8512211b174" +SRCREV = "94e5f23e736f2bb67ebdf90727353e65344f9fc0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb index 935e09cd5..181d7ae43 100644 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb @@ -1,4 +1,4 @@ -DESRIPTION = "2D barcode scanner toolkit." +DESCRIPTION = "2D barcode scanner toolkit." SECTION = "graphics" LICENSE = "LGPL-2.1" diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch deleted file mode 100644 index 64e0e8ed6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier <pjtexier@koncepto.io> -Date: Thu, 23 Jan 2020 19:14:40 +0100 -Subject: [PATCH 1/2] zck.h: fix build on musl - -The ssize_t type requires the <sys/types.h> header. This fixes build with musl -libc: - -include/zck.h:68:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? - 68 | ssize_t zck_read(zckCtx *zck, char *dst, size_t dst_size) - | ^~~~~~~ - | size_t -include/zck.h:81:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? - 81 | ssize_t zck_write(zckCtx *zck, const char *src, const size_t src_size) - | ^~~~~~~ - | size_t - -Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23] - -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - include/zck.h.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/zck.h.in b/include/zck.h.in -index 91d2557..b847576 100644 ---- a/include/zck.h.in -+++ b/include/zck.h.in -@@ -5,6 +5,7 @@ - - #include <stdlib.h> - #include <stdbool.h> -+#include <sys/types.h> - - typedef enum zck_hash { - ZCK_HASH_SHA1, --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch deleted file mode 100644 index a1c95bf36..000000000 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 72c55e3da59eccdfea3778d11f83862b58af723d Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier <pjtexier@koncepto.io> -Date: Thu, 23 Jan 2020 22:42:40 +0100 -Subject: [PATCH 2/2] unzck: fix build with musl libc - -On musl libc "stdout" is a preprocessor macro whose expansion leads to -compilation errors. - -Fixes: - -| In file included from ../git/src/unzck.c:31: -| ../git/src/unzck.c: In function 'parse_opt': -| ../git/src/unzck.c:78:24: error: expected identifier before '(' token -| 78 | arguments->stdout = true; -| | ^~~~~~ -| ../git/src/unzck.c: In function 'main': -| ../git/src/unzck.c:141:20: error: expected identifier before '(' token -| 141 | if(!(arguments.stdout)) { -| | ^~~~~~ - -Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23] - -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - src/unzck.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/unzck.c b/src/unzck.c -index 8d6c62a..002492c 100644 ---- a/src/unzck.c -+++ b/src/unzck.c -@@ -58,7 +58,7 @@ struct arguments { - char *args[1]; - zck_log_type log_level; - bool dict; -- bool stdout; -+ bool stdOut; - bool exit; - }; - -@@ -75,7 +75,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { - arguments->log_level = ZCK_LOG_DDEBUG; - break; - case 'c': -- arguments->stdout = true; -+ arguments->stdOut = true; - break; - case 'V': - version(); -@@ -138,7 +138,7 @@ int main (int argc, char *argv[]) { - snprintf(out_name + strlen(base_name) - 4, 7, ".zdict"); - - int dst_fd = STDOUT_FILENO; -- if(!arguments.stdout) { -+ if(!arguments.stdOut) { - dst_fd = open(out_name, O_TRUNC | O_WRONLY | O_CREAT, 0666); - if(dst_fd < 0) { - dprintf(STDERR_FILENO, "Unable to open %s", out_name); --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb index f75412f49..e041132b1 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb @@ -4,13 +4,9 @@ AUTHOR = "Jonathan Dieter" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" -SRC_URI = " \ - git://github.com/zchunk/zchunk.git;protocol=https \ - file://0001-zck.h-fix-build-on-musl.patch \ - file://0002-unzck-fix-build-with-musl-libc.patch \ - " +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" -SRCREV = "c01bf12feede792982f165f52f4a6c573e3a8c17" +SRCREV = "f5593aa11584faa691c81b4898f0aaded47f8bf7" S = "${WORKDIR}/git" DEPENDS = "\ diff --git a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb index 3b846c151..acd491498 100644 --- a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb @@ -20,6 +20,6 @@ do_install_append() { } PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" +PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |