diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/gtk-doc.patch | 34 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/marshal.patch | 28 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus_0.6.bb | 33 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb | 9 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v65.bb (renamed from meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb) | 6 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb | 3 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 21 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb | 2 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb | 2 |
9 files changed, 21 insertions, 117 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/gtk-doc.patch b/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/gtk-doc.patch deleted file mode 100644 index abd7ff416..000000000 --- a/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/gtk-doc.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: eggdbus-0.6/docs/eggdbus/Makefile.am -=================================================================== ---- eggdbus-0.6.orig/docs/eggdbus/Makefile.am -+++ eggdbus-0.6/docs/eggdbus/Makefile.am -@@ -87,11 +87,7 @@ HTML_IMAGES = \ - # Extra options to supply to gtkdoc-fixref - FIXXREF_OPTIONS= - --if ENABLE_GTK_DOC --include $(top_srcdir)/gtk-doc.make --else - CLEANFILES = --endif - - CLEANFILES += *~ \ - eggdbus-scan.* \ -Index: eggdbus-0.6/docs/tests/Makefile.am -=================================================================== ---- eggdbus-0.6.orig/docs/tests/Makefile.am -+++ eggdbus-0.6/docs/tests/Makefile.am -@@ -65,11 +65,7 @@ HTML_IMAGES = \ - # Extra options to supply to gtkdoc-fixref - FIXXREF_OPTIONS= - --if ENABLE_GTK_DOC --include $(top_srcdir)/gtk-doc.make --else - CLEANFILES = --endif - - CLEANFILES += *~ \ - tests-scan.* \ diff --git a/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/marshal.patch b/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/marshal.patch deleted file mode 100644 index a605a34c8..000000000 --- a/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/marshal.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: eggdbus-0.6/src/eggdbus/Makefile.am -=================================================================== ---- eggdbus-0.6.orig/src/eggdbus/Makefile.am -+++ eggdbus-0.6/src/eggdbus/Makefile.am -@@ -130,7 +130,7 @@ BUILT_SOURCES = \ - $(NULL) - - eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal -- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \ -+ EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool \ - --namespace EggDBus \ - --dbus-namespace org.freedesktop.DBus \ - --interfaces-only \ -Index: eggdbus-0.6/src/tests/Makefile.am -=================================================================== ---- eggdbus-0.6.orig/src/tests/Makefile.am -+++ eggdbus-0.6/src/tests/Makefile.am -@@ -25,7 +25,7 @@ BUILT_SOURCES = \ - $(NULL) - - test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml -- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \ -+ EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool \ - --namespace "Test" \ - --dbus-namespace "com.example" \ - --include-header testtypes.h \ diff --git a/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus_0.6.bb b/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus_0.6.bb deleted file mode 100644 index cc28ec77c..000000000 --- a/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus_0.6.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "An alternative to dbug-glib." -DESCRIPTION = "An alternative to dbus-glib. It is designed specifically to \ -make it comfortable to work with very large and potentially \ -complex D-Bus services like e.g. DeviceKit-disks" - -HOMEPAGE = "http://cgit.freedesktop.org/~david/eggdbus" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ - file://src/eggdbus/eggdbus.h;md5=6b312aef57ed8d738b3f131ad037d6c2" - -DEPENDS = "dbus glib-2.0 dbus-glib eggdbus-native" -DEPENDS_class-native = "dbus-native glib-2.0-native dbus-glib-native" - -SRC_URI = "http://cgit.freedesktop.org/~david/${BPN}/snapshot/${BPN}-${PV}.tar.bz2 \ - file://gtk-doc.patch \ -" -SRC_URI_append_class-target = "file://marshal.patch" -SRC_URI[md5sum] = "0a111faa54dfba2cf432c2c8e8a76e06" -SRC_URI[sha256sum] = "3ad26e271c1a879bafcd181e065fe0ed53b542299a773c3188c9edb25b895ed1" - -inherit autotools gtk-doc - -EXTRA_OECONF = " --disable-man-pages " - -BBCLASSEXTEND = "native" - -PARALLEL_MAKE = "" - -do_configure_prepend() { - # Create ChangeLog to walk around automake error. - # " Makefile.am: error: required file './ChangeLog' not found " - touch ${S}/ChangeLog -} diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb index 87ab0cbc5..1e5094bd1 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb @@ -6,16 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" -inherit autotools pkgconfig +inherit gnomebase SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = " \ - ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ +SRC_URI += " \ file://remove-examples.patch \ " -SRC_URI[md5sum] = "77f1016cbb27e15d4e04a2b7bfdb4cae" -SRC_URI[sha256sum] = "6e5fe03bdf1e220eeffd543e017fd2fb15bcec9235f0ffd50674aff9362a85f0" +SRC_URI[archive.md5sum] = "77f1016cbb27e15d4e04a2b7bfdb4cae" +SRC_URI[archive.sha256sum] = "6e5fe03bdf1e220eeffd543e017fd2fb15bcec9235f0ffd50674aff9362a85f0" do_install_append() { install -d ${D}${datadir}/glibmm-2.4 diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v65.bb index 2f299b1ba..69ee1d476 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v65.bb @@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" inherit autotools-brokensep pkgconfig bash-completion systemd -SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32" +SRCREV = "ed17fd14608d8de072c8c090ffc5fcf78c4f48ff" SRC_URI = "git://github.com/pmem/ndctl.git" -DEPENDS = "kmod udev json-c" +DEPENDS = "kmod udev json-c keyutils" S = "${WORKDIR}/git" @@ -28,3 +28,5 @@ do_configure_prepend() { SYSTEMD_SERVICE_${PN} = "ndctl-monitor.service" SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +FILES_${PN} += "${datadir}/daxctl/daxctl.conf" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb index b12183b3a..54b59ccb7 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb @@ -9,7 +9,6 @@ PR = "r13" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -inherit bluetooth # Poke extra recomendations into the list using your machine.conf # @@ -46,7 +45,7 @@ RRECOMMENDS_${PN} = "\ ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \ \ - ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "bluez5", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \ \ tzdata \ 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 e34cce4eb..c77a1e54e 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 @@ -68,13 +68,13 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\ ser2net smstools3 telepathy-glib telepathy-idle thrift \ usbmuxd wvstreams zabbix zeromq \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libmikmod", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "bluez4", "obexftp openobex libnet wvdial", "", d)} \ + libmikmod \ + obexftp openobex libnet wvdial \ " # dracut needs dracut RDEPENDS_packagegroup-meta-oe-core ="\ - dbus-daemon-proxy libdbus-c++ eggdbus \ + dbus-daemon-proxy libdbus-c++ \ ell glibmm libsigc++-2.0 libxml++ distro-feed-configs \ mm-common opencl-headers opencl-icd-loader \ proxy-libintl usleep \ @@ -99,7 +99,6 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\ leveldb libdbi mariadb mariadb-native \ mysql-python postgresql psqlodbc rocksdb soci \ sqlite \ - ${@bb.utils.contains("DISTRO_FEATURES", "bluez4", "mongodb", "", d)} \ " RDEPENDS_packagegroup-meta-oe-devtools ="\ @@ -143,7 +142,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ can-utils libsocketcan tipcutils tiptop \ tmux uml-utilities upm vlock volume-key wipe zlog zram \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", " libgxim t1lib gnuplot libwmf gtkmathview", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", " libgxim gnuplot libwmf", "", d)} \ ${@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)} \ @@ -191,13 +190,13 @@ RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash" RDEPENDS_packagegroup-meta-oe-multimedia ="\ - alsa-oss audiofile cdrkit esound id3lib \ + alsa-oss audiofile cdrkit id3lib \ a2jmidid jack libass libburn libcdio libcdio-paranoia \ libdvdread libmms libmodplug libopus live555 \ mplayer-common opus-tools \ sound-theme-freedesktop v4l-utils yavta wavpack libvpx \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol xsp", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libmikmod", "", d)} \ + libmikmod \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2 mpv", "", d)} \ " RDEPENDS_packagegroup-meta-oe-multimedia_remove_libc-musl = "alsa-oss" @@ -249,10 +248,10 @@ RDEPENDS_packagegroup-meta-oe-support ="\ vim vim-tiny websocketpp wmiconfig xdelta3 xdg-user-dirs xmlstarlet \ zbar zile \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis toscoterm uim synergy utouch-mtview links-x11 fltk pidgin-otr", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libcanberra", "", d)} \ + libcanberra \ ${@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)} \ + procmail \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks2 upower", "", d)} \ ${NE10} \ " @@ -265,7 +264,7 @@ RDEPENDS_packagegroup-meta-oe-support-egl ="\ RDEPENDS_packagegroup-meta-oe-test ="\ catch2 cppunit cunit cxxtest evtest fb-test \ - fwts gtest pm-qa stress-ng testfloat \ + fwts googletest pm-qa stress-ng testfloat \ " RDEPENDS_packagegroup-meta-oe-test_remove_libc-musl = "pm-qa" RDEPENDS_packagegroup-meta-oe-test_remove_arm = "fwts" diff --git a/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb index f11ae7e4d..68dc80424 100644 --- a/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb @@ -8,7 +8,7 @@ PR = "r1" PROVIDES = "virtual/libintl" SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-dev_${PV}_win32.zip \ + http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${BPN}-dev_${PV}_win32.zip \ " SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb index d55d081f3..b4c125faf 100644 --- a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb @@ -10,6 +10,6 @@ S = "${WORKDIR}/git" SRCREV = "62e6b2df55084316d027165d286e46beb40513dc" SRC_URI = "git://github.com/rurban/safeclib.git" -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64).*-linux' +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux' RDEPENDS_${PN} = "perl" |