summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-core
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-05-21 15:07:33 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-05-21 15:07:37 +0300
commitba6de43c25453413491a8bac2d6f7f7011c9b326 (patch)
tree566a4990318c50f8b73e7cf43012eb1705e82d09 /meta-openembedded/meta-oe/recipes-core
parent0e04b2e9b4857f65a89e16d3c14e16166b2cd8ea (diff)
downloadopenbmc-ba6de43c25453413491a8bac2d6f7f7011c9b326.tar.xz
meta-openembedded: subtree update:1ecd8b4364..f3018013ff
Adrian Bunk (1): Add irda-utils Khem Raj (1): openocd: Upgrade to latest git version Martin Jansa (8): gtkwave: add distro_features_check ndctl: make MACHINE_ARCH and ignore from libblockdev oprofile: make MACHINE_ARCH umip: make MACHINE_ARCH mscgen: fix SRC_URI for multilib python-cassandra-driver.inc: fix DEPENDS triggerhappy: fix issues opencv: use the same package name in PACKAGES and RDEPENDS Oleksandr Kravchuk (4): znc: update to 1.7.3 pure-ftpd: update to 1.0.47 xl2tpd: update to 1.3.14 ell: remove recipe Scott Ellis (1): wireguard: Upgrade 20190123 -> 20190406 Tom Rini (1): toybox: Re-order inherit location so we can override do_configure Zang Ruochen (8): python-pyparsing: upgrade 2.2.0 -> 2.4.0 python-six: upgrade 1.11.0 -> 1.12.0 python-typing: upgrade 3.6.4 -> 3.6.6 python-urllib3: upgrade 1.23 -> 1.25.2 python-wrapt: upgrade 1.10.11 -> 1.11.1 python-mako:upgrade 1.0.9 -> 1.0.10 python-pip: upgrade 19.1 -> 19.1.1 python-pysocks: upgrade 1.6.8 -> 1.7.0 Change-Id: I9a4d8fb60195b1cfd0f39cebf8b113b3bb63808d Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core')
-rw-r--r--meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb17
-rw-r--r--meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb3
-rw-r--r--meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb4
3 files changed, 5 insertions, 19 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb
deleted file mode 100644
index 27f11cfbe..000000000
--- a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Embedded Linux Library"
-DESCRIPTION = "ELL is a DBUS library which provides DBUS bindings."
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
-SECTION = "libs"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/git"
-SRCREV = "ebc021cee3b2d20ca2af5e3ed02495da616b2fd3"
-SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git"
-
-do_configure_prepend () {
- mkdir -p ${S}/build-aux
-}
-
-DEPENDS = "dbus"
diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb
index 1f3abf514..61e53029b 100644
--- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb
+++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb
@@ -19,6 +19,9 @@ S = "${WORKDIR}/git"
EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs"
+# Depends on MACHINE_ARCH kernel
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"
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 614136e27..069f0471c 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
@@ -5,6 +5,8 @@ DEPENDS = "attr virtual/crypt"
LICENSE = "BSD-0-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511"
+inherit cml1 update-alternatives
+
SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
file://OE-path-changes.patch \
"
@@ -48,8 +50,6 @@ do_install() {
install -m 0644 ${B}/toybox.links ${D}${sysconfdir}
}
-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
ALTERNATIVE_PRIORITY = "60"