diff options
Diffstat (limited to 'meta-openembedded/meta-oe')
43 files changed, 778 insertions, 397 deletions
diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index adcec83029..5bf1f6cfd9 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -43,7 +43,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses" PREFERRED_RPROVIDER_libdevmapper = "lvm2" SIGGEN_EXCLUDERECIPES_ABISAFE += " \ - mplayer-common \ fbset-modes \ gpsd-machine-conf \ distro-feed-configs \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 69bc788a86..2aee5975d7 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1 +1 @@ -RDEPENDS_packagegroup-meta-oe-support += "debsums" +RDEPENDS_packagegroup-meta-oe-support += "debsums rasdaemon" diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch new file mode 100644 index 0000000000..0164321312 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch @@ -0,0 +1,44 @@ +From 18786db1ad03716267927d983c83275469a1478a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 May 2020 12:27:19 -0700 +Subject: [PATCH] Fix system header includes + +Use poll.h instead of sys/poll.h +Fixes +warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp] + +Include limits.h for PATH_MAX + +Fixes +ras-events.c:359:16: error: 'PATH_MAX' undeclared (first use in this function) + 359 | char pipe_raw[PATH_MAX]; + | ^~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ras-events.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ras-events.c b/ras-events.c +index 511c93d..400e740 100644 +--- a/ras-events.c ++++ b/ras-events.c +@@ -18,13 +18,14 @@ + #include <dirent.h> + #include <errno.h> + #include <fcntl.h> ++#include <limits.h> ++#include <poll.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <unistd.h> + #include <sys/stat.h> + #include <sys/types.h> +-#include <sys/poll.h> + #include <signal.h> + #include <sys/signalfd.h> + #include "libtrace/kbuffer.h" +-- +2.26.2 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/init b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/init new file mode 100644 index 0000000000..216677e73e --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/init @@ -0,0 +1,43 @@ +#! /bin/sh +# /etc/init.d/rasdaemon: start rasdaemon service + +. /etc/init.d/functions + +# Defaults +PIDFILE=/var/run/rasdaemon.pid +BINFILE=/usr/sbin/rasdaemon +SCRIPTNAME=/etc/init.d/rasdaemon + +[ -x $BINFILE ] || exit 0 + +case "$1" in + start) + echo -n "Starting RASdaemon services: " + if [ ! -f "$PIDFILE" ]; then + start-stop-daemon --start --quiet --exec $BINFILE -- --enable &> /dev/null + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $BINFILE -- --record + pidof $BINFILE > $PIDFILE + fi + [ -f $PIDFILE ] && echo "done." || echo "fail." + ;; + stop) + echo -n "Stopping RASdaemon services: " + if [ -f "$PIDFILE" ] ; then + start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $BINFILE -- --disable &> /dev/null + killproc $BINFILE + rm $PIDFILE + fi + [ ! -f $PIDFILE ] && echo "done." || echo "fail." + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + status) + status $BINFILE + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|status}" + exit 1 +esac diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/rasdaemon.service b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/rasdaemon.service new file mode 100644 index 0000000000..4fbf23142a --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/rasdaemon.service @@ -0,0 +1,12 @@ +[Unit] +Description=RAS daemon to log the RAS events +After=syslog.target + +[Service] +ExecStart=/usr/sbin/rasdaemon -f -r +ExecStartPost=/usr/sbin/rasdaemon --enable +ExecStop=/usr/sbin/rasdaemon --disable +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.5.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.5.bb new file mode 100644 index 0000000000..93f624882d --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.5.bb @@ -0,0 +1,55 @@ +DESCRIPTION = "Tools to provide a way to get Platform Reliability, Availability and Serviceability (RAS) reports made via the Kernel tracing events" +HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" + +SRC_URI = "git://git.infradead.org/users/mchehab/rasdaemon.git;branch=master \ + file://0001-Fix-system-header-includes.patch \ + file://rasdaemon.service \ + file://init" + +SRCREV = "25533c0c55426eeb2ad25dcbdb2b5e4ba4e83d80" + +S = "${WORKDIR}/git" + +RDEPENDS_${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ + perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl" + +inherit autotools pkgconfig update-rc.d systemd + +PACKAGECONFIG ??= "sqlite3 mce aer extlog devlink diskerror" +PACKAGECONFIG[sqlite3] = "--enable-sqlite3,--disable-sqlite3,sqlite3" +PACKAGECONFIG[mce] = "--enable-mce,--disable-mce" +PACKAGECONFIG[aer] = "--enable-aer,--disable-aer" +PACKAGECONFIG[extlog] = "--enable-extlog,--disable-extlog" +PACKAGECONFIG[devlink] = "--enable-devlink,--disable-devlink" +PACKAGECONFIG[diskerror] = "--enable-diskerror,--disable-diskerror" +PACKAGECONFIG[arm] = "--enable-arm,--disable-arm" +PACKAGECONFIG[hisi-ns-decode] = "--enable-hisi-ns-decode,--disable-hisi-ns-decode" +PACKAGECONFIG[non-standard] = "--enable-non-standard,--disable-non-standard" +PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report" + +DEPENDS_append_libc-musl = " argp-standalone" +LDFLAGS_append_libc-musl = " -largp" + +do_configure_prepend () { + ( cd ${S}; autoreconf -vfi ) +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system +} + +FILES_${PN} += "${sbindir}/rasdaemon \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/rasdaemon.service" + +SYSTEMD_SERVICE_${PN} = "rasdaemon.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "rasdaemon" +INITSCRIPT_PARAMS_${PN} = "defaults 89" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.7.bb index 10ac03ef06..4911b3d803 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.7.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "ad97f4f945b828425ff288e905523e11b330d41d" +SRCREV = "ef6084dcb4fe2e00327bb9c7b113ece204042c22" S = "${WORKDIR}/git" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb index 124b0f1b00..6f8638544e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb @@ -14,7 +14,8 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "c793db2c91d7928160341b357b26315d9c879ecb36699cb7a6b36054cba60893" +SRC_URI[md5sum] = "7e6e49fddb9ae2b6fcde14619d6cfe49" +SRC_URI[sha256sum] = "2d3b91a2b8a882b17b16403c9ef7bdce522db4f0ceaa3e4dff76033885428b69" PACKAGECONFIG ??= "udev mbim" PACKAGECONFIG[udev] = ",--without-udev,libgudev" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb index 47a86b9194..deab6f0466 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb @@ -14,7 +14,7 @@ DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "68b53d0615ba0d3e2bbf386ed029dfe644a6a30a79ab8d85523527bb4e713aff" +SRC_URI[sha256sum] = "b2b3058bbb72adf98b24707fdbebe58e590644a38145e30d574f685f154bf8aa" S = "${WORKDIR}/ModemManager-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.8.bb index 0df134eca6..4a91fa4f4d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.8.bb @@ -9,8 +9,9 @@ DEPENDS = "gensio libyaml" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[md5sum] = "52c5e56d2d54ced0cdeb764a7e8fec92" -SRC_URI[sha256sum] = "df904d271eb161c265c956f0cb938dd0a375dda4a919a344f73b08bc50b9f308" +SRC_URI[sha256sum] = "cffb5147021202b064eb0a9389d0db63d1bb2dcde5a896f7785f97b1b5f51a72" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch b/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch new file mode 100644 index 0000000000..130ead0842 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch @@ -0,0 +1,40 @@ +From 73ee7e68402a77287054df779f0e44ae1a4f9f0b Mon Sep 17 00:00:00 2001 +From: Leon Anavi <leon.anavi@konsulko.com> +Date: Mon, 11 May 2020 17:01:35 +0000 +Subject: [PATCH] configure.ac: Fix no libsystemd-daemon + +Replace libsystemd-daemon with libsystemd. + +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> +--- + configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index df8cb5007..9a6fb9b2e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,10 +249,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], + [Add support for systemd startup notification (default is autodetected)]), + [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) + AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ +- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], ++ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], + [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], + [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], +- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] ++ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] + )] + ) + ]) +@@ -558,7 +558,6 @@ if test "x$enable_nls" = "xyes" ; then + GETTEXT_PACKAGE=transmission-gtk + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) +- AM_GLIB_GNU_GETTEXT + transmissionlocaledir='${prefix}/${DATADIRNAME}/locale' + AC_SUBST(transmissionlocaledir) + fi +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/transmission-daemon b/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/transmission-daemon new file mode 100644 index 0000000000..d1ffff58b0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/transmission-daemon @@ -0,0 +1,163 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: transmission-daemon +# Required-Start: networking +# Required-Stop: networking +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the transmission BitTorrent daemon client. +### END INIT INFO + +# Original Author: Lennart A. JÃŒtte, based on Rob Howell's script +# Modified by Maarten Van Coile & others (on IRC) + +# Do NOT "set -e" + +# +# ----- CONFIGURATION ----- +# +# For the default location Transmission uses, visit: +# http://trac.transmissionbt.com/wiki/ConfigFiles +# For a guide on how set the preferences, visit: +# http://trac.transmissionbt.com/wiki/EditConfigFiles +# For the available environement variables, visit: +# http://trac.transmissionbt.com/wiki/EnvironmentVariables +# +# The name of the user that should run Transmission. +# It's RECOMENDED to run Transmission in it's own user, +# by default, this is set to 'transmission'. +# For the sake of security you shouldn't set a password +# on this user +USERNAME=transmission + + +# ----- *ADVANCED* CONFIGURATION ----- +# Only change these options if you know what you are doing! +# +# The folder where Transmission stores the config & web files. +# ONLY change this you have it at a non-default location +#TRANSMISSION_HOME="/var/config/transmission-daemon" +#TRANSMISSION_WEB_HOME="/usr/share/transmission/web" +# +# The arguments passed on to transmission-daemon. +# ONLY change this you need to, otherwise use the +# settings file as per above. +#TRANSMISSION_ARGS="" + + +# ----- END OF CONFIGURATION ----- +# +# PATH should only include /usr/* if it runs after the mountnfs.sh script. +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +DESC="bittorrent client" +NAME=transmission-daemon +DAEMON=$(which $NAME) +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +[ -f /etc/default/rcS ] && . /etc/default/rcS + +# +# Function that starts the daemon/service +# + +do_start() +{ + # Export the configuration/web directory, if set + if [ -n "$TRANSMISSION_HOME" ]; then + export TRANSMISSION_HOME + fi + if [ -n "$TRANSMISSION_WEB_HOME" ]; then + export TRANSMISSION_WEB_HOME + fi + + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --chuid $USERNAME --start --pidfile $PIDFILE --make-pidfile \ + --exec $DAEMON --background --test -- -f $TRANSMISSION_ARGS > /dev/null \ + || return 1 + start-stop-daemon --chuid $USERNAME --start --pidfile $PIDFILE --make-pidfile \ + --exec $DAEMON --background -- -f $TRANSMISSION_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/10/KILL/5 --pidfile $PIDFILE --exec $DAEMON + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + + return "$RETVAL" +} + +case "$1" in + start) + echo "Starting $DESC" "$NAME..." + do_start + case "$?" in + 0|1) echo " Starting $DESC $NAME succeeded" ;; + *) echo " Starting $DESC $NAME failed" ;; + esac + ;; + stop) + echo "Stopping $DESC $NAME..." + do_stop + case "$?" in + 0|1) echo " Stopping $DESC $NAME succeeded" ;; + *) echo " Stopping $DESC $NAME failed" ;; + esac + ;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + echo "Restarting $DESC $NAME..." + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0|1) echo " Restarting $DESC $NAME succeeded" ;; + *) echo " Restarting $DESC $NAME failed: couldn't start $NAME" ;; + esac + ;; + *) + echo " Restarting $DESC $NAME failed: couldn't stop $NAME" ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 3 + ;; +esac diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb new file mode 100644 index 0000000000..ee5578f8b9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -0,0 +1,73 @@ +DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" +SECTION = "network" +HOMEPAGE = "https://transmissionbt.com/" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=0dd9fcdc1416ff123c41c785192a1895" + +DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" +RDEPENDS_${PN}-web = "${PN}" + +SRC_URI = " \ + git://github.com/transmission/transmission \ + file://0001-configure.ac-Fix-no-libsystemd-daemon.patch \ + file://transmission-daemon \ +" + +# Transmission release 2.94 +SRCREV = "d8e60ee44f4295935bd98bf741f85ed19f5a7dfb" +PV = "2.94" + +S = "${WORKDIR}/git" + +inherit autotools gettext update-rc.d systemd mime-xdg features_check + +PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" + +PACKAGECONFIG[gtk] = " --with-gtk,--without-gtk,gtk+3," +PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd," + +# Weak default values for transmission user and group +# Change them in bbappend if needed +TRANSMISSION_USER ??= "root" +TRANSMISSION_GROUP ??= "root" + +# Configure aborts with: +# config.status: error: po/Makefile.in.in was not created by intltoolize. +B = "${S}" +do_configure_prepend() { + sed -i /AM_GLIB_GNU_GETTEXT/d ${S}/configure.ac + cd ${S} + ./update-version-h.sh + intltoolize --copy --force --automake +} + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + sed -i '/USERNAME=/c\USERNAME=${TRANSMISSION_USER}' ${WORKDIR}/transmission-daemon + install -d ${D}${sysconfdir}/init.d + install -m 0744 ${WORKDIR}/transmission-daemon ${D}${sysconfdir}/init.d/ + chown ${TRANSMISSION_USER}:${TRANSMISSION_GROUP} ${D}${sysconfdir}/init.d/transmission-daemon + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + sed -i '/User=/c\User=${TRANSMISSION_USER}' ${S}/daemon/transmission-daemon.service + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/daemon/transmission-daemon.service ${D}${systemd_unitdir}/system + fi +} + +PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web" + +FILES_${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" +FILES_${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" +FILES_${PN}-web = "${datadir}/transmission/web" +FILES_${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon" + +SYSTEMD_SERVICE_${PN} = "transmission-daemon.service" + +# Script transmission-daemon following the guidelines in: +# https://trac.transmissionbt.com/wiki/Scripts/initd +INITSCRIPT_PACKAGES = "transmission-daemon" +INITSCRIPT_NAME = "transmission-daemon" +INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ." diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 8358e933d7..0812da1af6 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -210,7 +210,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ alsa-oss audiofile cdrkit id3lib \ a2jmidid jack libass libburn libcdio libcdio-paranoia \ libdvdread libmms libmodplug libopus live555 \ - mplayer-common opus-tools \ + opus-tools \ sound-theme-freedesktop v4l-utils yavta wavpack libvpx \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol xsp", "", d)} \ libmikmod \ diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch b/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch deleted file mode 100644 index 8f18f48720..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 57456b5d034c8965b11eceed1bf861c98a18c324 Mon Sep 17 00:00:00 2001 -From: "jenkins@kwaj" <jenkins@kwaj> -Date: Wed, 11 Sep 2019 13:43:45 -0700 -Subject: [PATCH] memrchr: Use _ISOC11_SOURCE only with glibc - -this is a glibc feature test macro which is not available -on other libraries e.g. musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/extmem/memrchr_s.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/extmem/memrchr_s.c b/src/extmem/memrchr_s.c -index 8d10a7b9..e73d3579 100644 ---- a/src/extmem/memrchr_s.c -+++ b/src/extmem/memrchr_s.c -@@ -36,7 +36,7 @@ - #endif - - #ifdef HAVE_MEMRCHR --#ifndef _ISOC11_SOURCE -+#if defined (__GLIBC__) && !defined(_ISOC11_SOURCE) - extern void *memrchr(const void *, int, size_t); - #endif - #endif --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb index 94cdb3a3c3..91d8fc65a0 100644 --- a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb @@ -7,14 +7,12 @@ SECTION = "lib" inherit autotools pkgconfig S = "${WORKDIR}/git" -SRCREV = "a99a052a56da409638c9fe7e096a5ae6661ca7cb" +# v08112019 +SRCREV = "ad76c7b1dbd0403b0c9decf54164fcce271c590f" SRC_URI = "git://github.com/rurban/safeclib.git \ - file://0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch \ " -CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" - -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64).*-linux' +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64|mips).*-linux' PACKAGES =+ "${PN}-check" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch new file mode 100644 index 0000000000..faabc597ee --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch @@ -0,0 +1,30 @@ +From 9e5b1420b89813ee3c58c2b792077fa8bb71f327 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 May 2020 13:53:27 -0700 +Subject: [PATCH] Tackle SIGEMT and SIGSTKFLT is not glibc specific + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/portability.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/portability.c b/lib/portability.c +index 294141c6..1c7ebc12 100644 +--- a/lib/portability.c ++++ b/lib/portability.c +@@ -430,8 +430,11 @@ static const struct signame signames[] = { + // Non-POSIX signals that cause termination + SIGNIFY(PROF), SIGNIFY(IO), + #ifdef __linux__ +-# if !defined(__GLIBC__) && !defined(__mips__) ++# ifdef SIGSTKFLT + SIGNIFY(STKFLT), ++# endif ++# ifdef SIGEMT ++ SIGNIFY(EMT), + # endif + SIGNIFY(POLL), SIGNIFY(PWR), + #elif defined(__APPLE__) +-- +2.26.2 + diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch deleted file mode 100644 index e42c22ebd4..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch +++ /dev/null @@ -1,195 +0,0 @@ -diff --git a/toys/net/microcom.c b/toys/net/microcom.c -index d34e1fe..a369e6c 100644 ---- a/toys/net/microcom.c -+++ b/toys/net/microcom.c -@@ -2,7 +2,7 @@ - * - * Copyright 2017 The Android Open Source Project. - --USE_MICROCOM(NEWTOY(microcom, "<1>1s:X", TOYFLAG_BIN)) -+USE_MICROCOM(NEWTOY(microcom, "<1>1s:X", TOYFLAG_USR|TOYFLAG_BIN)) - - config MICROCOM - bool "microcom" -diff --git a/toys/other/blockdev.c b/toys/other/blockdev.c -index 38e0993..c5d9fcd 100644 ---- a/toys/other/blockdev.c -+++ b/toys/other/blockdev.c -@@ -4,7 +4,7 @@ - * - * No Standard. - --USE_BLOCKDEV(NEWTOY(blockdev, "<1>1(setro)(setrw)(getro)(getss)(getbsz)(setbsz)#<0(getsz)(getsize)(getsize64)(flushbufs)(rereadpt)",TOYFLAG_USR|TOYFLAG_BIN)) -+USE_BLOCKDEV(NEWTOY(blockdev, "<1>1(setro)(setrw)(getro)(getss)(getbsz)(setbsz)#<0(getsz)(getsize)(getsize64)(flushbufs)(rereadpt)",TOYFLAG_SBIN)) - - config BLOCKDEV - bool "blockdev" -diff --git a/toys/other/chrt.c b/toys/other/chrt.c -index a1c37a0..d6db3a5 100644 ---- a/toys/other/chrt.c -+++ b/toys/other/chrt.c -@@ -4,7 +4,7 @@ - * - * Note: -ibrfo flags sorted to match SCHED positions for highest_bit() - --USE_CHRT(NEWTOY(chrt, "^mp#<0iRbrfo[!ibrfo]", TOYFLAG_USR|TOYFLAG_SBIN)) -+USE_CHRT(NEWTOY(chrt, "^mp#<0iRbrfo[!ibrfo]", TOYFLAG_USR|TOYFLAG_BIN)) - - config CHRT - bool "chrt" -diff --git a/toys/other/hwclock.c b/toys/other/hwclock.c -index 1d313e3..412582d 100644 ---- a/toys/other/hwclock.c -+++ b/toys/other/hwclock.c -@@ -4,7 +4,7 @@ - * - * No standard, but see Documentation/rtc.txt in the linux kernel source.. - * --USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]", TOYFLAG_USR|TOYFLAG_BIN)) -+USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]", TOYFLAG_SBIN)) - - config HWCLOCK - bool "hwclock" -diff --git a/toys/other/modinfo.c b/toys/other/modinfo.c -index 1178d67..966a9de 100644 ---- a/toys/other/modinfo.c -+++ b/toys/other/modinfo.c -@@ -4,7 +4,7 @@ - * - * TODO: cleanup - --USE_MODINFO(NEWTOY(modinfo, "<1b:k:F:0", TOYFLAG_BIN)) -+USE_MODINFO(NEWTOY(modinfo, "<1b:k:F:0", TOYFLAG_SBIN)) - - config MODINFO - bool "modinfo" -diff --git a/toys/other/pmap.c b/toys/other/pmap.c -index abb0a33..2acef02 100644 ---- a/toys/other/pmap.c -+++ b/toys/other/pmap.c -@@ -5,7 +5,7 @@ - * - * No Standard. - --USE_PMAP(NEWTOY(pmap, "<1xq", TOYFLAG_BIN)) -+USE_PMAP(NEWTOY(pmap, "<1xq", TOYFLAG_USR|TOYFLAG_BIN)) - - config PMAP - bool "pmap" -diff --git a/toys/other/printenv.c b/toys/other/printenv.c -index e8bcf29..65f62ed 100644 ---- a/toys/other/printenv.c -+++ b/toys/other/printenv.c -@@ -2,7 +2,7 @@ - * - * Copyright 2012 Georgi Chorbadzhiyski <georgi@unixsol.org> - --USE_PRINTENV(NEWTOY(printenv, "0(null)", TOYFLAG_USR|TOYFLAG_BIN)) -+USE_PRINTENV(NEWTOY(printenv, "0(null)", TOYFLAG_BIN)) - - config PRINTENV - bool "printenv" -diff --git a/toys/other/taskset.c b/toys/other/taskset.c -index 8ffdab7..89fd528 100644 ---- a/toys/other/taskset.c -+++ b/toys/other/taskset.c -@@ -2,7 +2,7 @@ - * - * Copyright 2012 Elie De Brauwer <eliedebrauwer@gmail.com> - --USE_TASKSET(NEWTOY(taskset, "<1^pa", TOYFLAG_BIN|TOYFLAG_STAYROOT)) -+USE_TASKSET(NEWTOY(taskset, "<1^pa", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT)) - USE_NPROC(NEWTOY(nproc, "(all)", TOYFLAG_USR|TOYFLAG_BIN)) - - config NPROC -diff --git a/toys/other/timeout.c b/toys/other/timeout.c -index 9b93466..e1d0f4d 100644 ---- a/toys/other/timeout.c -+++ b/toys/other/timeout.c -@@ -4,7 +4,7 @@ - * - * No standard - --USE_TIMEOUT(NEWTOY(timeout, "<2^vk:s: ", TOYFLAG_BIN)) -+USE_TIMEOUT(NEWTOY(timeout, "<2^vk:s: ", TOYFLAG_USR|TOYFLAG_BIN)) - - config TIMEOUT - bool "timeout" -diff --git a/toys/other/truncate.c b/toys/other/truncate.c -index 142d3c7..40eb1e5 100644 ---- a/toys/other/truncate.c -+++ b/toys/other/truncate.c -@@ -2,7 +2,7 @@ - * - * Copyright 2011 Rob Landley <rob@landley.net> - --USE_TRUNCATE(NEWTOY(truncate, "<1s:|c", TOYFLAG_BIN)) -+USE_TRUNCATE(NEWTOY(truncate, "<1s:|c", TOYFLAG_USR|TOYFLAG_BIN)) - - config TRUNCATE - bool "truncate" -diff --git a/toys/posix/nice.c b/toys/posix/nice.c -index 4b587ee..9f7b119 100644 ---- a/toys/posix/nice.c -+++ b/toys/posix/nice.c -@@ -4,7 +4,7 @@ - * - * See http://opengroup.org/onlinepubs/9699919799/utilities/nice.html - --USE_NICE(NEWTOY(nice, "^<1n#", TOYFLAG_USR|TOYFLAG_BIN)) -+USE_NICE(NEWTOY(nice, "^<1n#", TOYFLAG_BIN)) - - config NICE - bool "nice" -diff --git a/toys/posix/nl.c b/toys/posix/nl.c -index 9b02bfa..41e1b89 100644 ---- a/toys/posix/nl.c -+++ b/toys/posix/nl.c -@@ -7,7 +7,7 @@ - * This implements a subset: only one logical page (-ip), no sections (-dfh). - * todo: -lv - --USE_NL(NEWTOY(nl, "v#<1=1l#b:n:s:w#<0=6E", TOYFLAG_BIN)) -+USE_NL(NEWTOY(nl, "v#<1=1l#b:n:s:w#<0=6E", TOYFLAG_USR|TOYFLAG_BIN)) - - config NL - bool "nl" -diff --git a/toys/posix/paste.c b/toys/posix/paste.c -index ea04f02..8972f71 100644 ---- a/toys/posix/paste.c -+++ b/toys/posix/paste.c -@@ -6,7 +6,7 @@ - * - * Deviations from posix: the FILE argument isn't mandatory, none == '-' - --USE_PASTE(NEWTOY(paste, "d:s", TOYFLAG_BIN|TOYFLAG_LOCALE)) -+USE_PASTE(NEWTOY(paste, "d:s", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE)) - - config PASTE - bool "paste" -diff --git a/toys/posix/ps.c b/toys/posix/ps.c -index aef2a7f..b559e09 100644 ---- a/toys/posix/ps.c -+++ b/toys/posix/ps.c -@@ -44,7 +44,7 @@ - * TODO: top: thread support and SMP - * TODO: pgrep -f only searches the amount of cmdline that fits in toybuf. - --USE_PS(NEWTOY(ps, "k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE)) -+USE_PS(NEWTOY(ps, "k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO]", TOYFLAG_BIN|TOYFLAG_LOCALE)) - // stayroot because iotop needs root to read other process' proc/$$/io - USE_TOP(NEWTOY(top, ">0m" "O*Hk*o*p*u*s#<1d#=3<1n#<1bq[!oO]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE)) - USE_IOTOP(NEWTOY(iotop, ">0AaKO" "k*o*p*u*s#<1=7d#=3<1n#<1bq", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT|TOYFLAG_LOCALE)) -diff --git a/toys/posix/sed.c b/toys/posix/sed.c -index cf7d15e..130ac08 100644 ---- a/toys/posix/sed.c -+++ b/toys/posix/sed.c -@@ -10,7 +10,7 @@ - * TODO: handle error return from emit(), error_msg/exit consistently - * What's the right thing to do for -i when write fails? Skip to next? - --USE_SED(NEWTOY(sed, "(help)(version)e*f*inEr[+Er]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE|TOYFLAG_NOHELP)) -+USE_SED(NEWTOY(sed, "(help)(version)e*f*inEr[+Er]", TOYFLAG_BIN|TOYFLAG_LOCALE|TOYFLAG_NOHELP)) - - config SED - bool "sed" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch new file mode 100644 index 0000000000..7ab95932cf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch @@ -0,0 +1,25 @@ +glibc on mips is missing SIGSTKFLT + +Do not therefore assume it being available linuxwide + +Fixes +| lib/portability.c:433:3: error: use of undeclared identifier 'SIGSTKFLT' +| SIGNIFY(STKFLT), SIGNIFY(POLL), SIGNIFY(PWR), +| ^ + +Upstream-Status: Submitted [https://github.com/landley/toybox/pull/195] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/lib/portability.c ++++ b/lib/portability.c +@@ -430,7 +430,10 @@ static const struct signame signames[] = + // Non-POSIX signals that cause termination + SIGNIFY(PROF), SIGNIFY(IO), + #ifdef __linux__ +- SIGNIFY(STKFLT), SIGNIFY(POLL), SIGNIFY(PWR), ++# if !defined(__GLIBC__) && !defined(__mips__) ++ SIGNIFY(STKFLT), ++# endif ++ SIGNIFY(POLL), SIGNIFY(PWR), + #elif defined(__APPLE__) + SIGNIFY(EMT), SIGNIFY(INFO), + #endif diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb index 2f82978334..4e72f295d3 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb @@ -3,21 +3,35 @@ HOMEPAGE = "http://www.landley.net/toybox/" DEPENDS = "attr virtual/crypt" LICENSE = "BSD-0-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" +LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7" inherit cml1 update-alternatives SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ - file://OE-path-changes.patch \ + file://mips-no-STKFLT.patch \ + file://0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch \ " -SRC_URI[md5sum] = "a8bb502a1be941f06dd2644fff25f547" -SRC_URI[sha256sum] = "3ada450ac1eab1dfc352fee915ea6129b9a4349c1885f1394b61bd2d89a46c04" +SRC_URI[sha256sum] = "eab28fd29d19d4e61ef09704e5871940e6f35fd35a3bb1285e41f204504b5c01" SECTION = "base" TOYBOX_BIN = "generated/unstripped/toybox" -EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()}' +# Toybox is strict on what CC, CFLAGS and CROSS_COMPILE variables should contain. +# Fix CC, CFLAGS, CROSS_COMPILE to match expectations. +# CC = compiler name +# CFLAGS = only compiler flags +# CROSS_COMPILE = compiler prefix +CFLAGS += "${TOOLCHAIN_OPTIONS} ${TUNE_CCARGS}" + +COMPILER_toolchain-clang = "clang" +COMPILER ?= "gcc" + +EXTRA_OEMAKE = 'CROSS_COMPILE="${HOST_PREFIX}" \ + CC="${COMPILER}" \ + STRIP="strip" \ + CFLAGS="${CFLAGS}" \ + HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()} V=1' do_configure() { # allow user to define their own defconfig in bbappend, taken from kernel.bbclass diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.2.bb index ec375fed9d..b9668eb099 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.2.bb @@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "cef482c0579f34d9524311ac70c0875f" -SRC_URI[sha256sum] = "92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2" +SRC_URI[md5sum] = "6e4ffb6d35a73f7539a5d0c1354654cd" +SRC_URI[sha256sum] = "a89e13dff0798fd0280e801d5f0cc8cfdb2aa5b1929bec1b7322e13d3eca95fb" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index e95f1cfa54..f01b224fac 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -16,7 +16,7 @@ SRCREV_FORMAT = "openocd" SRCREV_openocd = "ded67990255cc1e63c77832ffd6e6bef9120873d" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" SRCREV_jimtcl = "dc4ba7770d580800634f90b67a24e077b4a26d98" -SRCREV_libjaylink = "cfccbc9d6763733f1d14dff3c2dc5b75aaef136b" +SRCREV_libjaylink = "3322dfa5e7aa56f5b12b7f2197e3e6b850b7b66e" PV = "0.10+gitr${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb index 732fe3b451..a3d0602182 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb @@ -10,13 +10,12 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools +PV .= "+git${SRCPV}" SRCREV = "d648bbffedef529220896283fb59e35531c13804" SRC_URI = "git://github.com/namhyung/${BPN} \ " S = "${WORKDIR}/git" -PR .= "+git${SRCPV}" - LDFLAGS_append_libc-musl = " -largp" def set_target_arch(d): diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.13.1.bb index f47fe5725c..d6e56ea768 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.13.1.bb @@ -2,12 +2,12 @@ SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON d HOMEPAGE = "http://www.digip.org/jansson/" BUGTRACKER = "https://github.com/akheron/jansson/issues" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc2548c0eb83800f29330040e18b5a05" +LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf" SRC_URI = "http://www.digip.org/jansson/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "0ed1f3a924604aae68067c214b0010ef" -SRC_URI[sha256sum] = "5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9" +SRC_URI[md5sum] = "570af45b8203e95876d71fecd56cee20" +SRC_URI[sha256sum] = "f4f377da17b10201a60c1108613e78ee15df6b12016b116b6de42209f47a474f" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb index 6c06c30aaf..6c22f0e044 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb @@ -18,6 +18,6 @@ RDEPENDS_${PN} += "tk-lib" inherit features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc" +EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc --disable-mime-update" FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index 60040a47af..48c72140c8 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -42,16 +42,28 @@ do_configure_prepend() { mkdir -p ${S} cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/msr-index.h ${S} cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/intel-family.h ${S} - cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} - cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} + if [ -f "${STAGING_KERNEL_DIR}/include/vdso/bits.h" ]; then + cp -r ${STAGING_KERNEL_DIR}/include/vdso/bits.h ${S} + cp -r ${STAGING_KERNEL_DIR}/include/vdso/const.h ${S} + else + cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} + cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} + fi cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} cp -r ${WORKDIR}/COPYING ${S} } + do_compile() { sed -i 's#<linux/bits.h>#"bits.h"#' msr-index.h - sed -i 's#<linux/const.h>#"const.h"#' bits.h - sed -i -e 's#<uapi/linux/const.h>#<linux/const.h>#' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h + 'TMPCHECK='grep "<vdso/const.h>" bits.h'' || true + if [ -n $TMPCHECK ]; then + sed -i 's#<vdso/const.h>#"const.h"#' bits.h + sed -i 's#<uapi/linux/const.h>#<linux/const.h>#' const.h + else + sed -i 's#<linux/const.h>#"const.h"#' bits.h + sed -i -e 's#<uapi/linux/const.h>#<linux/const.h>#' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h + fi sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb deleted file mode 100644 index 829c3b2439..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: MIT (see COPYING.MIT) - -SUMMARY = "Preconfigured mplayer preferences" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PV = "0.0.1" -PR = "r1" - -SRC_URI = "file://mplayer.conf" - -# Yes, really /usr/etc!!! -do_install() { - install -d "${D}/usr${sysconfdir}/mplayer" - - install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer" -} - -FILES_${PN} = "/usr${sysconfdir}/mplayer" - -inherit allarch diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf deleted file mode 100644 index 37ad65fa2d..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf +++ /dev/null @@ -1,15 +0,0 @@ - -# You probably shouldn't touch these -ac=mad, -ao=alsa, - -# Required on SL-Cxxxx for correct rotation in the *VT*, -# breaks rotation in X! -# vf=rotate=1 - -# Enable fullscreen display by default -# fs=true - -# Drop frames to keep audio and video in sync -framedrop=true - diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb index 0914f7ec2b..390e6a8c3b 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb @@ -23,6 +23,8 @@ SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'f export STAGING_INCDIR export STAGING_LIBDIR +CLEANBROKEN = "1" + PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb" PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5" PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase" @@ -35,6 +37,7 @@ EXTRA_OESCONS = " \ systemd='${SYSTEMD_OESCONS}' \ libdir='${libdir}' \ manbuild='false' \ + LINK='${CC}' \ ${PACKAGECONFIG_CONFARGS} \ " # this cannot be used, because then chrpath is not found and only static lib is built @@ -44,6 +47,7 @@ do_compile_prepend() { export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export LD="${CC}" export LINKFLAGS="${LDFLAGS}" } @@ -51,6 +55,7 @@ do_install() { export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export LD="${CC}" export LINKFLAGS="${LDFLAGS}" export DESTDIR="${D}" diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.8.0.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.0.bb index dd129cbec9..151653b22d 100644 --- a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.0.bb @@ -6,18 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" SRCREV = "13becaddb657eacd090537719a669d66d393b8b2" PV .= "+git${SRCPV}" -SRC_URI += "gitsm://github.com/CLIUtils/CLI11 \ - file://0001-Add-CLANG_TIDY-check.patch \ - file://0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch \ - " +SRC_URI += "gitsm://github.com/CLIUtils/CLI11" S = "${WORKDIR}/git" inherit cmake inherit ptest -EXTRA_OECMAKE += "-DCLANG_TIDY=OFF" -DEPENDS += "boost" - # cli11 is a header only C++ library, so the main package will be empty. RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/files/0001-Add-CLANG_TIDY-check.patch b/meta-openembedded/meta-oe/recipes-support/cli11/files/0001-Add-CLANG_TIDY-check.patch deleted file mode 100644 index 02b3c9bd7e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/cli11/files/0001-Add-CLANG_TIDY-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 902b251fd8d6408ee6623e7a92692948cf90187d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Feb 2019 13:22:21 -0800 -Subject: [PATCH] Add CLANG_TIDY check - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7073a0b..2dd2c02 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,7 +60,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) - endif() - endif() - -- if(CMAKE_VERSION VERSION_GREATER 3.6) -+ if(CMAKE_VERSION VERSION_GREATER 3.6 AND CLANG_TIDY) - # Add clang-tidy if available - option(CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF) - find_program( diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch b/meta-openembedded/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch deleted file mode 100644 index 4541cd929d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8c51221f748bca1483fe1141e584867d2ff34a07 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 19 Dec 2019 16:26:39 -0800 -Subject: [PATCH] Use GNUInstallDirs instead of hard-coded path - -Upstream-Status: Submitted [https://github.com/CLIUtils/CLI11/pull/373] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7073a0b..5236fd2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,17 +120,18 @@ endif() - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CLI11ConfigVersion.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" @ONLY) - -+include(GNUInstallDirs) - # These installs only make sense for a local project - if(CUR_PROJ) - # Make version available in the install - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" -- DESTINATION lib/cmake/CLI11) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11) - - # Install the export target as a file - install(EXPORT CLI11Targets - FILE CLI11Config.cmake - NAMESPACE CLI11:: -- DESTINATION lib/cmake/CLI11) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11) - - # Use find_package on the installed package - export(TARGETS CLI11 --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch b/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch new file mode 100644 index 0000000000..06a8498f3c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch @@ -0,0 +1,89 @@ +From ce0528cb48666843fed2ad10ece5ecb0ac0b8cf8 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Fri, 15 May 2020 12:38:49 +0900 +Subject: [PATCH] change dstat to python3. + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + dstat | 2 +- + examples/curstest | 2 +- + examples/devtest.py | 2 +- + examples/mmpipe.py | 2 +- + examples/mstat.py | 2 +- + examples/read.py | 2 +- + examples/tdbtest | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/dstat b/dstat +index 9359965..f250f06 100755 +--- a/dstat ++++ b/dstat +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + ### This program is free software; you can redistribute it and/or + ### modify it under the terms of the GNU General Public License +diff --git a/examples/curstest b/examples/curstest +index afc4e70..d720cca 100755 +--- a/examples/curstest ++++ b/examples/curstest +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + import curses, sys + + #c = curses.wrapper(s) +diff --git a/examples/devtest.py b/examples/devtest.py +index 0e9e969..e53babd 100755 +--- a/examples/devtest.py ++++ b/examples/devtest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + import sys + sys.path.insert(0, '/usr/share/dstat/') +diff --git a/examples/mmpipe.py b/examples/mmpipe.py +index 5c93567..f91515f 100755 +--- a/examples/mmpipe.py ++++ b/examples/mmpipe.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + import select, sys, os + + def readpipe(file, tmout = 0.001): +diff --git a/examples/mstat.py b/examples/mstat.py +index abf4d07..ac157e4 100755 +--- a/examples/mstat.py ++++ b/examples/mstat.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + ### Example2: simple sub-second monitor (ministat) + +diff --git a/examples/read.py b/examples/read.py +index 556b7ae..a925109 100755 +--- a/examples/read.py ++++ b/examples/read.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + ### Example 1: Direct accessing stats + ### This is a quick example showing how you can access dstat data +diff --git a/examples/tdbtest b/examples/tdbtest +index 528a8ea..ae7fef9 100755 +--- a/examples/tdbtest ++++ b/examples/tdbtest +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + import sys, tdb + + db = tdb.tdb('/var/cache/samba/connections.tdb') +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb index 2e37dd72eb..74af54ca53 100644 --- a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "asciidoc-native xmlto-native" -SRC_URI = "git://github.com/dagwieers/dstat.git" +SRC_URI = "git://github.com/dagwieers/dstat.git \ + file://0001-change-dstat-to-python3.patch \ + " SRCREV = "6f5db0aed26bf8cf2700d4ffe90a9bd3436ac728" diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb index a34797ff51..5afc4596e8 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -1,15 +1,16 @@ -SUMMARY = "Multi-platform library to interface with USB and Bluetooth HID-Class devices" +SUMMARY = "A Simple library for communicating with USB and Bluetooth HID devices" AUTHOR = "Alan Ott" HOMEPAGE = "http://www.signal11.us/oss/hidapi/" SECTION = "libs" + LICENSE = "BSD-3-Clause | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" + DEPENDS = "libusb udev" -PV = "0.7.99+0.8.0-rc1+git${SRCPV}" -SRCREV = "d17db57b9d4354752e0af42f5f33007a42ef2906" -SRC_URI = "git://github.com/signal11/hidapi.git" +inherit autotools pkgconfig +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https" +PV = "0.9.0" +SRCREV = "7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f" S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.1.bb index e9d34ee66a..004c93d0f9 100644 --- a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.1.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "git://github.com/librsync/librsync.git" -SRCREV = "028d9432d05ba4b75239e0ba35bcb36fbfc17e35" +SRCREV = "27f738650c20fef1285f11d85a34e5094a71c06f" S = "${WORKDIR}/git" DEPENDS = "popt" diff --git a/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch index b88440dec9..f4f759c85e 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch +++ b/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch @@ -1,4 +1,4 @@ -From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001 +From 840795dcb48214b74cfde75e7ce5e8a1a6c64a46 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 2 Apr 2015 19:18:45 -0700 Subject: [PATCH] usb.h: Include sys/types.h @@ -8,23 +8,21 @@ We need the definitions for things like u_intX_t Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- libusb/usb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libusb/usb.h b/libusb/usb.h -index 84e730f..caffae2 100644 +index fa0e6c6..4e88eb8 100644 --- a/libusb/usb.h +++ b/libusb/usb.h -@@ -31,6 +31,8 @@ - - #include <dirent.h> +@@ -45,6 +45,8 @@ typedef unsigned __int32 uint32_t; + #include <stdint.h> + #endif +#include <sys/types.h> + /* * USB spec information * --- -2.1.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.5.bb b/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb index 1ddbe238fc..21fa478b6e 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb @@ -18,15 +18,14 @@ BBCLASSEXTEND = "native nativesdk" PE = "1" -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ - file://0001-usb.h-Include-sys-types.h.patch \ - " - -SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4" -SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/" -UPSTREAM_CHECK_REGEX = "/libusb-compat-(?P<pver>(\d+[\.\-_]*)+)/$" +SRC_URI = " \ + git://github.com/libusb/libusb-compat-0.1.git;protocol=https \ + file://0001-usb.h-Include-sys-types.h.patch \ +" +SRCREV = "4a27760ec5954ec8605e052a3207afbe0979eeef" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases" BINCONFIG = "${bindir}/libusb-config" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.49.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb index 670c704e6f..b62b13a443 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.49.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.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] = "2a47a6bb4319357ea7b032c45283e79e" -SRC_URI[sha256sum] = "e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e" +SRC_URI[md5sum] = "f9ed44ef373abed04c9e4c8586260f9e" +SRC_URI[sha256sum] = "5cb57d958bf5c55a678c6a0f06821e0e5504d5a92e6a33240841fbca1db586b8" DEPENDS = "util-linux groff-native" diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch b/meta-openembedded/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch new file mode 100644 index 0000000000..adb9c4b06b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch @@ -0,0 +1,15 @@ +Fix error pointed out by gcc10 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/sigscheme/libgcroots/include/private/gc_priv.h ++++ b/sigscheme/libgcroots/include/private/gc_priv.h +@@ -2026,7 +2026,7 @@ void GC_err_puts(const char *s); + + # if defined(NEED_FIND_LIMIT) || \ + defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS) +-JMP_BUF GC_jmp_buf; ++extern JMP_BUF GC_jmp_buf; + + /* Set up a handler for address faults which will longjmp to */ + /* GC_jmp_buf; */ diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb index 0366ad85ae..507a341445 100644 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -6,6 +6,7 @@ SECTION = "inputmethods" SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \ file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \ + file://JMP_BUF_GC_jmp_buf.patch \ " SRC_URI_append_class-target = "\ file://uim-module-manager.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html new file mode 100644 index 0000000000..a02442ad97 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html @@ -0,0 +1,98 @@ +<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html> + + + +<head> + +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<meta http-equiv="Content-Language" content="en-us"> +<meta name="VI60_defaultClientScript" content="JavaScript"> +<meta name="GENERATOR" content="Microsoft FrontPage 12.0"> +<meta name="keywords" content="Unicode Standard, copyright"> +<meta name="ProgId" content="FrontPage.Editor.Document"> +<title>Unicode License Agreement</title> +<link rel="stylesheet" type="text/css" + +href="http://www.unicode.org/webscripts/standard_styles.css"> + +<style type="text/css"> +pre { + FONT-FAMILY: Arial, Geneva, sans-serif; +} +</style> + + +</head> + + +<body text="#330000"> + + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + + <!-- BEGIN CONTENTS --> + + <td> + + +<blockquote> +<h2><a name="License">UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</a></h2> + +<pre> +See <a href="https://www.unicode.org/copyright.html">Terms of Use</a> for definitions of Unicode Inc.'s +Data Files and Software. + +NOTICE TO USER: Carefully read the following legal agreement. +BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S +DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), +YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. +IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE +THE DATA FILES OR SOFTWARE. + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2019 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in https://www.unicode.org/copyright.html. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Unicode data files and any associated documentation +(the "Data Files") or Unicode software and any associated documentation +(the "Software") to deal in the Data Files or Software +without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, and/or sell copies of +the Data Files or Software, and to permit persons to whom the Data Files +or Software are furnished to do so, provided that either +(a) this copyright and permission notice appear with all copies +of the Data Files or Software, or +(b) this copyright and permission notice appear in associated +Documentation. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS +NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL +DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THE DATA FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in these Data Files or Software without prior +written authorization of the copyright holder. +</pre> + +</blockquote> + + + + </td> + + </tr> + + </table> +</body> +</html> diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb index 89ab565ce5..b29bb784e4 100644 --- a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb @@ -1,18 +1,15 @@ SUMMARY = "Unicode Character Database" HOMEPAGE = "https://unicode.org/ucd/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://unicode.org.license.html;beginline=42;endline=85;md5=67619d0c52706853c0256514e7fd04cd" +LIC_FILES_CHKSUM = "file://../license.html;beginline=42;endline=85;md5=ddcaebcc17ab633995f12c383599f377" SRC_URI = " \ https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ - https://www.unicode.org/license.html;name=license;subdir=${BP};downloadfilename=unicode.org.license.html \ + file://license.html \ " SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6" SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6" -SRC_URI[license.md5sum] = "f03bafb623258f85ff2032c1ce567b7c" -SRC_URI[license.sha256sum] = "983225207de8a707d0903a8d70fb7a4b28c5e0f64f2366e84a6192a2d618fed4" - inherit allarch do_configure[noexec] = "1" |