From fa1910548c33d60bb6b9023c805aa54bef77150d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 22 May 2023 22:06:25 -0700
Subject: babeld: Upgrade to 1.12.2

Fix buildpath QA errors while here by passing bitbake provided cflags to
build env

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-protocols/babeld/babeld_1.12.1.bb      | 29 --------------------
 .../recipes-protocols/babeld/babeld_1.12.2.bb      | 31 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 29 deletions(-)
 delete mode 100644 meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb
 create mode 100644 meta-networking/recipes-protocols/babeld/babeld_1.12.2.bb

(limited to 'meta-networking')

diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb b/meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb
deleted file mode 100644
index 71bd93785c..0000000000
--- a/meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Babel is a loop-avoiding distance-vector routing protocol"
-DESCRIPTION = "\
-Babel is a loop-avoiding distance-vector routing protocol for IPv6 and \
-IPv4 with fast convergence properties. It is based on the ideas in DSDV, AODV \
-and Cisco's EIGRP, but is designed to work well not only in wired networks \
-but also in wireless mesh networks, and has been extended with support \
-for overlay networks. Babel is in the process of becoming an IETF Standard. \
-"
-HOMEPAGE = "https://www.irif.fr/~jch/software/babel/"
-SECTION = "net"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754"
-
-SRC_URI = "gitsm://github.com/jech/babeld.git;protocol=https;branch=master"
-SRCREV = "916d3d9aa65683ddf8b96f7f0b466b24cb9d7087"
-
-UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)"
-
-S = "${WORKDIR}/git"
-
-do_compile () {
-	oe_runmake babeld
-}
-
-do_install () {
-	oe_runmake install.minimal TARGET=${D} PREFIX=${root_prefix}
-}
-
diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.12.2.bb b/meta-networking/recipes-protocols/babeld/babeld_1.12.2.bb
new file mode 100644
index 0000000000..03db5fc0bf
--- /dev/null
+++ b/meta-networking/recipes-protocols/babeld/babeld_1.12.2.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Babel is a loop-avoiding distance-vector routing protocol"
+DESCRIPTION = "\
+Babel is a loop-avoiding distance-vector routing protocol for IPv6 and \
+IPv4 with fast convergence properties. It is based on the ideas in DSDV, AODV \
+and Cisco's EIGRP, but is designed to work well not only in wired networks \
+but also in wireless mesh networks, and has been extended with support \
+for overlay networks. Babel is in the process of becoming an IETF Standard. \
+"
+HOMEPAGE = "https://www.irif.fr/~jch/software/babel/"
+SECTION = "net"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754"
+
+SRC_URI = "gitsm://github.com/jech/babeld.git;protocol=https;branch=master"
+SRCREV = "a9fba0e19ebde96cdc4edd35c5363f9e8139ab35"
+
+UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'"
+
+do_compile () {
+	oe_runmake babeld
+}
+
+do_install () {
+	oe_runmake install.minimal TARGET=${D} PREFIX=${root_prefix}
+}
+
-- 
cgit v1.2.3-54-g00ecf