From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../network-manager-applet_1.8.10.bb | 45 ------------------- .../network-manager-applet_1.8.18.bb | 52 ++++++++++++++++++++++ .../networkmanager/networkmanager_%.bbappend | 3 ++ .../obex/obexd/ssize_t_definition.patch | 40 ----------------- .../recipes-connectivity/obex/obexd_0.48.bb | 23 ---------- 5 files changed, 55 insertions(+), 108 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb (limited to 'meta-openembedded/meta-gnome/recipes-connectivity') diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb deleted file mode 100644 index dc2b964be..000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ - gconf libgnome-keyring iso-codes nss \ - intltool-native \ -" - -inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "eae3be75e77ff1a7ea3174be25e62d03" -SRC_URI[archive.sha256sum] = "0adc4bfae8b49f7a1d929c22ef20933bd41fb4a8b458280f44c65f9e45b4c9c3" - -PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" -PACKAGECONFIG ??= "" - -EXTRA_OECONF = " \ - --without-selinux \ -" - -do_configure_append() { - # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror - for i in $(find ${B} -name "Makefile") ; do - sed -i -e s%-Werror[^[:space:]]*%%g $i - done -} - -# gobject-introspection related -GI_DATA_ENABLED_libc-musl = "False" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/libnm-gtk/.libs" -} - -RDEPENDS_${PN} =+ "networkmanager" - -FILES_${PN} += " \ - ${datadir}/appdata \ - ${datadir}/nm-applet/ \ - ${datadir}/libnm-gtk/wifi.ui \ - ${datadir}/libnma/wifi.ui \ -" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb new file mode 100644 index 000000000..01840009e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb @@ -0,0 +1,52 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ + gconf libgnome-keyring iso-codes nss \ + intltool-native \ +" + +GNOMEBASEBUILDCLASS = "autotools-brokensep" +inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "34923579b39360db64649342ee6735d8" +SRC_URI[archive.sha256sum] = "23dc1404f1e0622b7c4718b6d978b101d5e4d9be0b92133b3863a4dc29786178" + +PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" +PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info" +PACKAGECONFIG ??= "" + +EXTRA_OECONF = " \ + --without-selinux \ +" + +do_configure_append() { + # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror + for i in $(find ${B} -name "Makefile") ; do + sed -i -e s%-Werror[^[:space:]]*%%g $i + done +} + +# gobject-introspection related +GI_DATA_ENABLED_libc-musl = "False" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/libnm-gtk/.libs" +} + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnm-gtk/wifi.ui \ + ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" + +# musl builds generate gir files which otherwise go un-packaged +FILES_${PN}-dev += " \ + ${datadir}/gir-1.0 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend new file mode 100644 index 000000000..291a61605 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -0,0 +1,3 @@ +# networkmanager-applet requires glib support +PACKAGECONFIG_append = "glib" + diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch b/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch deleted file mode 100644 index 570cb9ef3..000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch +++ /dev/null @@ -1,40 +0,0 @@ -From fb5056fea9559b3ec3bb61967a112b6c793b700d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 8 Jan 2013 21:33:34 -0800 -Subject: [PATCH] include unistd.h to get ssize_t definitions - -Fixes errors like - -| In file included from plugins/mas.c:36:0: -| ./src/obex.h:39:1: error: unknown type name 'ssize_t' -| ./src/obex.h:49:1: error: unknown type name 'ssize_t' -| ./src/obex.h:50:1: error: unknown type name 'ssize_t' -| In file included from plugins/mas.c:38:0: -| ./src/mimetype.h:36:2: error: expected specifier-qualifier-list before 'ssize_t' -| In file included from plugins/mas.c:39:0: -| plugins/filesystem.h:24:1: error: unknown type name 'ssize_t' -| plugins/mas.c:550:1: error: unknown type name 'ssize_t' -| plugins/mas.c:557:1: error: unknown type name 'ssize_t' -| plugins/mas.c: In function 'any_read': -| plugins/mas.c:560:2: error: unknown type name 'ssize_t' - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - ---- - plugins/mas.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/mas.c b/plugins/mas.c -index 1b18059..b519507 100644 ---- a/plugins/mas.c -+++ b/plugins/mas.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb deleted file mode 100644 index 6096bed73..000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "OBEX Server and Client" -# obexd was integrated into bluez5 -DEPENDS = "glib-2.0 dbus libical" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \ - file://ssize_t_definition.patch \ -" -SRC_URI[md5sum] = "d03cf9bad2983243837f4f6d76ef14a6" -SRC_URI[sha256sum] = "eaa9d8d9542700e6750918d72a3ce00f8cf3a2771d3e2516efd1be5a05f78582" - -inherit autotools-brokensep pkgconfig - -PACKAGES =+ "obex-client obex-plugins" - -FILES_${PN} += "${datadir}/dbus-1/services/${PN}.service" -FILES_obex-client = "${libexecdir}/obex-client \ - ${datadir}/dbus-1/services/obex-client.service" -# currently the plugins are empty -FILES_obex-plugins = "${libdir}/obex/plugins" -- cgit v1.2.1