diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core')
19 files changed, 661 insertions, 98 deletions
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 new file mode 100644 index 000000000..ada65401a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch @@ -0,0 +1,39 @@ +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/0001-ell-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch deleted file mode 100644 index a172a93ca..000000000 --- a/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4f8c68757b05d12392cd1a8aed174cb8e56f80e3 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Thu, 5 Apr 2018 17:19:44 +0300 -Subject: [PATCH] ell: fix build with musl libc - -musl libc doesn't implement TEMP_FAILURE_RETRY. Use the -TEMP_FAILURE_RETRY from glibc to fix build. - -Upstream-Status: Submitted [https://lists.01.org/pipermail/ell/2018-April/001209.html] - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - ell/dbus.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/ell/dbus.h b/ell/dbus.h -index a7c08d2..3ff5e0f 100644 ---- a/ell/dbus.h -+++ b/ell/dbus.h -@@ -28,6 +28,16 @@ - #include <stddef.h> - #include <stdarg.h> - -+/* taken from glibc unistd.h for musl support */ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif --- -2.4.0 - diff --git a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.4.bb b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.8.bb index 1524bd6b9..0428cab28 100644 --- a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.8.bb @@ -7,13 +7,11 @@ SECTION = "libs" inherit autotools pkgconfig S = "${WORKDIR}/git" -SRCREV = "b4aea06fabb2af1af01f861f8f394c75950b6d47" -SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git \ - file://0001-ell-fix-build-with-musl-libc.patch \ - " +SRCREV = "d572281caedef357c392a7c9aa65a3b21a18cfdb" +SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git" do_configure_prepend () { - mkdir ${S}/build-aux + mkdir -p ${S}/build-aux } DEPENDS = "dbus" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch deleted file mode 100644 index 7899022f1..000000000 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 838fe84c2ddcc9af51c34f751defbf3dd0ba8a06 Mon Sep 17 00:00:00 2001 -From: Kjell Ahlstedt <kjellahlstedt@gmail.com> -Date: Wed, 20 Dec 2017 20:00:32 +0100 -Subject: [PATCH] Glib::Threads::Private: Fix gobj() - -Bug 791711 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Backport [https://github.com/GNOME/glibmm/commit/37d57ae9572b7d74aa385a30313eceae7f2d3fce] - glib/glibmm/threads.h | 2 +- - glib/src/threads.hg | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h -index f7e2b82a..2c0cbe8c 100644 ---- a/glib/glibmm/threads.h -+++ b/glib/glibmm/threads.h -@@ -657,7 +657,7 @@ public: - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; -diff --git a/glib/src/threads.hg b/glib/src/threads.hg -index 86d7a17b..c82a6130 100644 ---- a/glib/src/threads.hg -+++ b/glib/src/threads.hg -@@ -628,7 +628,7 @@ public: - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb index 4706432ab..2f048d2f6 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb @@ -13,10 +13,9 @@ 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 \ file://remove-examples.patch \ - file://0001-Glib-Threads-Private-Fix-gobj.patch \ " -SRC_URI[md5sum] = "dee5ebe309f5976c3dacfcf5c43a062b" -SRC_URI[sha256sum] = "7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a" +SRC_URI[md5sum] = "5aa7a60084fe3e01d746c96f4a115302" +SRC_URI[sha256sum] = "6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9" do_install_append() { install -d ${D}${datadir}/glibmm-2.4 diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb new file mode 100644 index 000000000..df92f1670 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-oe build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb new file mode 100644 index 000000000..156554905 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb @@ -0,0 +1,5 @@ +require meta-oe-image-base.bb + +SUMMARY = "meta-oe build test image" + +IMAGE_INSTALL += "packagegroup-meta-oe" diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb new file mode 100644 index 000000000..0166b9c41 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb @@ -0,0 +1,5 @@ +require meta-oe-image-base.bb + +SUMMARY = "meta-oe ptest test image" + +IMAGE_INSTALL += "packagegroup-meta-oe" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb deleted file mode 100644 index 591caa75d..000000000 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit gnomebase - -SRC_URI[archive.md5sum] = "d6f2a43589480d2315672da0b5839b56" -SRC_URI[archive.sha256sum] = "20d1e7466ca4c83c92e29f9e8dfcc8e5721fdf1337f53157bed97be3b73b32a8" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb new file mode 100644 index 000000000..4f91f31e4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb @@ -0,0 +1,9 @@ +inherit gnomebase + +SRC_URI[archive.md5sum] = "be1c61587db989c7677375a729b94672" +SRC_URI[archive.sha256sum] = "ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_git.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_git.bb new file mode 100644 index 000000000..048f166fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_git.bb @@ -0,0 +1,33 @@ +SUMMARY = "libnvdimm utility library" +DESCRIPTION = "Utility library for managing the libnvdimm \ +(non-volatile memory device) sub-system in the Linux kernel. \ +The LIBNVDIMM subsystem provides support for three types of \ +NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \ +simultaneously support both PMEM and BLK mode access." +HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" + +inherit autotools-brokensep pkgconfig module-base bash-completion systemd + +# v62 +SRCREV = "11f560f4048c1d38b7011a49566871a1e8a07c94" +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," + +do_configure_prepend() { + ${S}/autogen.sh +} + +SYSTEMD_SERVICE_${PN} = "ndctl-monitor.service" + +COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb new file mode 100644 index 000000000..dec1bea56 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "OpenCL API Headers" +DESCRIPTION = "OpenCL compute API headers from Khronos Group" +LICENSE = "Khronos" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" +SECTION = "base" + +S = "${WORKDIR}/git" +SRCREV = "40c5d226c7c0706f0176884e9b94b3886679c983" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install () { + install -d ${D}${includedir}/CL/ + install -m 0644 ${S}/CL/*.h ${D}${includedir}/CL +} diff --git a/meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb new file mode 100644 index 000000000..7c49c8d55 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb @@ -0,0 +1,45 @@ +SUMMARY = "OpenCL ICD Loader" +DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group" +LICENSE = "Khronos" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ec724732ce73269486574c718ef0c79b" +SECTION = "base" + +inherit pkgconfig cmake + +S = "${WORKDIR}/git" +SRCREV = "b342ff7b7f70a4b3f2cfc53215af8fa20adc3d86" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${B}/bin/icd_loader_test ${D}${bindir}/ + chrpath -d ${D}${bindir}/icd_loader_test + install -d ${D}${libdir} + install -m 0644 ${B}/lib/libIcdLog.so ${D}${libdir}/ + install -m 0644 ${B}/lib/libOpenCLDriverStub.so ${D}${libdir}/ + chrpath -d ${D}${libdir}/libOpenCLDriverStub.so + install -m 0644 ${B}/lib/libOpenCL.so.1.2 ${D}${libdir}/ + cd ${D}${libdir} + ln -s libOpenCL.so.1.2 libOpenCL.so.1 + ln -s libOpenCL.so.1 libOpenCL.so +} + +PACKAGES = "opencl-icd-loader opencl-icd-loader-dev" +PACKAGES += "libicdlog libicdlog-dbg" +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES_${PN} = " \ + ${bindir}/icd_loader_test \ + ${libdir}/libOpenCLDriverStub.so \ + ${libdir}/libOpenCL.so.1.2 \ +" +FILES_${PN}-dev = " \ + ${libdir}/libOpenCL.so \ + ${libdir}/libOpenCL.so.1 \ +" + +FILES_libicdlog = "${libdir}/libIcdLog.so" +FILES_libicdlog-dbg = "${libdir}/.debug/libIcdLog.so" + +DEPENDS = "opencl-headers" +RDEPENDS_${PN} = "libicdlog" 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 new file mode 100644 index 000000000..08b4bbfc4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -0,0 +1,253 @@ +SUMMARY = "Meta-oe ptest packagegroups" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = ' \ + packagegroup-meta-oe \ + packagegroup-meta-oe-benchmarks \ + packagegroup-meta-oe-connectivity \ + packagegroup-meta-oe-core \ + packagegroup-meta-oe-crypto \ + packagegroup-meta-oe-bsp \ + packagegroup-meta-oe-dbs \ + packagegroup-meta-oe-devtools \ + packagegroup-meta-oe-extended \ + packagegroup-meta-oe-kernel \ + packagegroup-meta-oe-multimedia \ + packagegroup-meta-oe-navigation \ + packagegroup-meta-oe-security \ + packagegroup-meta-oe-support \ + packagegroup-meta-oe-test \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest", "", d)} \ +' + +RDEPENDS_packagegroup-meta-oe = "\ + packagegroup-meta-oe-benchmarks \ + packagegroup-meta-oe-connectivity \ + packagegroup-meta-oe-core \ + packagegroup-meta-oe-crypto \ + packagegroup-meta-oe-bsp \ + packagegroup-meta-oe-dbs \ + packagegroup-meta-oe-devtools \ + packagegroup-meta-oe-extended \ + packagegroup-meta-oe-kernel \ + packagegroup-meta-oe-multimedia \ + packagegroup-meta-oe-navigation \ + packagegroup-meta-oe-security \ + packagegroup-meta-oe-support \ + packagegroup-meta-oe-test \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest", "", d)} \ +" + +RDEPENDS_packagegroup-meta-oe-benchmarks = "\ + analyze-suspend dhrystone iperf2 linpack phoronix-test-suite \ + tiobench bonnie++ fio iperf2 iperf3 lmbench s-suite whetstone \ + libc-bench memtester sysbench dbench iozone3 libhugetlbfs \ + nbench-byte tinymembench \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "glmark2", "", d)} \ +" + +RDEPENDS_packagegroup-meta-oe-connectivity ="\ + gammu hostapd irssi krb5 libev libimobiledevice \ + libmbim libmtp libndp libqmi libtorrent \ + libuv libwebsockets linuxptp lirc loudmouth \ + modemmanager mosh \ + paho-mqtt-c phonet-utils rabbitmq-c rfkill rtorrent \ + 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)} \ + " + +# dracut needs dracut +RDEPENDS_packagegroup-meta-oe-core ="\ + dbus-daemon-proxy libdbus-c++ eggdbus \ + ell glibmm libsigc++-2.0 libxml++ distro-feed-configs \ + mm-common opencl-headers opencl-icd-loader \ + proxy-libintl usleep \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dbus-broker ndctl", "", d)} \ + " + +RDEPENDS_packagegroup-meta-oe-crypto ="\ + botan cryptsetup libkcapi libmcrypt \ + libsodium pkcs11-helper \ + " +RDEPENDS_packagegroup-meta-oe-bsp ="\ + acpitool cpufrequtils edac-utils efibootmgr \ + efivar flashrom lmsensors lmsensors-config \ + lsscsi nvme-cli pcmciautils pointercal \ + " +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 ="\ + android-tools android-tools-conf bootchart breakpad \ + capnproto cgdb cscope ctags \ + debootstrap dejagnu dmalloc flatbuffers \ + giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ + kconfig-frontends lemon libedit libgee libsombok3 \ + libubox log4cplus lshw ltrace lua mcpp memstat mercurial \ + mpich msgpack-c nlohmann-json nodejs openocd pax-utils \ + ipc-run libdbd-mysql-perl libdbi-perl libio-pty-perl php \ + protobuf protobuf-c python3-distutils-extra \ + python-cpuset python-distutils-extra python-futures python-pygobject \ + rapidjson serialcheck sip3 sip tclap uftrace uw-imap valijson \ + xmlrpc-c yajl yasm \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ + " + +RDEPENDS_packagegroup-meta-oe-extended ="\ + byacc cfengine cfengine-masterfiles cmpi-bindings \ + ddrescue dialog dumb-init enscript fluentbit \ + haveged hexedit hiredis hplip hwloc indent iotop isomd5sum \ + jansson konkretcmpi lcdproc libblockdev libcec libconfig \ + libdivecomputer libplist libusbmuxd \ + liblockfile liblogging liblognorm libmodbus libmodbus \ + 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 \ + rarpd redis rrdtool libfastjson librelp rsyslog sanlock \ + sblim-cmpi-devel sblim-sfc-common sblim-sfcc \ + scsirastools sgpio smartmontools snappy can-isotp \ + 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", "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("BBPATH", "meta-python", "openlmi-tools", "", d)} \ + " + +RDEPENDS_packagegroup-meta-oe-gnome ="\ + atkmm gnome-common gnome-doc-utils-stub gtkmm \ + gtkmm3 pyxdg vte9 \ + " + +RDEPENDS_packagegroup-meta-oe-graphics ="\ + babl cairomm dietsplash directfb directfb-examples dnfdragora \ + fbgrab fbida fontforge fvwm gegl gimp glm gphoto2 libgphoto2 \ + gtkperf jasper leptonica libmng libsdl2-image libsdl2-mixer libsdl2-net \ + libsdl-gfx libsdl-image libsdl-mixer libsdl-net libsdl-ttf \ + libvncserver libyui libyui-ncurses lxdm numlockx openbox openjpeg \ + packagegroup-fonts-truetype pangomm qrencode takao-fonts terminus-font \ + tesseract tesseract-lang tigervnc tslib source-han-sans-cn-fonts \ + source-han-sans-jp-fonts source-han-sans-kr-fonts source-han-sans-tw-fonts ttf-abyssinica \ + libvdpau x11vnc xcursorgen xdotool \ + bdftopcf iceauth sessreg setxkbmap twm xclock xfontsel xgamma xkbevd xkbprint xkbutils \ + xlsatoms xlsclients xlsfonts xmag xmessage xrdb xrefresh xsetmode xsetroot xstdcmap \ + xterm xwd xwud xbitmaps xorg-sgml-doctools \ + font-adobe-100dpi font-adobe-utopia-100dpi \ + font-bh-100dpi font-bh-lucidatypewriter-100dpi font-bitstream-100dpi font-cursor-misc \ + font-misc-misc xorg-fonts-100dpi liblbxutil libxaw libxkbui libxpresent xserver-common \ + ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "freeglut libsdl2-ttf", "", d)} \ + " + +RDEPENDS_packagegroup-meta-oe-kernel ="\ + agent-proxy bpftool broadcom-bt-firmware cpupower \ + crash ipmitool minicoredumper oprofile \ + " + +RDEPENDS_packagegroup-meta-oe-multimedia ="\ + alsa-oss audiofile cdrkit esound 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)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2 mpv", "", d)} \ + " + +RDEPENDS_packagegroup-meta-oe-navigation ="\ + geoclue geos libspatialite proj \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "orrery", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd gpsd-machine-conf", "", d)} \ + " + +RDEPENDS_packagegroup-meta-oe-security ="\ + tomoyo-tools \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "passwdqc", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluz5", "nmap", "", d)} \ + " + +RDEPENDS_packagegroup-meta-oe-shells ="\ + dash tcsh zsh \ + " + +NE10 = "" +NE10_aarch64 = "ne10" +NE10_arm7 = "ne10" + +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 \ + 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 \ + libcereal libcyusbserial libee libeigen libestr libftdi libgit2 \ + libgpiod libiio libjs-jquery libjs-sizzle liblinebreak libmicrohttpd \ + libmxml libnih liboauth libol liboop libp11 libraw1394 libsmi libsoc libssh2 \ + libssh libtar libteam libtinyxml2 libtinyxml libusbg libusb-compat libutempter \ + links lio-utils lockdev log4c log4cpp logwarn libdevmapper lvm2 \ + mailcap mbuffer mg minini \ + multipath-tools nano neon nmon numactl onig openct openldap \ + opensc wbxml2 p910nd pcsc-lite picocom libotr pidgin \ + pngcheck poco poppler poppler-data portaudio-v19 pps-tools \ + pv pxaregs raptor2 rdfind read-edid rsnapshot s3c24xx-gpio s3c64xx-gpio \ + 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 \ + usb-modeswitch-data usbpath uthash utouch-evemu utouch-frame \ + 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)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xorgxrdp xrdp", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluez4", "procmail", "", d)} \ + ${NE10} \ + " + +RDEPENDS_packagegroup-meta-oe-support-egl ="\ + freerdp libnice opencv \ + " + +RDEPENDS_packagegroup-meta-oe-test ="\ + catch2 cppunit cunit cxxtest evtest fb-test \ + fwts gtest pm-qa stress-ng testfloat \ + " + +RDEPENDS_packagegroup-meta-oe-ptest = "\ + zeromq-ptest \ + libxml-ptest \ + soci-ptest \ + leveldb-ptest \ + psqlodbc-ptest \ + lua-ptest \ + protobuf-ptest \ + libdbi-ptest \ + rsyslog-ptest \ + oprofile-ptest \ + libteam-ptest \ + uthash-ptest \ + mcelog-ptest \ + openldap-ptest \ + libee-ptest \ + numactl-ptest \ + poco-ptest \ + " 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 new file mode 100644 index 000000000..8638f75b3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0002-Fix-build-with-glibc-2.28.patch @@ -0,0 +1,34 @@ +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.2.bb index 7e8d6e32a..a5b16c979 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.2.bb @@ -19,6 +19,7 @@ RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" SRC_URI = " \ http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2 \ 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" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch new file mode 100644 index 000000000..e42c22ebd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch @@ -0,0 +1,195 @@ +diff --git a/toys/net/microcom.c b/toys/net/microcom.c +index d34e1fe..a369e6c 100644 +--- a/toys/net/microcom.c ++++ b/toys/net/microcom.c +@@ -2,7 +2,7 @@ + * + * Copyright 2017 The Android Open Source Project. + +-USE_MICROCOM(NEWTOY(microcom, "<1>1s:X", TOYFLAG_BIN)) ++USE_MICROCOM(NEWTOY(microcom, "<1>1s:X", TOYFLAG_USR|TOYFLAG_BIN)) + + config MICROCOM + bool "microcom" +diff --git a/toys/other/blockdev.c b/toys/other/blockdev.c +index 38e0993..c5d9fcd 100644 +--- a/toys/other/blockdev.c ++++ b/toys/other/blockdev.c +@@ -4,7 +4,7 @@ + * + * No Standard. + +-USE_BLOCKDEV(NEWTOY(blockdev, "<1>1(setro)(setrw)(getro)(getss)(getbsz)(setbsz)#<0(getsz)(getsize)(getsize64)(flushbufs)(rereadpt)",TOYFLAG_USR|TOYFLAG_BIN)) ++USE_BLOCKDEV(NEWTOY(blockdev, "<1>1(setro)(setrw)(getro)(getss)(getbsz)(setbsz)#<0(getsz)(getsize)(getsize64)(flushbufs)(rereadpt)",TOYFLAG_SBIN)) + + config BLOCKDEV + bool "blockdev" +diff --git a/toys/other/chrt.c b/toys/other/chrt.c +index a1c37a0..d6db3a5 100644 +--- a/toys/other/chrt.c ++++ b/toys/other/chrt.c +@@ -4,7 +4,7 @@ + * + * Note: -ibrfo flags sorted to match SCHED positions for highest_bit() + +-USE_CHRT(NEWTOY(chrt, "^mp#<0iRbrfo[!ibrfo]", TOYFLAG_USR|TOYFLAG_SBIN)) ++USE_CHRT(NEWTOY(chrt, "^mp#<0iRbrfo[!ibrfo]", TOYFLAG_USR|TOYFLAG_BIN)) + + config CHRT + bool "chrt" +diff --git a/toys/other/hwclock.c b/toys/other/hwclock.c +index 1d313e3..412582d 100644 +--- a/toys/other/hwclock.c ++++ b/toys/other/hwclock.c +@@ -4,7 +4,7 @@ + * + * No standard, but see Documentation/rtc.txt in the linux kernel source.. + * +-USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]", TOYFLAG_USR|TOYFLAG_BIN)) ++USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]", TOYFLAG_SBIN)) + + config HWCLOCK + bool "hwclock" +diff --git a/toys/other/modinfo.c b/toys/other/modinfo.c +index 1178d67..966a9de 100644 +--- a/toys/other/modinfo.c ++++ b/toys/other/modinfo.c +@@ -4,7 +4,7 @@ + * + * TODO: cleanup + +-USE_MODINFO(NEWTOY(modinfo, "<1b:k:F:0", TOYFLAG_BIN)) ++USE_MODINFO(NEWTOY(modinfo, "<1b:k:F:0", TOYFLAG_SBIN)) + + config MODINFO + bool "modinfo" +diff --git a/toys/other/pmap.c b/toys/other/pmap.c +index abb0a33..2acef02 100644 +--- a/toys/other/pmap.c ++++ b/toys/other/pmap.c +@@ -5,7 +5,7 @@ + * + * No Standard. + +-USE_PMAP(NEWTOY(pmap, "<1xq", TOYFLAG_BIN)) ++USE_PMAP(NEWTOY(pmap, "<1xq", TOYFLAG_USR|TOYFLAG_BIN)) + + config PMAP + bool "pmap" +diff --git a/toys/other/printenv.c b/toys/other/printenv.c +index e8bcf29..65f62ed 100644 +--- a/toys/other/printenv.c ++++ b/toys/other/printenv.c +@@ -2,7 +2,7 @@ + * + * Copyright 2012 Georgi Chorbadzhiyski <georgi@unixsol.org> + +-USE_PRINTENV(NEWTOY(printenv, "0(null)", TOYFLAG_USR|TOYFLAG_BIN)) ++USE_PRINTENV(NEWTOY(printenv, "0(null)", TOYFLAG_BIN)) + + config PRINTENV + bool "printenv" +diff --git a/toys/other/taskset.c b/toys/other/taskset.c +index 8ffdab7..89fd528 100644 +--- a/toys/other/taskset.c ++++ b/toys/other/taskset.c +@@ -2,7 +2,7 @@ + * + * Copyright 2012 Elie De Brauwer <eliedebrauwer@gmail.com> + +-USE_TASKSET(NEWTOY(taskset, "<1^pa", TOYFLAG_BIN|TOYFLAG_STAYROOT)) ++USE_TASKSET(NEWTOY(taskset, "<1^pa", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT)) + USE_NPROC(NEWTOY(nproc, "(all)", TOYFLAG_USR|TOYFLAG_BIN)) + + config NPROC +diff --git a/toys/other/timeout.c b/toys/other/timeout.c +index 9b93466..e1d0f4d 100644 +--- a/toys/other/timeout.c ++++ b/toys/other/timeout.c +@@ -4,7 +4,7 @@ + * + * No standard + +-USE_TIMEOUT(NEWTOY(timeout, "<2^vk:s: ", TOYFLAG_BIN)) ++USE_TIMEOUT(NEWTOY(timeout, "<2^vk:s: ", TOYFLAG_USR|TOYFLAG_BIN)) + + config TIMEOUT + bool "timeout" +diff --git a/toys/other/truncate.c b/toys/other/truncate.c +index 142d3c7..40eb1e5 100644 +--- a/toys/other/truncate.c ++++ b/toys/other/truncate.c +@@ -2,7 +2,7 @@ + * + * Copyright 2011 Rob Landley <rob@landley.net> + +-USE_TRUNCATE(NEWTOY(truncate, "<1s:|c", TOYFLAG_BIN)) ++USE_TRUNCATE(NEWTOY(truncate, "<1s:|c", TOYFLAG_USR|TOYFLAG_BIN)) + + config TRUNCATE + bool "truncate" +diff --git a/toys/posix/nice.c b/toys/posix/nice.c +index 4b587ee..9f7b119 100644 +--- a/toys/posix/nice.c ++++ b/toys/posix/nice.c +@@ -4,7 +4,7 @@ + * + * See http://opengroup.org/onlinepubs/9699919799/utilities/nice.html + +-USE_NICE(NEWTOY(nice, "^<1n#", TOYFLAG_USR|TOYFLAG_BIN)) ++USE_NICE(NEWTOY(nice, "^<1n#", TOYFLAG_BIN)) + + config NICE + bool "nice" +diff --git a/toys/posix/nl.c b/toys/posix/nl.c +index 9b02bfa..41e1b89 100644 +--- a/toys/posix/nl.c ++++ b/toys/posix/nl.c +@@ -7,7 +7,7 @@ + * This implements a subset: only one logical page (-ip), no sections (-dfh). + * todo: -lv + +-USE_NL(NEWTOY(nl, "v#<1=1l#b:n:s:w#<0=6E", TOYFLAG_BIN)) ++USE_NL(NEWTOY(nl, "v#<1=1l#b:n:s:w#<0=6E", TOYFLAG_USR|TOYFLAG_BIN)) + + config NL + bool "nl" +diff --git a/toys/posix/paste.c b/toys/posix/paste.c +index ea04f02..8972f71 100644 +--- a/toys/posix/paste.c ++++ b/toys/posix/paste.c +@@ -6,7 +6,7 @@ + * + * Deviations from posix: the FILE argument isn't mandatory, none == '-' + +-USE_PASTE(NEWTOY(paste, "d:s", TOYFLAG_BIN|TOYFLAG_LOCALE)) ++USE_PASTE(NEWTOY(paste, "d:s", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE)) + + config PASTE + bool "paste" +diff --git a/toys/posix/ps.c b/toys/posix/ps.c +index aef2a7f..b559e09 100644 +--- a/toys/posix/ps.c ++++ b/toys/posix/ps.c +@@ -44,7 +44,7 @@ + * TODO: top: thread support and SMP + * TODO: pgrep -f only searches the amount of cmdline that fits in toybuf. + +-USE_PS(NEWTOY(ps, "k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE)) ++USE_PS(NEWTOY(ps, "k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO]", TOYFLAG_BIN|TOYFLAG_LOCALE)) + // stayroot because iotop needs root to read other process' proc/$$/io + USE_TOP(NEWTOY(top, ">0m" "O*Hk*o*p*u*s#<1d#=3<1n#<1bq[!oO]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE)) + USE_IOTOP(NEWTOY(iotop, ">0AaKO" "k*o*p*u*s#<1=7d#=3<1n#<1bq", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT|TOYFLAG_LOCALE)) +diff --git a/toys/posix/sed.c b/toys/posix/sed.c +index cf7d15e..130ac08 100644 +--- a/toys/posix/sed.c ++++ b/toys/posix/sed.c +@@ -10,7 +10,7 @@ + * TODO: handle error return from emit(), error_msg/exit consistently + * What's the right thing to do for -i when write fails? Skip to next? + +-USE_SED(NEWTOY(sed, "(help)(version)e*f*inEr[+Er]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE|TOYFLAG_NOHELP)) ++USE_SED(NEWTOY(sed, "(help)(version)e*f*inEr[+Er]", TOYFLAG_BIN|TOYFLAG_LOCALE|TOYFLAG_NOHELP)) + + config SED + bool "sed" 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 347c2856f..7e8e7b2ea 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 @@ -1,11 +1,13 @@ SUMMARY = "Toybox combines common utilities together into a single executable." HOMEPAGE = "http://www.landley.net/toybox/" -DEPENDS = "attr" +DEPENDS = "attr virtual/crypt" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" -SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz" +SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ + file://OE-path-changes.patch \ + " SRC_URI[md5sum] = "a8bb502a1be941f06dd2644fff25f547" SRC_URI[sha256sum] = "3ada450ac1eab1dfc352fee915ea6129b9a4349c1885f1394b61bd2d89a46c04" diff --git a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb index 9e9c7ed8c..370dd4ae6 100644 --- a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb @@ -22,3 +22,12 @@ do_install() { install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 } + +inherit update-alternatives + +ALTERNATIVE_${PN} = "usleep" +ALTERNATIVE_PRIORITY = "80" +ALTERNATIVE_LINK_NAME[usleep] = "${base_bindir}/usleep" + +ALTERNATIVE_${PN}-doc = "usleep.1" +ALTERNATIVE_LINK_NAME[usleep.1] = "${mandir}/man1/usleep.1" |
