From ba6de43c25453413491a8bac2d6f7f7011c9b326 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Tue, 21 May 2019 08:07:33 -0400
Subject: 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>
---
 .../meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc           | 4 +---
 .../meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb     | 5 +++++
 .../meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb        | 8 --------
 3 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb
 delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb

(limited to 'meta-openembedded/meta-networking/recipes-protocols/xl2tpd')

diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
index d037c7cfc6..43942bcae9 100644
--- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
+++ b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
@@ -8,8 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/xelerance/xl2tpd.git \
-"
+SRC_URI = "git://github.com/xelerance/xl2tpd.git"
 
 S = "${WORKDIR}/git"
 
@@ -38,4 +37,3 @@ CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd"
 
 INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME_${PN} = "xl2tpd"
-
diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb
new file mode 100644
index 0000000000..f03b537d9d
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb
@@ -0,0 +1,5 @@
+require xl2tpd.inc
+
+# This is v1.3.6 plus some commits.  There is no tag for this commit.
+#
+SRCREV = "ba619c79c4790c78c033df0abde4a9a5de744a08"
diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
deleted file mode 100644
index 88ae5d6f8b..0000000000
--- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xl2tpd.inc
-
-# This is v1.3.6 plus some commits.  There is no tag for this commit.
-#
-PV = "1.3.9+git${SRCPV}"
-
-SRCREV = "f114c10ac532051badeca0132b144a2f1596f047"
-
-- 
cgit v1.2.3