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 --- .../meta/recipes-support/atk/at-spi2-atk_2.26.1.bb | 22 --------- .../meta/recipes-support/atk/at-spi2-atk_2.26.2.bb | 20 +++++++++ .../0001-build-Add-with-systemduserunitdir.patch | 52 ---------------------- .../recipes-support/atk/at-spi2-core_2.26.2.bb | 29 ------------ .../recipes-support/atk/at-spi2-core_2.28.0.bb | 39 ++++++++++++++++ .../0001-Switch-from-filename-to-basename.patch | 38 ++++++++++++++++ ...ld-enable-introspection-for-cross-compile.patch | 28 ++++++++++++ poky/meta/recipes-support/atk/atk_2.26.1.bb | 19 -------- poky/meta/recipes-support/atk/atk_2.28.1.bb | 37 +++++++++++++++ 9 files changed, 162 insertions(+), 122 deletions(-) delete mode 100644 poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb create mode 100644 poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb delete mode 100644 poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch delete mode 100644 poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb create mode 100644 poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb create mode 100644 poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch create mode 100644 poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch delete mode 100644 poky/meta/recipes-support/atk/atk_2.26.1.bb create mode 100644 poky/meta/recipes-support/atk/atk_2.28.1.bb (limited to 'poky/meta/recipes-support/atk') diff --git a/poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb b/poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb deleted file mode 100644 index 8617bb871..000000000 --- a/poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "AT-SPI 2 Toolkit Bridge" -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "eeec6cead3350dca48a235271c105b3e" -SRC_URI[sha256sum] = "b4f0c27b61dbffba7a5b5ba2ff88c8cee10ff8dac774fa5b79ce906853623b75" - -DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core" - -inherit autotools pkgconfig distro_features_check upstream-version-is-even - -# The at-spi2-core requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGES =+ "${PN}-gnome ${PN}-gtk2" - -FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" -FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" diff --git a/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb b/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb new file mode 100644 index 000000000..16d8e45ee --- /dev/null +++ b/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "AT-SPI 2 Toolkit Bridge" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" + +SRC_URI[archive.md5sum] = "355c7916a69513490cb83ad34016b169" +SRC_URI[archive.sha256sum] = "61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e" + +DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase distro_features_check upstream-version-is-even + +# The at-spi2-core requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGES =+ "${PN}-gnome ${PN}-gtk2" + +FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" +FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" diff --git a/poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch deleted file mode 100644 index 1f8c9f374..000000000 --- a/poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 21 Jun 2016 16:00:02 +0300 -Subject: [PATCH] build: Add --with-systemduserunitdir - -Default to "pkg-config --variable=systemduserunitdir systemd" but -allow overriding the value. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] -Signed-off-by: Jussi Kukkonen - ---- - bus/Makefile.am | 2 +- - configure.ac | 9 +++++++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/bus/Makefile.am b/bus/Makefile.am -index 688f82a..10cde62 100644 ---- a/bus/Makefile.am -+++ b/bus/Makefile.am -@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in - EXTRA_DIST += org.a11y.Bus.service.in - CLEANFILES += org.a11y.Bus.service - --systemd_userdir = $(prefix)/lib/systemd/user -+systemd_userdir = $(systemduserunitdir) - systemd_user_DATA = at-spi-dbus-bus.service - at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile - $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ -diff --git a/configure.ac b/configure.ac -index 8c4fca2..1415cca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,6 +146,15 @@ else - fi - AC_SUBST(DBUS_SERVICES_DIR) - -+AC_ARG_WITH([systemduserunitdir], -+ AS_HELP_STRING([--with-systemduserunitdir=DIR], -+ [Directory for systemd service files]), -+ [], -+ [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) -+AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) -+ -+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) -+ - GOBJECT_INTROSPECTION_CHECK([1.32.0]) - - AC_SUBST(LIBTOOL_EXPORT_OPTIONS) --- -2.14.1 - diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb deleted file mode 100644 index 521ee3b96..000000000 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - file://0001-build-Add-with-systemduserunitdir.patch \ - " - -SRC_URI[md5sum] = "4a042e4c801fdb793788b749eab21485" -SRC_URI[sha256sum] = "c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615" - -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" - -inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = " \ - --with-systemduserunitdir=${systemd_user_unitdir} \ - --with-dbus-daemondir=${bindir}" - -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service \ - ${datadir}/defaults/at-spi2 \ - ${systemd_user_unitdir}/at-spi-dbus-bus.service \ - " diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb new file mode 100644 index 000000000..7975f58ba --- /dev/null +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + " + +SRC_URI[md5sum] = "9c42f79636ed1c0e908b7483d789b32e" +SRC_URI[sha256sum] = "42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87" + +DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" + +inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ + -Ddbus_daemon=${bindir}" + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Denable-introspection=yes" +GI_DISABLE_FLAG = "-Denable-introspection=no" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " + +FILES_${PN} += "${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service \ + ${datadir}/defaults/at-spi2 \ + ${systemd_user_unitdir}/at-spi-dbus-bus.service \ + " diff --git a/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch b/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch new file mode 100644 index 000000000..047e81fb6 --- /dev/null +++ b/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch @@ -0,0 +1,38 @@ +Upstream-Status: Submitted + +From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Thu, 14 Jun 2018 17:21:49 +0000 +Subject: [PATCH] Switch from filename to basename + +When atk-enum-types.h is installed in to a system, the user likely has +no access to the location where the headers were built, especially if +the software was built in a sysroot environment. If the headers were +built for a mulitlib environment, the build pathing may be different. +Subsequently, if two mulitlib variants of atk are installed together the +headers conflict for no other reason then they were built in two +different locations. Switching from filename to basename, still should +provide sufficient information on the providence of the enums, while not +conflicting for really no good reason. + +Signed-off-by: Jeremy Puhlman +--- + atk/atk-enum-types.h.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template +index 7b4cec4..8321c24 100644 +--- a/atk/atk-enum-types.h.template ++++ b/atk/atk-enum-types.h.template +@@ -14,7 +14,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.14.1.459.g238e487 + diff --git a/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch new file mode 100644 index 000000000..c604a984a --- /dev/null +++ b/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch @@ -0,0 +1,28 @@ +From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Fri, 6 Apr 2018 12:04:00 +0800 +Subject: [PATCH] meson.build: enable introspection for cross-compile + +It works fine in OE-core and doesn't need to be disabled. Let the user decide +if it should be disabled or not. + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal +--- + atk/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atk/meson.build b/atk/meson.build +index 7b5a683..855e28f 100644 +--- a/atk/meson.build ++++ b/atk/meson.build +@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk, + + disable_introspection = get_option('disable_introspection') + +-if not meson.is_cross_build() and not disable_introspection ++if not disable_introspection + gnome.generate_gir(libatk, + sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], + namespace: 'Atk', diff --git a/poky/meta/recipes-support/atk/atk_2.26.1.bb b/poky/meta/recipes-support/atk/atk_2.26.1.bb deleted file mode 100644 index 685b5991d..000000000 --- a/poky/meta/recipes-support/atk/atk_2.26.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -DEPENDS = "glib-2.0" - -inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection - -SRC_URI[archive.md5sum] = "7cddcc313b9a3efd19b2ddf079ba68f5" -SRC_URI[archive.sha256sum] = "ef00ff6b83851dddc8db38b4d9faeffb99572ba150b0664ee02e46f015ea97cb" - -BBCLASSEXTEND = "native" - diff --git a/poky/meta/recipes-support/atk/atk_2.28.1.bb b/poky/meta/recipes-support/atk/atk_2.28.1.bb new file mode 100644 index 000000000..26b13b69d --- /dev/null +++ b/poky/meta/recipes-support/atk/atk_2.28.1.bb @@ -0,0 +1,37 @@ +SUMMARY = "Accessibility toolkit for GNOME" +HOMEPAGE = "http://live.gnome.org/GAP/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/libs" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ + file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" + +# Need gettext-native as Meson can't turn off i18n +DEPENDS = "gettext-native glib-2.0" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Ddisable_introspection=false" +GI_DISABLE_FLAG = "-Ddisable_introspection=true" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " + +SRC_URI_append = " \ + file://0001-meson.build-enable-introspection-for-cross-compile.patch \ + file://0001-Switch-from-filename-to-basename.patch \ + " +SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" +SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" + +BBCLASSEXTEND = "native" + -- cgit v1.2.3