diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-06-24 16:36:18 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-06-24 16:38:35 +0300 |
commit | c8f4712845034714fed763414987305bacafe1fd (patch) | |
tree | 076fa034dbf82e26eeb4be701ff70e4fb8f66881 /meta-openembedded | |
parent | 0bd2291397ecbeae3b2e29a25d7184177b094f25 (diff) | |
download | openbmc-c8f4712845034714fed763414987305bacafe1fd.tar.xz |
subtree updates
poky: 50d272863d..0b3e371116:
Alistair Francis (1):
recipes-bsp/opensbi: Fix the u-boot payload name
Changqing Li (2):
update-rc.d: update SRCREV and license checksum
update-rc.d: support enable/disable options
Chen Qi (2):
context.py: avoid skipping tests by meaningless command argument
oeqa: avoid class setup method to run when skipping the whole class
Joe Slater (1):
glib-2.0: Fix CVE-2019-12450
Jonathan Rajotte (1):
lttng-tools: update to 2.10.7
Joseph Reynolds (1):
dropbear: new feature: disable-weak-ciphers
Joshua Watt (4):
perl: Improve ptest package reproducibility
python3: Reformat sysconfig
perl: Reproducible build fixes
bash: Remove .build files for reproducible builds
Martin Jansa (1):
gcc-runtime.inc: create the correct directory before creating the symlinks in it
Ricardo Ribalda Delgado (1):
go: avoid host contamination by GOCACHE
Ross Burton (1):
pigz: bump alternative priority
Tim Orling (1):
ptest-packagelists.inc: add libmodule-build-perl-ptest
meta-openembedded: 3b245e4fe8..64974b8779:
Adrian Bunk (9):
libauthen-radius-perl: Remove manual RDEPENDS from PN-ptest to PN package
network-manager-applet: Remove obsolete dbus-glib and libnm-glib dependencies
ndctl: Remove the unnecessary dependency on virtual/kernel
tipcutils: Remove the unnecessary dependency on virtual/kernel
xl2tpd: Remove the old 1.3.6 version
gpsd: Force using python-scons-native for now
efibootmgr: Remove, was moved to oe-core
efivar: Remove, was moved to oe-core
wireless-regdb: Remove, was moved to oe-core
Andrey Zhizhikin (1):
cpuburn-arm: add aarch64 machine and build configuration
Ankit Navik (1):
safec: Add Safe C license
Bartosz Golaszewski (1):
libgpiod: upgrade to v1.4
Hongxu Jia (1):
dracut: fix generated initramfs boot failure under bash 5
Kai Kang (1):
xfce4-screensaver: 0.1.4 -> 0.1.5
Khem Raj (5):
stressapptest: Fix build with libc++
stressapptest: Implement reading sysfs and use it if sysconf is not there
stressapptest: Use git SHA instead of git archive
gmime: Add recipe
pidgin-sipe: Depend on gmime
Maciej Pijanowski (1):
recipes-benchmark/stressapptest_1.0.9.bb: add recipe
Mingli Yu (3):
mariadb: Upgrade to 10.3.16
mozjs: Fix do_patch error for mips64-n32
python-lxml: replace -Og with -O for mips64-32
Naveen Saini (1):
pm-graph: fix multilib build failure
Nicola Lunghi (1):
libp11: No need to delete *.la anymore
Oleksandr Kravchuk (1):
openconnect: update to 8.03
Pascal Bach (3):
protobuf: 3.6.1 -> 3.8.0
protobuf-c: add patch for protobuf 3 compatibility
python3-protobuf, python-protobuf: 3.6.1 -> 3.8.0
Persian Prince (1):
blueman_%.bbappend: Avoid PAK archive (application/x-pak)
Saikiran Madugula (1):
gitver: Pass git directory argument to gitrev_run
Tim Orling (1):
libmodule-build-perl: drop, has moved to oe-core
Yi Zhao (1):
snort: upgrade 2.9.11.1 -> 2.9.13
Zang Ruochen (3):
python-twisted: upgrade 19.2.0 -> 19.2.1
python-wrapt: upgrade 1.11.1 -> 1.11.2
python-certifi: upgrade 2019.3.9 -> 2019.6.16
Change-Id: I0c3385628e0382c56c94fa27ba4d14e301c2e558
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded')
64 files changed, 640 insertions, 535 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb index 7181f5ecf..80aafc870 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb @@ -2,7 +2,7 @@ SUMMARY = "GTK+ applet for NetworkManager" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ +DEPENDS = "gtk+3 libnotify libsecret networkmanager \ gconf libgnome-keyring iso-codes nss \ intltool-native \ " @@ -34,14 +34,13 @@ do_configure_append() { GI_DATA_ENABLED_libc-musl = "False" do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/libnm-gtk/.libs" + export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs" } RDEPENDS_${PN} =+ "networkmanager" FILES_${PN} += " \ ${datadir}/nm-applet/ \ - ${datadir}/libnm-gtk/wifi.ui \ ${datadir}/libnma/wifi.ui \ ${datadir}/metainfo \ " diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend deleted file mode 100644 index 1abb5bbcd..000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# networkmanager-applet requires glib support -PACKAGECONFIG_append = " glib" - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch new file mode 100644 index 000000000..13d2cfa87 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch @@ -0,0 +1,69 @@ +From 6e0da103effe64832eea52fad5c44a328f7141b7 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 20 Jun 2019 17:31:11 +0800 +Subject: [PATCH] set viriable _drv not local + +If shebang is set to /bin/sh and /bin/sh is a symlink to /bin/bash, +bash turn on posix mode. + +Since bash is upgraded to 5.0, it follows 'IEEE 1003.2 POSIX Shell +Standard', to implement 'functions do not have local traps or options, +and it is not possible to define local variables' + +For more detail, see variables.c:push_posix_temp_var in the following commit +http://git.savannah.gnu.org/cgit/bash.git/commit/?id=d233b485e83c3a784b803fb894280773f16f2deb + +The IEEE 1003.2 POSIX Shell Standard: +https://www.cs.ait.ac.th/~on/O/oreilly/unix/ksh/appa_02.htm + +While /bin/sh points to bash 5.0, it caused the following issue: + +$ cat <<ENDOF>case.sh +fsck_drv_com(){ + echo "issuing \$_drv" +} + +fsck_able() { + _drv="_drv=e2fsck fsck_drv_com" +} + +fsck_single() { + local _drv + fsck_able + eval "\$_drv" +} +fsck_single +ENDOF +$ chmod a+x case.sh + +Unexpected: +$ ./cash.sh +issuing _drv=e2fsck fsck_drv_com + +Set viriable _drv not local, get expected result: +$ ./case.sh +issuing e2fsck + +Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/587] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + modules.d/99fs-lib/fs-lib.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh +index d39ca1b..60877ee 100755 +--- a/modules.d/99fs-lib/fs-lib.sh ++++ b/modules.d/99fs-lib/fs-lib.sh +@@ -142,7 +142,7 @@ fsck_single() { + local _fs="${2:-auto}" + local _fsopts="$3" + local _fop="$4" +- local _drv ++ _drv="" + + [ $# -lt 2 ] && return 255 + # if UUID= marks more than one device, take only the first one +-- +2.7.4 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index 344dfecbb..13cf5f6de 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -13,6 +13,7 @@ SRCREV = "225e4b94cbdb702cf512490dcd2ad9ca5f5b22c1" SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ file://0001-dracut.sh-improve-udevdir.patch \ + file://0001-set-viriable-_drv-not-local.patch \ " DEPENDS += "kmod" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb index 050a2833c..ec36a375a 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb @@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git" -SRCREV = "6487ee8763e1b6345718684909aca970befbc49d" +SRCREV = "ea73851969ae7a6ea54fdd2d2b8c94776af24b2a" DEPENDS = "vpnc libxml2 krb5 gettext-native" RDEPENDS_${PN} = "bash python" @@ -18,8 +18,6 @@ PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," # not config defaults PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," -PV = "8.02" - S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch index 037962fb6..30ec17439 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch @@ -226,7 +226,7 @@ index 4b3a5db..a6c5498 100644 -]])], -[have_daq_packet_trace="yes"], -[have_daq_packet_trace="no"]) -+have_daq_packet_trace="yes" ++have_daq_packet_trace="no" AC_MSG_RESULT($have_daq_packet_trace) if test "x$have_daq_packet_trace" = "xyes"; then AC_DEFINE([HAVE_DAQ_PKT_TRACE],[1], @@ -245,7 +245,7 @@ index 4b3a5db..a6c5498 100644 -]])], -[have_daq_verdict_reason="yes"], -[have_daq_verdict_reason="no"]) -+have_daq_verdict_reason="yes" ++have_daq_verdict_reason="no" AC_MSG_RESULT($have_daq_verdict_reason) if test "x$have_daq_verdict_reason" = "xyes"; then AC_DEFINE([HAVE_DAQ_VERDICT_REASON],[1], diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/snort.init b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/snort.init index d8a00c43f..0d90c9af0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/snort.init +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/snort.init @@ -1,6 +1,6 @@ #!/bin/sh # -# Snort Startup Script modified for OpenEmbedded +# Snort Startup Script modified for OpenEmbedded # # Script variables @@ -30,16 +30,16 @@ fi start() { - [ -n "$LAN_INTERFACE" ] || return 0 # Check if log diratory is present. Otherwise, create it. if [ ! -d $LOGDIR/$DATE ]; then - mkdir -d $LOGDIR/$DATE + mkdir -p $LOGDIR/$DATE /bin/chown -R $USER:$USER $LOGDIR/$DATE - /bin/chmod -R 700 $LOGDIR/$DATE + /bin/chmod -R 700 $LOGDIR/$DATE fi /bin/echo "Starting $PROG: " + # Snort parameters # -D Run Snort in background (daemon) mode # -i <if> Listen on interface <if> @@ -64,7 +64,7 @@ stop() RETURN_VAL=$? /bin/echo "$PROG shutdown complete." [ -e $DEL_PID ] && rm -f $DEL_PID - [ -e $DEL_PID.lck ] && rm -f $DEL_PID.lck + [ -e $DEL_PID.lck ] && rm -f $DEL_PID.lck else /bin/echo "ERROR: PID in $PID file not found." RETURN_VAL=1 @@ -72,12 +72,13 @@ stop() return $RETURN_VAL } -status() { - if [ -s $PID ]; then - echo "$PROG is running as pid `cat $PID`:" - else - echo "$PROG is not running." - fi +status() +{ + if [ -s $PID ]; then + echo "$PROG is running as pid `cat $PID`:" + else + echo "$PROG is not running." + fi } restart() @@ -89,21 +90,21 @@ restart() } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status - ;; - restart|reload) - restart - ;; - *) - /bin/echo "Usage: $0 {start|stop|status|restart|reload}" - RETURN_VAL=1 + start) + start + ;; + stop) + stop + ;; + status) + status + ;; + restart|reload) + restart + ;; + *) + /bin/echo "Usage: $0 {start|stop|status|restart|reload}" + RETURN_VAL=1 esac exit $RETURN_VAL diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.13.bb index c2eb95fe7..1b10dbde1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.13.bb @@ -13,8 +13,8 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ file://disable-run-test-program-while-cross-compiling.patch \ " -SRC_URI[md5sum] = "378e3938b2b5c8e358f942d0ffce18cc" -SRC_URI[sha256sum] = "9f6b3aeac5a109f55504bd370564ac431cb1773507929dc461626898f33f46cd" +SRC_URI[md5sum] = "b61ae846af022018b05511076baad60c" +SRC_URI[sha256sum] = "31447393d15286b848810dd78ab2cb3ad231fcd1f1663f959587690eeea75413" UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" @@ -45,6 +45,7 @@ EXTRA_OECONF = " \ PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" CFLAGS += "-I${STAGING_INCDIR}/tirpc" LDFLAGS += " -ltirpc" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2019.06.03.bb b/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2019.06.03.bb deleted file mode 100644 index ded44b3d4..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2019.06.03.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Wireless Central Regulatory Domain Database" -HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" -SECTION = "net" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" - -SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "4b5ba3f089db7fdb7b9daae6a7c1f2cb" -SRC_URI[sha256sum] = "cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf" - -inherit bin_package allarch - -do_install() { - install -d -m0755 ${D}${nonarch_libdir}/crda - install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys - install -m 0644 regulatory.bin ${D}${nonarch_libdir}/crda/regulatory.bin - install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem - - install -m 0644 -D regulatory.db ${D}${nonarch_base_libdir}/firmware/regulatory.db - install -m 0644 regulatory.db.p7s ${D}${nonarch_base_libdir}/firmware/regulatory.db.p7s -} - -# Install static regulatory DB in /lib/firmware for kernel to load. -# This requires Linux kernel >= v4.15. -# For kernel <= v4.14, inherit the kernel_wireless_regdb.bbclass in kernel's recipe. -PACKAGES =+ "${PN}-static" -RCONFLICTS_${PN} = "${PN}-static" - -FILES_${PN}-static = " \ - ${nonarch_base_libdir}/firmware/regulatory.db \ - ${nonarch_base_libdir}/firmware/regulatory.db.p7s \ -" - -# Native users might want to use the source of regulatory DB. -# This is for example used by Linux kernel <= v4.14 and kernel_wireless_regdb.bbclass. -do_install_append_class-native() { - install -m 0644 -D db.txt ${D}${libdir}/crda/db.txt -} - -RSUGGESTS_${PN} = "crda" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 3770601a4..bbc5e1299 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -37,7 +37,6 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\ mbedtls relayd snort dhcpcd rdate vlan vpnc \ inetutils wolfssl lftp miniupnpd networkmanager \ networkmanager-openvpn rdist nanomsg python-networkmanager \ - wireless-regdb \ ${@bb.utils.contains("DISTRO_FEATURES", "bluez5 x11", "blueman", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc deleted file mode 100644 index 43942bcae..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Xelerance version of the Layer 2 Tunneling Protocol (L2TP) daemon" -HOMEPAGE = "http://www.xelerance.com/software/xl2tpd/" -SECTION = "net" -DEPENDS = "ppp virtual/kernel" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/xelerance/xl2tpd.git" - -S = "${WORKDIR}/git" - -inherit update-rc.d - -do_compile () { - oe_runmake CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" PREFIX="${prefix}" KERNELSRC=${STAGING_KERNEL_DIR} all -} - -do_install () { - oe_runmake PREFIX="${D}${prefix}" install - - install -d ${D}${sysconfdir}/init.d - touch ${D}${sysconfdir}/xl2tpd.conf - install -m 0755 debian/xl2tpd.init ${D}${sysconfdir}/init.d/xl2tpd - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/xl2tpd - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/xl2tpd - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/xl2tpd - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/xl2tpd - - install -d ${D}${sysconfdir}/default - install -m 0644 debian/xl2tpd.default ${D}${sysconfdir}/default/xl2tpd -} - -CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "xl2tpd" diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb index f03b537d9..b02e183db 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb @@ -1,5 +1,40 @@ -require xl2tpd.inc +SUMMARY = "Xelerance version of the Layer 2 Tunneling Protocol (L2TP) daemon" +HOMEPAGE = "http://www.xelerance.com/software/xl2tpd/" +SECTION = "net" +DEPENDS = "ppp virtual/kernel" -# This is v1.3.6 plus some commits. There is no tag for this commit. -# +PACKAGE_ARCH = "${MACHINE_ARCH}" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/xelerance/xl2tpd.git" SRCREV = "ba619c79c4790c78c033df0abde4a9a5de744a08" + +S = "${WORKDIR}/git" + +inherit update-rc.d + +do_compile () { + oe_runmake CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" PREFIX="${prefix}" KERNELSRC=${STAGING_KERNEL_DIR} all +} + +do_install () { + oe_runmake PREFIX="${D}${prefix}" install + + install -d ${D}${sysconfdir}/init.d + touch ${D}${sysconfdir}/xl2tpd.conf + install -m 0755 debian/xl2tpd.init ${D}${sysconfdir}/init.d/xl2tpd + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/xl2tpd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/xl2tpd + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/xl2tpd + sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/xl2tpd + + install -d ${D}${sysconfdir}/default + install -m 0644 debian/xl2tpd.default ${D}${sysconfdir}/default/xl2tpd +} + +CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "xl2tpd" diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb deleted file mode 100644 index df2ec52c6..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xl2tpd.inc - -# The SRCREV corresponds to v1.3.6. -# Adding tag=v1.3.6 to the SRC_URI will force access to the upstream repo. -# -SRCREV = "5619e1771048e74b729804e8602f409af0f3faea" - diff --git a/meta-openembedded/meta-oe/classes/gitver.bbclass b/meta-openembedded/meta-oe/classes/gitver.bbclass index 07f44c34b..cab850c7a 100644 --- a/meta-openembedded/meta-oe/classes/gitver.bbclass +++ b/meta-openembedded/meta-oe/classes/gitver.bbclass @@ -48,7 +48,7 @@ def get_git_hash(d): srcdir = d.getVar("EXTERNALSRC") or d.getVar("S") gitdir = os.path.abspath(os.path.join(srcdir, ".git")) try: - rev = gitrev_run("git rev-list HEAD -1") + rev = gitrev_run("git rev-list HEAD -1", gitdir) return rev[:7] except Exception as exc: bb.fatal(str(exc)) diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 507ac50ec..31f2f17fc 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -51,12 +51,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->php \ " -# Depends on ndctl (through nvdimm PACKAGECONFIG) which depends on MACHINE_ARCH kernel -# and making libblockdev MACHINE_ARCH is not an option as python3-blivet, udisks2, gvfs -# would be MACHINE_ARCH as well -SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ - libblockdev->ndctl \ -" # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ terminus-font->fontconfig \ diff --git a/meta-openembedded/meta-oe/licenses/safec b/meta-openembedded/meta-oe/licenses/safec new file mode 100644 index 000000000..2bf1e6374 --- /dev/null +++ b/meta-openembedded/meta-oe/licenses/safec @@ -0,0 +1,26 @@ +Safe C Library + +Copyright (C) 2012, 2013 Cisco Systems +Copyright (C) 2017 Reini Urban +All rights reserved. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb index 6189da39f..b21212a43 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb @@ -18,21 +18,35 @@ SRC_URI = "git://github.com/ssvb/cpuburn-arm.git \ S = "${WORKDIR}/git" do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} burn.S -o burn - ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a7.S -o burn-a7 - ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a8.S -o burn-a8 - ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a9.S -o burn-a9 - ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a53.S -o burn-a53 - ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-krait.S -o burn-krait + + # If the arch is set to ARM 64-bit - we only produce and ship burn-a53 version. + # In case of ARM 32-bit - we would build all variants, since burn-a53 supports both + # 32 and 64-bit builds + if ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'true', 'false', d)}; then + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a53.S -o burn-a53 + else + ${CC} ${CFLAGS} ${LDFLAGS} burn.S -o burn + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a7.S -o burn-a7 + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a8.S -o burn-a8 + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a9.S -o burn-a9 + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a53.S -o burn-a53 + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-krait.S -o burn-krait + fi } do_install() { install -d ${D}${bindir} - for f in burn burn-a7 burn-a8 burn-a9 burn-a53 burn-krait; do - install -m 0755 $f ${D}${bindir}/$f - done + + if ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'true', 'false', d)}; then + install -m 0755 burn-a53 ${D}${bindir} + else + for f in burn burn-a7 burn-a8 burn-a9 burn-a53 burn-krait; do + install -m 0755 $f ${D}${bindir}/$f + done + fi } COMPATIBLE_MACHINE ?= "(^$)" COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch new file mode 100644 index 000000000..f5e7da359 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch @@ -0,0 +1,28 @@ +Fix compile on sytems using libc++ instead of libstdc++ + +libc++ does not really implement __gnu_cxx namespace and it +compiles fine without this namespace, therefore detect libc++ +and if it is used them exclude this namespace + +See https://github.com/stressapptest/stressapptest/issues/47 + +Fixes + +./sattypes.h:33:17: error: expected namespace name +using namespace __gnu_cxx; //NOLINT + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- stressapptest-1.0.9.orig/src/sattypes.h ++++ stressapptest-1.0.9/src/sattypes.h +@@ -30,7 +30,9 @@ + #include "stressapptest_config_android.h" // NOLINT + #else + #include "stressapptest_config.h" // NOLINT ++#ifndef _LIBCPP_VERSION + using namespace __gnu_cxx; //NOLINT ++#endif // _LIBCPP_VERSION + #endif // __ANDROID__ + using namespace std; + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch new file mode 100644 index 000000000..8c251aeb9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch @@ -0,0 +1,72 @@ +sysconf params like _SC_LEVEL1_DCACHE_LINESIZE are not universally +implemented, therefore check for them being available, if not there +then read the sysfs directly to get the value + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/sat.cc ++++ b/src/sat.cc +@@ -1482,15 +1482,47 @@ int Sat::CpuCount() { + return sysconf(_SC_NPROCESSORS_CONF); + } + ++int Sat::ReadInt(const char *filename, int *value) { ++ char line[64]; ++ int fd = open(filename, O_RDONLY), err = -1; ++ ++ if (fd < 0) ++ return -1; ++ if (read(fd, line, sizeof(line)) > 0) { ++ *value = atoi(line); ++ err = 0; ++ } ++ ++ close(fd); ++ return err; ++} ++ + // Return the worst case (largest) cache line size of the various levels of + // cache actually prsent in the machine. + int Sat::CacheLineSize() { +- int max_linesize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); +- int linesize = sysconf(_SC_LEVEL2_CACHE_LINESIZE); ++ int max_linesize, linesize; ++#ifdef _SC_LEVEL1_DCACHE_LINESIZE ++ max_linesize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); ++#else ++ ReadInt("/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size", &max_linesize); ++#endif ++#ifdef _SC_LEVEL2_DCACHE_LINESIZE ++ linesize = sysconf(_SC_LEVEL2_DCACHE_LINESIZE); ++#else ++ ReadInt("/sys/devices/system/cpu/cpu0/cache/index1/coherency_line_size", &linesize); ++#endif + if (linesize > max_linesize) max_linesize = linesize; +- linesize = sysconf(_SC_LEVEL3_CACHE_LINESIZE); ++#ifdef _SC_LEVEL3_DCACHE_LINESIZE ++ linesize = sysconf(_SC_LEVEL3_DCACHE_LINESIZE); ++#else ++ ReadInt("/sys/devices/system/cpu/cpu0/cache/index2/coherency_line_size", &linesize); ++#endif + if (linesize > max_linesize) max_linesize = linesize; +- linesize = sysconf(_SC_LEVEL4_CACHE_LINESIZE); ++#ifdef _SC_LEVEL4_DCACHE_LINESIZE ++ linesize = sysconf(_SC_LEVEL4_DCACHE_LINESIZE); ++#else ++ ReadInt("/sys/devices/system/cpu/cpu0/cache/index3/coherency_line_size", &linesize); ++#endif + if (linesize > max_linesize) max_linesize = linesize; + return max_linesize; + } +--- a/src/sat.h ++++ b/src/sat.h +@@ -136,7 +136,8 @@ class Sat { + int CpuCount(); + // Return the worst-case (largest) cache line size of the system. + int CacheLineSize(); +- ++ // Read int values from kernel file system e.g. sysfs ++ int ReadInt(const char *filename, int *value); + // Collect error counts from threads. + int64 GetTotalErrorCount(); + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb new file mode 100644 index 000000000..a2966e99d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb @@ -0,0 +1,21 @@ +SUMMARY = "Stressful Application Test" +DESCRIPTION = "Stressful Application Test (or stressapptest, its unix name) \ + is a memory interface test. It tries to maximize randomized traffic to memory \ + from processor and I/O, with the intent of creating a realistic high load \ + situation in order to test the existing hardware devices in a computer. \ +" +HOMEPAGE = "https://github.com/stressapptest/stressapptest" +SECTION = "benchmark" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ea9d559f985fb4834317d8ed6b9e58" + +SRCREV = "fb72e5e5f0879231f38e0e826a98a6ca2d1ca38e" + +SRC_URI = "git://github.com/stressapptest/stressapptest \ + file://libcplusplus-compat.patch \ + file://read_sysfs_for_cachesize.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_17.bb b/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_17.bb deleted file mode 100644 index 4edb2e664..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_17.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager." -SUMMARY = "EFI Boot Manager" -HOMEPAGE = "https://github.com/rhinstaller/efibootmgr" -SECTION = "base" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -DEPENDS = "pciutils zlib efivar" - -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" - -SRCREV = "e067160ecef8208e1944002e5d50b275733211fb" -SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ - file://0001-remove-extra-decl.patch \ - " -S = "${WORKDIR}/git" - -inherit pkgconfig - -EXTRA_OEMAKE = "'EFIDIR=/' 'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/src/include `pkg-config --cflags efivar`'" - -CFLAGS_append_toolchain-clang = " -Wno-error" -do_install () { - install -D -p -m0755 ${B}/src/efibootmgr ${D}/${sbindir}/efibootmgr -} - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/files/0001-remove-extra-decl.patch b/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/files/0001-remove-extra-decl.patch deleted file mode 100644 index 42f3a8182..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/files/0001-remove-extra-decl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Wed, 13 Jun 2018 09:41:01 -0400 -Subject: [PATCH] remove extra decl - -Signed-off-by: Peter Jones <pjones@redhat.com> - -Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - src/efibootmgr.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/efibootmgr.c b/src/efibootmgr.c -index de38f01..4e1a680 100644 ---- a/src/efibootmgr.c -+++ b/src/efibootmgr.c -@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv) - "invalid numeric value %s\n", - optarg); - } -- /* XXX efivar-36 accidentally doesn't have a public -- * header for this */ -- extern int efi_set_verbose(int verbosity, FILE *errlog); - efi_set_verbose(opts.verbose - 2, stderr); - break; - case 'V': --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch deleted file mode 100644 index 251e50c90..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9115d9e6f0f62d6bb735ce3698858d1f89f8d73 Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Fri, 25 Sep 2015 18:14:31 +0800 -Subject: [PATCH] efivar: fix for cross compile - -It builds and calls elf file makeguids to generate a header file which -doesn't work for cross compile. Fix it. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 0c16597..dcc7fc8 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -40,8 +40,8 @@ abicheck : $(patsubst %.so,%.abicheck,$(LIBTARGETS)) - ./guid-symbols.c : include/efivar/efivar-guids.h - ./guids.bin : include/efivar/efivar-guids.h - ./names.bin : include/efivar/efivar-guids.h --include/efivar/efivar-guids.h : makeguids guids.txt -- ./makeguids guids.txt guids.bin names.bin \ -+include/efivar/efivar-guids.h : guids.txt -+ makeguids guids.txt guids.bin names.bin \ - guid-symbols.c include/efivar/efivar-guids.h - - makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch deleted file mode 100644 index 96d0c6b3b..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b3d35e7dd27a755df5acbe050837885914dbb28b Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 10 May 2016 11:34:50 -0400 -Subject: [PATCH] fix unknow option for gold linker - -- Revert the following patch, since oe-core work with gcc 5 -... -commit 3055a3797f16693dfdd855fa68bc57fd900dc408 -Author: Peter Jones <pjones@redhat.com> -Date: Mon Feb 15 14:15:40 2016 -0500 - - Make gcc.specs work with gcc 6 / binutils 2.26 - - Apparently binutils 2.26 gets real picky about "ld -PIC" vs "ld -fPIC". - - Signed-off-by: Peter Jones <pjones@redhat.com> -... - -- Remove unknown option '--add-needed' - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gcc.specs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: git/gcc.specs -=================================================================== ---- git.orig/gcc.specs -+++ git/gcc.specs -@@ -14,4 +14,4 @@ - + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} - - *link: --+ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} -++ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch deleted file mode 100644 index 043b07a65..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c10368b397483a2fc7b493c099d8416d902f8cd8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 14:18:35 +0800 -Subject: [PATCH] allow multi definitions for native - -Upstream-Status: Pending - -It fails to create .so file when build efivar-native: - -| lib.o:(*IND*+0x0): multiple definition of `efi_set_variable' -| lib.o:lib.c:(.text+0xa0): first defined here - -Add link option '-z muldefs' to fix it. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Make.rules | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Make.rules b/Make.rules -index 042585b..257ba45 100644 ---- a/Make.rules -+++ b/Make.rules -@@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version - $(CCLD) $(ccldflags) $(CPPFLAGS) $(SOFLAGS) \ - -Wl,-soname,$@.1 \ - -Wl,--version-script=$(MAP) \ -+ -Wl,-z,muldefs \ - -o $@ $^ $(LDLIBS) - ln -vfs $@ $@.1 - --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_37.bb b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_37.bb deleted file mode 100644 index 4b458dedd..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_37.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Tools to manipulate UEFI variables" -DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" -HOMEPAGE = "https://github.com/rhinstaller/efivar" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" - -DEPENDS = "popt" -DEPENDS_append_class-target = " efivar-native" - -inherit pkgconfig - -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" - -SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" -SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://allow-multi-definitions-for-native.patch \ - " -SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ - " - -S = "${WORKDIR}/git" - -do_compile_prepend() { - sed -i -e s:-Werror::g ${S}/gcc.specs -} - -do_compile_class-native() { - oe_runmake -C src makeguids CC_FOR_BUILD="${BUILD_CC}" -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - -do_install_class-native() { - install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids -} - -BBCLASSEXTEND = "native" - -RRECOMMENDS_${PN}_class-target = "kernel-module-efivarfs" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb index 61e53029b..2f299b1ba 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb @@ -13,15 +13,12 @@ inherit autotools-brokensep pkgconfig bash-completion systemd SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32" SRC_URI = "git://github.com/pmem/ndctl.git" -DEPENDS = "virtual/kernel kmod udev json-c" +DEPENDS = "kmod udev json-c" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" -# Depends on MACHINE_ARCH kernel -PACKAGE_ARCH = "${MACHINE_ARCH}" - PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.15.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb index e1a038dfa..e1a038dfa 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.15.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index eed23d28a..9a398b308 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -2,9 +2,9 @@ SUMMARY = "A robust, scalable, and reliable SQL server" HOMEPAGE = "http://mariadb.org" SECTION = "libs" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LIC_FILES_CHKSUM = "file://COPYING;md5=b1becf0cfa3366e0f4d854d1d264f311" -SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN}-${PV}.tar.gz \ +SRC_URI = "https://downloads.mariadb.com/MariaDB/${BPN}-${PV}/source/${BPN}-${PV}.tar.gz \ file://my.cnf \ file://mysqld.service \ file://install_db.service \ @@ -19,8 +19,8 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN} file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ " -SRC_URI[md5sum] = "08edd8b5060a181e6dd3c6aac23218cd" -SRC_URI[sha256sum] = "27f391a54d544f93850d4edfb3ef1b4cf24f8e27e61e51727b0e7d31bb4d6968" +SRC_URI[md5sum] = "11220d0b94c5c24caa2e1e9eaba38e31" +SRC_URI[sha256sum] = "39e9723eaf620afd99b0925b2c2a5a50a89110ba50040adf14cce7cf89e5e21b" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.15.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb index de24c920f..de24c920f 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.15.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf3-compatibility.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf3-compatibility.patch new file mode 100644 index 000000000..35914952d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf3-compatibility.patch @@ -0,0 +1,55 @@ +From 7456d1621223d425b8a3fd74e435a79c046169fb Mon Sep 17 00:00:00 2001 +From: Robert Edmonds <edmonds@users.noreply.github.com> +Date: Wed, 10 Apr 2019 20:47:48 -0400 +Subject: [PATCH] t/generated-code2/cxx-generate-packed-data.cc: Fix build + failure on newer protobuf + + Upstream-Status: Backport [https://github.com/protobuf-c/protobuf-c/pull/369] + +google::protobuf::Message::Reflection has been removed in newer versions +of protobuf. The replacement is google::protobuf::Reflection. + +protobuf in commit 779f61c6a3ce02a119e28e802f229e61b69b9046 ("Integrate +recent changes from google3.", from August 2008) changed the following +in message.h: + + @@ -336,7 +337,8 @@ class LIBPROTOBUF_EXPORT Message { + + // Introspection --------------------------------------------------- + + - class Reflection; // Defined below. + + // Typedef for backwards-compatibility. + + typedef google::protobuf::Reflection Reflection; + +The "typedef for backwards-compatibility" apparently lasted ten years +until protobuf commit 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 +("Down-integrate from google3.", from August 2018) which finally removed +the typedef: + + @@ -327,8 +344,6 @@ class LIBPROTOBUF_EXPORT Message : public MessageLite { + + // Introspection --------------------------------------------------- + + - // Typedef for backwards-compatibility. + - typedef google::protobuf::Reflection Reflection; + +This commit updates the only use of this typedef (in the test suite) to +directly refer to the replacement, google::protobuf::Reflection. This +fixes the build failure in the test suite. +--- + t/generated-code2/cxx-generate-packed-data.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/generated-code2/cxx-generate-packed-data.cc b/t/generated-code2/cxx-generate-packed-data.cc +index 4fd3e25..0865d2e 100644 +--- a/t/generated-code2/cxx-generate-packed-data.cc ++++ b/t/generated-code2/cxx-generate-packed-data.cc +@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_enum (void) + static void dump_test_unknown_fields (void) + { + EmptyMess mess; +- const google::protobuf::Message::Reflection *reflection = mess.GetReflection(); ++ const google::protobuf::Reflection *reflection = mess.GetReflection(); + google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess); + + #if GOOGLE_PROTOBUF_VERSION >= 2001000 diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb index 7ef030092..1d1782306 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb @@ -15,7 +15,9 @@ DEPENDS = "protobuf-native protobuf" PV .= "+git${SRCPV}" SRCREV = "269771b4b45d3aba04e59569f53600003db8d9ff" -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git" +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \ + file://protobuf3-compatibility.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch new file mode 100644 index 000000000..a160e5e97 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch @@ -0,0 +1,52 @@ +From ea6e776e50971c89ad2293046b6ae2a6a9753c56 Mon Sep 17 00:00:00 2001 +From: Adam Cozzette <acozzette@google.com> +Date: Thu, 6 Jun 2019 10:29:58 -0700 +Subject: [PATCH] Added stubs/map_util.h to list of installed headers + +This should fix issue #6186. I also had to remove a couple unnecessary +const keywords in map_util.h because the no_warning_test was showing +errors about those. + +Upstream-Status: Submitted [https://github.com/protocolbuffers/protobuf/pull/6223] +--- + src/Makefile.am | 1 + + src/google/protobuf/stubs/map_util.h | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index be18ba76..1689e221 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -72,6 +72,7 @@ nobase_include_HEADERS = \ + google/protobuf/stubs/hash.h \ + google/protobuf/stubs/logging.h \ + google/protobuf/stubs/macros.h \ ++ google/protobuf/stubs/map_util.h \ + google/protobuf/stubs/mutex.h \ + google/protobuf/stubs/once.h \ + google/protobuf/stubs/platform_macros.h \ +diff --git a/src/google/protobuf/stubs/map_util.h b/src/google/protobuf/stubs/map_util.h +index 2313e1f5..b04d9d46 100644 +--- a/src/google/protobuf/stubs/map_util.h ++++ b/src/google/protobuf/stubs/map_util.h +@@ -620,7 +620,7 @@ bool UpdateReturnCopy(Collection* const collection, + // twice. Unlike UpdateReturnCopy this also does not come with the issue of an + // undefined previous* in case new data was inserted. + template <class Collection> +-typename Collection::value_type::second_type* const ++typename Collection::value_type::second_type* + InsertOrReturnExisting(Collection* const collection, + const typename Collection::value_type& vt) { + std::pair<typename Collection::iterator, bool> ret = collection->insert(vt); +@@ -633,7 +633,7 @@ InsertOrReturnExisting(Collection* const collection, + + // Same as above, except for explicit key and data. + template <class Collection> +-typename Collection::value_type::second_type* const ++typename Collection::value_type::second_type* + InsertOrReturnExisting( + Collection* const collection, + const typename Collection::value_type::first_type& key, +-- +2.11.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb index cf72d9ca7..476d1e309 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb @@ -10,13 +10,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -PV .= "+git${SRCPV}" +SRCREV = "09745575a923640154bcf307fba8aedff47f240a" -SRCREV = "48cb18e5c419ddd23d9badcfe4e9df7bde1979b2" - -SRC_URI = "git://github.com/google/protobuf.git;branch=3.6.x \ +SRC_URI = "git://github.com/google/protobuf.git;branch=3.8.x \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ + file://0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch index a36478bfb..b882d76ec 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch @@ -1,6 +1,6 @@ -From 5ad700c92224193bfc789f7d53af38fc6f8b8904 Mon Sep 17 00:00:00 2001 +From f2f8be496c8e34b4d909b688a95c6f8565201081 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 19 Jul 2018 17:31:35 +0800 +Date: Wed, 19 Jun 2019 14:30:44 +0800 Subject: [PATCH] fix compiling failure on mips64-n32 bsp - Tweak mips64-n32 with mips32 @@ -16,15 +16,18 @@ Subject: [PATCH] fix compiling failure on mips64-n32 bsp Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> --- build/moz.configure/init.configure | 5 ++++- js/src/jit/mips-shared/Architecture-mips-shared.h | 4 +++- python/mozbuild/mozbuild/configure/constants.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 648ac2d..d0bcaf8 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -650,7 +650,10 @@ def split_triplet(triplet, allow_unknown +@@ -650,7 +650,10 @@ def split_triplet(triplet, allow_unknown=False): canonical_cpu = 'mips32' endianness = 'little' if 'el' in cpu else 'big' elif cpu in ('mips64', 'mips64el'): @@ -36,26 +39,30 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> endianness = 'little' if 'el' in cpu else 'big' elif cpu.startswith('aarch64'): canonical_cpu = 'aarch64' +diff --git a/js/src/jit/mips-shared/Architecture-mips-shared.h b/js/src/jit/mips-shared/Architecture-mips-shared.h +index e95ffd4..caf83f7 100644 --- a/js/src/jit/mips-shared/Architecture-mips-shared.h +++ b/js/src/jit/mips-shared/Architecture-mips-shared.h -@@ -26,6 +26,8 @@ - #define USES_O32_ABI - #elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || defined(JS_SIMULATOR_MIPS64) +@@ -28,6 +28,8 @@ + #elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || \ + defined(JS_SIMULATOR_MIPS64) #define USES_N64_ABI +#elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABIN32)) +#define USES_N32_ABI #else #error "Unsupported ABI" #endif -@@ -93,7 +95,7 @@ class Registers - ta1 = t5, - ta2 = t6, - ta3 = t7, +@@ -94,7 +96,7 @@ class Registers { + ta1 = t5, + ta2 = t6, + ta3 = t7, -#elif defined(USES_N64_ABI) +#elif defined(USES_N64_ABI) || defined(USES_N32_ABI) - a4 = r8, - a5 = r9, - a6 = r10, + a4 = r8, + a5 = r9, + a6 = r10, +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index 1067b6a..e0f0405 100644 --- a/python/mozbuild/mozbuild/configure/constants.py +++ b/python/mozbuild/mozbuild/configure/constants.py @@ -90,8 +90,8 @@ CPU_preprocessor_checks = OrderedDict(( @@ -68,3 +75,6 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ('sh4', '__sh__'), )) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 54ed043f4..054e0acc8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -10,10 +10,6 @@ SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git${SRCPV}" -DEPENDS="virtual/kernel" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - inherit autotools pkgconfig DEPENDS += "libdaemon" diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch new file mode 100644 index 000000000..56981d96f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch @@ -0,0 +1,89 @@ +From 50cea8fd3c07ab27da6edce865a49339f16f3b57 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Tue, 18 Jun 2019 17:10:15 +0800 +Subject: [PATCH] Makefile: fix multilib build failure + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + Makefile | 50 +++++++++++++++++++++++++++----------------------- + 1 file changed, 27 insertions(+), 23 deletions(-) + +diff --git a/Makefile b/Makefile +index 8455415..4aa0786 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,30 +1,34 @@ + # SPDX-License-Identifier: GPL-2.0 + PREFIX ?= /usr + DESTDIR ?= ++BASELIB ?= + + all: + @echo "Nothing to build" + ++clean: ++ @echo "Nothing to clean" ++ + install : uninstall +- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph +- install sleepgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph +- install bootgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph +- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config +- install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config ++ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ++ install sleepgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ++ install bootgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ++ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ++ install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config + + install -d $(DESTDIR)$(PREFIX)/bin +- ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph +- ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph ++ ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph ++ ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph + + install -d $(DESTDIR)$(PREFIX)/share/man/man8 + install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8 +@@ -37,11 +41,11 @@ uninstall : + rm -f $(DESTDIR)$(PREFIX)/bin/bootgraph + rm -f $(DESTDIR)$(PREFIX)/bin/sleepgraph + +- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/config/* +- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config ] ; then \ +- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph/config; \ ++ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config/* ++ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ] ; then \ ++ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config; \ + fi; +- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/* +- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph ] ; then \ +- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph; \ ++ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/* ++ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ] ; then \ ++ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph; \ + fi; +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb index de2d46dca..ea12e054d 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb @@ -6,11 +6,12 @@ LICENSE = "GPL-2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7" -SRC_URI = "git://github.com/intel/pm-graph.git" +SRC_URI = "git://github.com/intel/pm-graph.git \ + file://0001-Makefile-fix-multilib-build-failure.patch" S = "${WORKDIR}/git" COMPATIBLE_HOST='(i.86|x86_64).*' -EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D}" +EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" do_install() { oe_runmake install diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb index 131e84961..7752e76b5 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb @@ -5,6 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" PROVIDES = "virtual/gpsd" +# SConstruct in gpsd does not yet support Python 3 +DEPENDS += "python-scons-native" +DEPENDS_remove = "python3-scons-native" + EXTRANATIVEPATH += "chrpath-native" SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.bb index ffa2b9f12..71a45edb9 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.bb @@ -2,14 +2,14 @@ require libgpiod.inc DEPENDS += "autoconf-archive-native" -SRC_URI[md5sum] = "9f7530a5d56f070ba0af78d6ba077973" -SRC_URI[sha256sum] = "6ec837f23e8f2196e5976dec4ac81403170830075e7f33ede1394eaf67f2e962" +SRC_URI[md5sum] = "bd52d764017215a30e2f014d2081dc3e" +SRC_URI[sha256sum] = "ebde83aaf14be3abd33e7a90faa487a2ee231e242897afe7fdefb765386b3c8b" # enable tools and cxx bindings PACKAGECONFIG ?= "cxx tools" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" -PACKAGECONFIG[tests] = "--enable-tests --enable-install-tests,--disable-tests --disable-install-tests,kmod udev" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} 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.10.bb index c72df6d5e..b40223e8a 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.10.bb @@ -19,7 +19,6 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-static" do_install_append () { - rm -rf ${D}${libdir}/*.la rm -rf ${D}${docdir}/${BPN} } diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/iconv-detect.h b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/iconv-detect.h new file mode 100644 index 000000000..714cb5aa9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/iconv-detect.h @@ -0,0 +1,5 @@ +/* This is an auto-generated header, DO NOT EDIT! */ + +#define ICONV_ISO_INT_FORMAT "iso-%u-%u" +#define ICONV_ISO_STR_FORMAT "iso-%u-%s" +#define ICONV_10646 "iso-10646" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/nodolt.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/nodolt.patch new file mode 100644 index 000000000..1f9bdd304 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime/nodolt.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -150,7 +150,6 @@ AC_EXEEXT + AC_PROG_LIBTOOL + dnl when using libtool 2.x create libtool early, because it's used in configure + m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) +-DOLT + + dnl Checks for header files. + AC_CHECK_HEADERS(sys/mman.h) diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb new file mode 100644 index 000000000..8c6f0b010 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DESCRIPTION = "Runtime libraries for parsing and creating MIME mail" +SECTION = "libs" +DEPENDS = "glib-2.0 zlib" + +inherit gnome autotools gobject-introspection + +SRC_URI += "file://iconv-detect.h \ + file://nodolt.patch" + +SRC_URI[archive.md5sum] = "69ae21a0b1df966a7d39a9431856ac81" +SRC_URI[archive.sha256sum] = "6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311" + +EXTRA_OECONF_remove = "--disable-schemas-install" + +export ac_cv_have_iconv_detect_h="yes" +do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}" + +# we do not need GNOME 1 gnome-config support +do_install_append () { + rm -f ${D}${libdir}/gmimeConf.sh +} diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.24.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.24.0.bb index beae281a3..7632fd2de 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.24.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.24.0.bb @@ -3,7 +3,7 @@ SECTION = "webos/services" LICENSE = "GPLv2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "pidgin intltool-native glib-2.0-native" +DEPENDS = "pidgin gmime intltool-native glib-2.0-native" inherit pkgconfig inherit autotools @@ -19,7 +19,7 @@ PACKAGECONFIG[nss] = "--enable-nss=yes,--enable-nss=no,nss" PACKAGECONFIG[openssl] = "--enable-openssl=yes,--enable-openssl=no,openssl" PACKAGECONFIG[krb5] = "--with-krb5=yes,--with-krb5=no,krb5" #PACKAGECONFIG[voice_and_video] = "--with-vv=yes,--with-vv=no,libnice gstreamer" -PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepathy-glib gmime" +PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepathy-glib" #PACKAGECONFIG[gssapi_only] = "--enable-gssapi-only=yes,--enable-gssapi-only=no,krb5" PACKAGECONFIG[debug] = "--enable-debug=yes,--enable-debug=no,valgrind" diff --git a/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb b/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb index ea5bb1b0c..fb18fe2a4 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb @@ -34,6 +34,6 @@ RDEPENDS_${PN} += "\ perl-module-io-select \ perl-module-io-socket \ " -RDEPENDS_${PN}-ptest += "${PN} freeradius" +RDEPENDS_${PN}-ptest += "freeradius" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-perl_0.4224.bb b/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-perl_0.4224.bb deleted file mode 100644 index d523a7a0c..000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-perl_0.4224.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Module::Build - Build and install Perl modules" -DESCRIPTION = "Many Perl distributions use a Build.PL file instead of a \ -Makefile.PL file to drive distribution configuration, build, test and \ -installation. Traditionally, Build.PL uses Module::Build as the underlying \ -build system. This module provides a simple, lightweight, drop-in replacement. \ -Whereas Module::Build has over 6,700 lines of code; this module has less than \ -120, yet supports the features needed by most distributions." - -SECTION = "libs" - -HOMEPAGE = "https://metacpan.org/release/Module-Build" - -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://README;beginline=960;endline=965;md5=624c06db56a2af4d70cf9edc29fcae1b" - -SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz" -SRC_URI[md5sum] = "b74c2f6e84b60aad3a3defd30b6f0f4d" -SRC_URI[sha256sum] = "a6ca15d78244a7b50fdbf27f85c85f4035aa799ce7dd018a0d98b358ef7bc782" - -S = "${WORKDIR}/Module-Build-${PV}" - -inherit cpan_build - -# From: -# https://github.com/rehsack/meta-cpan/blob/master/recipes-devel/module-build-perl/module-build-perl_0.4216.bb -# -do_patch_module_build () { - cd ${S} - sed -i -e 's,my $interpreter = $self->{properties}{perl};,my $interpreter = "${bindir}/perl";,g' lib/Module/Build/Base.pm -} - -do_patch[postfuncs] += "do_patch_module_build" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc index 9d99b3475..23e18563a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc @@ -7,7 +7,7 @@ HOMEPAGE = " http://certifi.io/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" -SRC_URI[md5sum] = "76381d19d0a1171fecb2d1002b81424e" -SRC_URI[sha256sum] = "b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae" +SRC_URI[md5sum] = "af8fea5f3df6f7f81e9c6cbc6dd7c1e8" +SRC_URI[sha256sum] = "945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.3.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb index adfe6238e..adfe6238e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.3.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-lxml.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-lxml.inc index d67c17883..dd73a412b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-lxml.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-lxml.inc @@ -33,6 +33,18 @@ DISTUTILS_INSTALL_ARGS += " \ inherit pypi +# {standard input}: Assembler messages: +# {standard input}:1488805: Error: branch out of range +DEBUG_OPTIMIZATION_remove_mips = " -Og" +DEBUG_OPTIMIZATION_append_mips = " -O" +BUILD_OPTIMIZATION_remove_mips = " -Og" +BUILD_OPTIMIZATION_append_mips = " -O" + +DEBUG_OPTIMIZATION_remove_mipsel = " -Og" +DEBUG_OPTIMIZATION_append_mipsel = " -O" +BUILD_OPTIMIZATION_remove_mipsel = " -Og" +BUILD_OPTIMIZATION_append_mipsel = " -O" + do_configure_prepend() { sed -i -e 's/--version/--modversion/' ${B}/setupinfo.py } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc index 54eacc0b7..2929700a0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec inherit pypi -SRC_URI[md5sum] = "e2daef80e70249aa1f05363670c6b3f8" -SRC_URI[sha256sum] = "1489b376b0f364bcc6f89519718c057eb191d7ad6f1b395ffd93d1aa45587811" +SRC_URI[md5sum] = "b7095f3eb736459716d606677b5a29ee" +SRC_URI[sha256sum] = "8c61cc8a76e9d381c665aecc5105fa0f1878cf7db8b5cd17202603bcb386d0fc" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.8.0.bb index f04fc489f..f04fc489f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.8.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc index ddef414a1..005aaadef 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc @@ -7,8 +7,8 @@ HOMEPAGE = "http://www.twistedmatrix.com" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d136e8cf7b52f2e64079186ae2060d8a" -SRC_URI[sha256sum] = "1708e1928ae84ec9d3ebab0d427e20e1e38ff721b15bbced476d047d4a43abbe" -SRC_URI[md5sum] = "473e12f4226e0fecc0ca5698e418e3f6" +SRC_URI[sha256sum] = "fa2c04c2d68a9be7fc3975ba4947f653a57a656776f24be58ff0fe4b9aaf3e52" +SRC_URI[md5sum] = "528b7856938edc2a752c244aebd94981" PYPI_PACKAGE = "Twisted" PYPI_PACKAGE_EXT = "tar.bz2" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.2.1.bb index 5903db3e0..5903db3e0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc index 4de09d2fd..ed49811fe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc @@ -4,8 +4,8 @@ LICENSE = "BSD" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=fdfc019b57affbe1d7a32e3d34e83db4" -SRC_URI[md5sum] = "9f21acd7c0a57bf3057715c4665db3c7" -SRC_URI[sha256sum] = "4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533" +SRC_URI[md5sum] = "cc15c001b129f81eb2f79b15eb99ffe5" +SRC_URI[sha256sum] = "565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.11.2.bb index bb4247657..bb4247657 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.11.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.3.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb index 70f674b22..70f674b22 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.3.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf/0001-Add-Python-3.7-compatibility-4862.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf/0001-Add-Python-3.7-compatibility-4862.patch deleted file mode 100644 index da5e73b15..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf/0001-Add-Python-3.7-compatibility-4862.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 539bc017a62f91bdf7c547b58948cb5a2f59d918 Mon Sep 17 00:00:00 2001 -From: Ben Webb <ben@salilab.org> -Date: Thu, 12 Jul 2018 10:58:10 -0700 -Subject: [PATCH] Add Python 3.7 compatibility (#4862) - -Compilation of Python wrappers fails with Python 3.7 because -the Python folks changed their C API such that -PyUnicode_AsUTF8AndSize() now returns a const char* rather -than a char*. Add a patch to work around. Relates #4086. - -Upstream-Status: Backport [https://github.com/protocolbuffers/protobuf.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - google/protobuf/pyext/descriptor.cc | 2 +- - google/protobuf/pyext/descriptor_containers.cc | 2 +- - google/protobuf/pyext/descriptor_pool.cc | 2 +- - google/protobuf/pyext/extension_dict.cc | 2 +- - google/protobuf/pyext/message.cc | 4 ++-- - 5 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/google/protobuf/pyext/descriptor.cc b/google/protobuf/pyext/descriptor.cc -index 8af0cb1..19a1c38 100644 ---- a/google/protobuf/pyext/descriptor.cc -+++ b/google/protobuf/pyext/descriptor.cc -@@ -56,7 +56,7 @@ - #endif - #define PyString_AsStringAndSize(ob, charpp, sizep) \ - (PyUnicode_Check(ob)? \ -- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ -+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ - PyBytes_AsStringAndSize(ob, (charpp), (sizep))) - #endif - -diff --git a/google/protobuf/pyext/descriptor_containers.cc b/google/protobuf/pyext/descriptor_containers.cc -index bc007f7..0153664 100644 ---- a/google/protobuf/pyext/descriptor_containers.cc -+++ b/google/protobuf/pyext/descriptor_containers.cc -@@ -66,7 +66,7 @@ - #endif - #define PyString_AsStringAndSize(ob, charpp, sizep) \ - (PyUnicode_Check(ob)? \ -- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ -+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ - PyBytes_AsStringAndSize(ob, (charpp), (sizep))) - #endif - -diff --git a/google/protobuf/pyext/descriptor_pool.cc b/google/protobuf/pyext/descriptor_pool.cc -index 95882ae..962accc 100644 ---- a/google/protobuf/pyext/descriptor_pool.cc -+++ b/google/protobuf/pyext/descriptor_pool.cc -@@ -48,7 +48,7 @@ - #endif - #define PyString_AsStringAndSize(ob, charpp, sizep) \ - (PyUnicode_Check(ob)? \ -- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ -+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ - PyBytes_AsStringAndSize(ob, (charpp), (sizep))) - #endif - -diff --git a/google/protobuf/pyext/extension_dict.cc b/google/protobuf/pyext/extension_dict.cc -index 018b5c2..174c547 100644 ---- a/google/protobuf/pyext/extension_dict.cc -+++ b/google/protobuf/pyext/extension_dict.cc -@@ -53,7 +53,7 @@ - #endif - #define PyString_AsStringAndSize(ob, charpp, sizep) \ - (PyUnicode_Check(ob)? \ -- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ -+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ - PyBytes_AsStringAndSize(ob, (charpp), (sizep))) - #endif - -diff --git a/google/protobuf/pyext/message.cc b/google/protobuf/pyext/message.cc -index 5893533..31094b7 100644 ---- a/google/protobuf/pyext/message.cc -+++ b/google/protobuf/pyext/message.cc -@@ -79,7 +79,7 @@ - (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob)) - #define PyString_AsStringAndSize(ob, charpp, sizep) \ - (PyUnicode_Check(ob)? \ -- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ -+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ - PyBytes_AsStringAndSize(ob, (charpp), (sizep))) - #endif - #endif -@@ -1529,7 +1529,7 @@ PyObject* HasField(CMessage* self, PyObject* arg) { - return NULL; - } - #else -- field_name = PyUnicode_AsUTF8AndSize(arg, &size); -+ field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size)); - if (!field_name) { - return NULL; - } --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.8.0.bb index 9b0668a02..30ea34e90 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.8.0.bb @@ -1,7 +1,6 @@ inherit setuptools3 require python-protobuf.inc -SRC_URI += "file://0001-Add-Python-3.7-compatibility-4862.patch" DEPENDS += "protobuf" DISTUTILS_BUILD_ARGS += "--cpp_implementation" DISTUTILS_INSTALL_ARGS += "--cpp_implementation" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.2.1.bb index dfb9d4a4c..dfb9d4a4c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.11.2.bb index 85f446ef9..85f446ef9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.11.2.bb diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch new file mode 100644 index 000000000..94cad23f8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch @@ -0,0 +1,14 @@ +'@include' is not a standard sysntax and not supported by oe. + +Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=15626] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +diff --git a/data/xfce4-screensaver.common-auth b/data/xfce4-screensaver.common-auth +index a9fd9ce..3bfea70 100644 +--- a/data/xfce4-screensaver.common-auth ++++ b/data/xfce4-screensaver.common-auth +@@ -1,2 +1,2 @@ +-@include common-auth ++auth include common-auth + auth optional pam_gnome_keyring.so diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb index fb2be6609..4a1aae764 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb @@ -12,8 +12,15 @@ DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfcon inherit xfce-app -SRC_URI_append = " file://fix-cross-compile.patch" -SRC_URI[md5sum] = "18a619849f85c24d784c7fa27279ca4b" -SRC_URI[sha256sum] = "ed04ae32034b8e13a78495ca2bd7789a20ec7f67891ab9e92826a944371eabef" +SRC_URI_append = " \ + file://fix-cross-compile.patch \ + file://fix-pam-config.patch \ +" +SRC_URI[md5sum] = "982f9a355456320933ec08313523a567" +SRC_URI[sha256sum] = "fdecf0fc432b59defba2dd706051696d47227ca0744c7971014021190126f2d5" + +do_install_append() { + install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver +} FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" diff --git a/meta-openembedded/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend b/meta-openembedded/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend index c47522379..916f083b9 100644 --- a/meta-openembedded/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend +++ b/meta-openembedded/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend @@ -1 +1,2 @@ +# Just a comment line to avoid PAK archive (application/x-pak) PACKAGECONFIG_append = " thunar" |