diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core')
11 files changed, 30 insertions, 114 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_19.bb index ac0f325a4..82d8b8ba6 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_19.bb @@ -6,18 +6,12 @@ SECTION = "base" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" -DEPENDS = "dbus glib-2.0 expat" - -PV = "16+git${SRCPV}" -SRCREV = "fc874afa0992d0c75ec25acb43d344679f0ee7d2" - -SRC_URI = "gitsm://github.com/bus1/dbus-broker;protocol=git" - -S = "${WORKDIR}/git" +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI[sha256sum] = "1648227f5a347d4f38d8a29bb9295a73a25c3feb4f3e79e3f04cc847343da3ed" inherit meson pkgconfig systemd distro_features_check -EXTRA_OEMESON += "-Ddocs=false" +DEPENDS = "expat systemd" REQUIRED_DISTRO_FEATURES = "systemd" @@ -25,8 +19,3 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN} += "${systemd_user_unitdir}" - -RDEPENDS_${PN} = "dbus" - -BBCLASSEXTEND = "native" - diff --git a/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch b/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch deleted file mode 100644 index ada65401a..000000000 --- a/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d8236d1d789f496a193dae5d2a15d706b81f6482 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com> -Date: Thu, 12 Jul 2018 10:19:50 +0200 -Subject: [PATCH] dhcp: include if_arp.h from libc instead of linux headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -To: ell@lists.01.org - -Compilation with musl libc fails due to redefinition of 'struct -arp{req,req_old,hdr}' in linux/if_arp.h, since it is already defined and -included in net/if_arp.h (through net/ethernet.h -> net/if_ether.h). - -The only symbols used from if_arp.h is ARPHRD_ETHER, so it should be -safe to avoid the compile error by including the if_arp.h header from -the c-library instead. - -Upstream-Status: Backport [https://lists.01.org/pipermail/ell/2018-July/001244.html] -Signed-off-by: Martin Hundebøll <martin@geanix.com> ---- - ell/dhcp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ell/dhcp.c b/ell/dhcp.c -index 6c90370..0d99f74 100644 ---- a/ell/dhcp.c -+++ b/ell/dhcp.c -@@ -27,7 +27,7 @@ - #include <netinet/ip.h> - #include <net/ethernet.h> - #include <linux/types.h> --#include <linux/if_arp.h> -+#include <net/if_arp.h> - #include <errno.h> - #include <time.h> - --- -2.18.0 - diff --git a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.8.bb b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb index 0428cab28..27f11cfbe 100644 --- a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.8.bb +++ b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb @@ -7,7 +7,7 @@ SECTION = "libs" inherit autotools pkgconfig S = "${WORKDIR}/git" -SRCREV = "d572281caedef357c392a7c9aa65a3b21a18cfdb" +SRCREV = "ebc021cee3b2d20ca2af5e3ed02495da616b2fd3" SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git" do_configure_prepend () { diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch index d32fe78d3..42f252017 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch @@ -1,6 +1,7 @@ -From f48a69fd11b2eda6c43ff046c202cbc4dcd4e92d Mon Sep 17 00:00:00 2001 +From 52360260c0d73a00082d867bc416225fbc2b657e Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Tue, 12 Jul 2011 11:46:37 +0200 +Subject: [PATCH] glibmm: add 2.28.2 --- Makefile.am | 7 +------ @@ -8,7 +9,7 @@ Date: Tue, 12 Jul 2011 11:46:37 +0200 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am -index a0df8af..c3d5e06 100644 +index 1b366b4..0ff58b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src @@ -26,7 +27,7 @@ index a0df8af..c3d5e06 100644 glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME) glibmm_include_HEADERS = glib/glibmm.h diff --git a/configure.ac b/configure.ac -index c20e778..74203be 100644 +index e706687..198e0d0 100644 --- a/configure.ac +++ b/configure.ac @@ -166,7 +166,6 @@ AC_CONFIG_FILES([Makefile @@ -36,4 +37,4 @@ index c20e778..74203be 100644 - examples/Makefile docs/Makefile docs/reference/Doxyfile - MSVC_Net2013/glibmm/glibmm.rc + MSVC_NMake/glibmm/glibmm.rc diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb index 2f048d2f6..87ab0cbc5 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb @@ -14,8 +14,8 @@ SRC_URI = " \ ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ file://remove-examples.patch \ " -SRC_URI[md5sum] = "5aa7a60084fe3e01d746c96f4a115302" -SRC_URI[sha256sum] = "6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9" +SRC_URI[md5sum] = "77f1016cbb27e15d4e04a2b7bfdb4cae" +SRC_URI[sha256sum] = "6e5fe03bdf1e220eeffd543e017fd2fb15bcec9235f0ffd50674aff9362a85f0" do_install_append() { install -d ${D}${datadir}/glibmm-2.4 diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.1.bb index 53bd5de10..62054a116 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" DEPENDS = "mm-common" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz" -SRC_URI[md5sum] = "70bcbde2c900e4925d6ef4bf50954195" -SRC_URI[sha256sum] = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81" +SRC_URI[md5sum] = "549cffbdb72fa105b782756f2713ffc7" +SRC_URI[sha256sum] = "c9a25f26178c6cbb147f9904d8c533b5a5c5111a41ac2eb781eb734eea446003" S = "${WORKDIR}/libsigc++-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_git.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb index 048f166fc..1f3abf514 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb @@ -8,26 +8,23 @@ HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" -inherit autotools-brokensep pkgconfig module-base bash-completion systemd +inherit autotools-brokensep pkgconfig bash-completion systemd -# v62 -SRCREV = "11f560f4048c1d38b7011a49566871a1e8a07c94" +SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32" SRC_URI = "git://github.com/pmem/ndctl.git" DEPENDS = "virtual/kernel kmod udev json-c" -PV = "v62+git${SRCPV}" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" -PACKAGECONFIG ??= "" -PACKAGECONFIG[systemd] = "--with-systemd-unit-dir=${systemd_system_unitdir}, --without-systemd-unit-dir," +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" do_configure_prepend() { ${S}/autogen.sh } SYSTEMD_SERVICE_${PN} = "ndctl-monitor.service" - -COMPATIBLE_HOST='(x86_64).*' +SYSTEMD_AUTO_ENABLE_${PN} = "disable" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 62f1c7759..5fcf9899b 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -136,8 +136,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ libpwquality libqb libuio \ lockfile-progs logwatch lprng mailx md5deep \ mozjs mraa nana nicstat \ - p7zip p8platform libfile-fnmatch-perl polkit \ - polkit-group-rule-datetime polkit-group-rule-network \ + p7zip p8platform libfile-fnmatch-perl \ rarpd redis rrdtool libfastjson librelp rsyslog sanlock \ sblim-cmpi-devel sblim-sfc-common sblim-sfcc \ scsirastools sgpio smartmontools snappy can-isotp \ @@ -148,6 +147,8 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ ${@bb.utils.contains("DISTRO_FEATURES", "bluez", "collectd", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-ssh-agent-auth openwsman sblim-sfcb ", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit polkit-group-rule-datetime ", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-network ", "", d)} \ ${@bb.utils.contains("BBPATH", "meta-python", "openlmi-tools", "", d)} \ " RDEPENDS_packagegroup-meta-oe-extended_remove_mipsarch = "upm mraa tiptop" @@ -225,7 +226,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ anthy asio atop augeas avro-c bdwgc frame grail \ ccid ceres-solver ckermit cpprest ctapi-common daemonize \ daemontools debsums devmem2 dfu-util dfu-util-native digitemp \ - dstat eject enca epeg espeak espeak-data fbset fbset-modes \ + dstat eject enca epeg espeak fbset fbset-modes \ fftw fltk-native gd gflags glog gnulib gperftools \ gpm gradm gsl gsoap hddtemp hidapi htop hunspell hwdata iksemel \ libinih inotify-tools joe lcms lcov libatasmart libbytesize \ @@ -242,7 +243,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ sjf2410-linux-native satyr sdparm pty-forward-native serial-forward \ sg3-utils sharutils smem spitools srecord ssiapi start-stop-daemon stm32flash \ syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \ - tree udisks udisks2 uhubctl unixodbc upower uriparser usb-modeswitch \ + tree uhubctl unixodbc uriparser usb-modeswitch \ usb-modeswitch-data usbpath uthash utouch-evemu utouch-frame \ vim vim-tiny websocketpp wmiconfig xdelta3 xdg-user-dirs xmlstarlet \ zbar zile \ @@ -250,6 +251,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libcanberra", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xorgxrdp xrdp", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "bluez4", "procmail", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks udisks2 upower", "", d)} \ ${NE10} \ " diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch deleted file mode 100644 index 8638f75b3..000000000 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0c0345303b7971d6cec478fd8b81d64bc1fbe0f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Tue, 21 Aug 2018 23:26:45 +0200 -Subject: [PATCH] Fix build with >= glibc 2.28 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Stolen from [1] - -[1] https://bugs.freedesktop.org/show_bug.cgi?id=102191 - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - src/libply-splash-core/ply-terminal.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c -index a0954f2..f3b32fe 100644 ---- a/src/libply-splash-core/ply-terminal.c -+++ b/src/libply-splash-core/ply-terminal.c -@@ -32,6 +32,7 @@ - #include <sys/socket.h> - #include <sys/stat.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <termios.h> - #include <unistd.h> - #include <wchar.h> --- -2.14.4 - diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb index a5b16c979..305977e5e 100644 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb @@ -17,12 +17,12 @@ PROVIDES = "virtual/psplash" RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" SRC_URI = " \ - http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2 \ + http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ - file://0002-Fix-build-with-glibc-2.28.patch \ -" -SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" -SRC_URI[sha256sum] = "2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f" + " + +SRC_URI[md5sum] = "4efa5551d230165981b105e7c6a50aa7" +SRC_URI[sha256sum] = "4a197a4f1a05785d7453dd829b231352fb2d09171bd86c5ffaafbb2dd6791351" EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ --with-logo=${LOGO} \ diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb index 1ea868f67..614136e27 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb @@ -48,7 +48,7 @@ do_install() { install -m 0644 ${B}/toybox.links ${D}${sysconfdir} } -inherit update-alternatives +inherit cml1 update-alternatives # If you've chosen to install toybox you probably want it to take precedence # over busybox where possible but not over other packages |
