summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2020-09-02 09:14:59 -0700
committerKhem Raj <raj.khem@gmail.com>2020-09-03 07:54:13 -0700
commit89adc5d3ec0dfe071c613f85ef4eb2bc176c8339 (patch)
treec21982eb0ee43a66e2f29771a5b9bfed8cdba962
parent23943353374c3b24ea92b7574aea5e9076759b98 (diff)
downloadmeta-openembedded-89adc5d3ec0dfe071c613f85ef4eb2bc176c8339.tar.gz
kea: pkg moved to core
Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch34
-rw-r--r--meta-networking/recipes-connectivity/kea/files/kea-dhcp-ddns.service13
-rw-r--r--meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service13
-rw-r--r--meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service13
-rw-r--r--meta-networking/recipes-connectivity/kea/kea_1.7.7.bb67
5 files changed, 0 insertions, 140 deletions
diff --git a/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch b/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch
deleted file mode 100644
index d7ca9ff8f..000000000
--- a/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 9d6b8321c5b46199baca907f3d42bdcaaf1958a8 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 23 May 2019 23:59:42 -0700
4Subject: [PATCH] remove AC_TRY_RUN
5
6AC_TRY_RUN doesn't work in cross compile env,
7use AC_COMPILE_IFELSE instead to fix below configure
8error:
9 | checking for usuable C++11 regex... configure: error: in `/builddir/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build':
10 | configure: error: cannot run test program while cross compiling
11
12Upstream-Status: Inappropriate [oe specific]
13
14Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
15---
16 configure.ac | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/configure.ac b/configure.ac
20index c880b77..dd40c7c 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -580,7 +580,7 @@ AC_TRY_COMPILE([
24 AC_MSG_RESULT(no))
25
26 AC_MSG_CHECKING(for usuable C++11 regex)
27-AC_TRY_RUN([
28+AC_COMPILE_IFELSE([
29 #include <regex>
30 #include <iostream>
31 int main() {
32--
332.21.0
34
diff --git a/meta-networking/recipes-connectivity/kea/files/kea-dhcp-ddns.service b/meta-networking/recipes-connectivity/kea/files/kea-dhcp-ddns.service
deleted file mode 100644
index 91aa2eb14..000000000
--- a/meta-networking/recipes-connectivity/kea/files/kea-dhcp-ddns.service
+++ /dev/null
@@ -1,13 +0,0 @@
1[Unit]
2Description=Kea DHCP-DDNS Server
3Wants=network-online.target
4After=network-online.target
5After=time-sync.target
6
7[Service]
8ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
9ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea
10ExecStart=@SBINDIR@/kea-dhcp-ddns -c @SYSCONFDIR@/kea/kea-dhcp-ddns.conf
11
12[Install]
13WantedBy=multi-user.target
diff --git a/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service b/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service
deleted file mode 100644
index b851ea71c..000000000
--- a/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service
+++ /dev/null
@@ -1,13 +0,0 @@
1[Unit]
2Description=Kea DHCPv4 Server
3Wants=network-online.target
4After=network-online.target
5After=time-sync.target
6
7[Service]
8ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
9ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
10ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf
11
12[Install]
13WantedBy=multi-user.target
diff --git a/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service b/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service
deleted file mode 100644
index 0f9f0ef8d..000000000
--- a/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service
+++ /dev/null
@@ -1,13 +0,0 @@
1[Unit]
2Description=Kea DHCPv6 Server
3Wants=network-online.target
4After=network-online.target
5After=time-sync.target
6
7[Service]
8ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
9ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
10ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf
11
12[Install]
13WantedBy=multi-user.target
diff --git a/meta-networking/recipes-connectivity/kea/kea_1.7.7.bb b/meta-networking/recipes-connectivity/kea/kea_1.7.7.bb
deleted file mode 100644
index e25f8e6fb..000000000
--- a/meta-networking/recipes-connectivity/kea/kea_1.7.7.bb
+++ /dev/null
@@ -1,67 +0,0 @@
1SUMMARY = "ISC Kea DHCP Server"
2DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It supports both DHCPv4 and DHCPv6 protocols along with their extensions, e.g. prefix delegation and dynamic updates to DNS."
3HOMEPAGE = "http://kea.isc.org"
4SECTION = "connectivity"
5LICENSE = "MPL-2.0 & Apache-2.0"
6LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa"
7
8DEPENDS += "kea-native"
9
10SRC_URI = "\
11 http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
12 file://0001-remove-AC_TRY_RUN.patch \
13 file://kea-dhcp4.service \
14 file://kea-dhcp6.service \
15 file://kea-dhcp-ddns.service \
16"
17SRC_URI[md5sum] = "4f8d1251fd41ef2e822a4eb3f0797d46"
18SRC_URI[sha256sum] = "0bba8b045672884a928ff4b2a8575ac5ba420eb6ba47a9338f1932bc38dcf866"
19
20inherit autotools systemd
21
22SYSTEMD_SERVICE_${PN} = "kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service"
23SYSTEMD_AUTO_ENABLE = "disable"
24
25DEBUG_OPTIMIZATION_remove_mips = " -Og"
26DEBUG_OPTIMIZATION_append_mips = " -O"
27BUILD_OPTIMIZATION_remove_mips = " -Og"
28BUILD_OPTIMIZATION_append_mips = " -O"
29
30DEBUG_OPTIMIZATION_remove_mipsel = " -Og"
31DEBUG_OPTIMIZATION_append_mipsel = " -O"
32BUILD_OPTIMIZATION_remove_mipsel = " -Og"
33BUILD_OPTIMIZATION_append_mipsel = " -O"
34
35do_configure_prepend_class-target() {
36 mkdir -p ${B}/src/lib/log/compiler/
37 ln -sf ${STAGING_BINDIR_NATIVE}/kea-msg-compiler ${B}/src/lib/log/compiler/kea-msg-compiler
38 # replace abs_top_builddir to avoid introducing the build path
39 # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target
40 find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g"
41 sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in
42}
43
44do_install_append_class-target() {
45 install -d ${D}${systemd_system_unitdir}
46 install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir}
47 sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
48 -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \
49 ${D}${systemd_system_unitdir}/kea-dhcp*service
50}
51
52do_install_append() {
53 rm -rf "${D}${localstatedir}"
54}
55
56PACKAGECONFIG ??= "openssl log4cplus boost"
57
58PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_TARGET}${prefix},,openssl,openssl"
59PACKAGECONFIG[log4cplus] = "--with-log4cplus=${STAGING_DIR_TARGET}${prefix},,log4cplus,log4cplus"
60PACKAGECONFIG[boost] = "--with-boost-libs=-lboost_system,,boost,boost"
61
62FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a"
63FILES_${PN} += "${libdir}/hooks/*.so"
64
65BBCLASSEXTEND += "native"
66
67PARALLEL_MAKEINST = ""