diff options
-rw-r--r-- | meta-networking/recipes-connectivity/kea/files/0003-Makefile.am-update-hooksdir-for-lease_cmds.patch | 31 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/kea/kea_1.7.0.bb (renamed from meta-networking/recipes-connectivity/kea/kea_1.5.0.bb) | 9 |
2 files changed, 4 insertions, 36 deletions
diff --git a/meta-networking/recipes-connectivity/kea/files/0003-Makefile.am-update-hooksdir-for-lease_cmds.patch b/meta-networking/recipes-connectivity/kea/files/0003-Makefile.am-update-hooksdir-for-lease_cmds.patch deleted file mode 100644 index 381a3a7eb..000000000 --- a/meta-networking/recipes-connectivity/kea/files/0003-Makefile.am-update-hooksdir-for-lease_cmds.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From cd902b8b588681a27d5321f1ee078a1c8f6e6935 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <Mingli.Yu@windriver.com> | ||
3 | Date: Wed, 21 Mar 2018 06:01:38 +0000 | ||
4 | Subject: [PATCH 3/3] Makefile.am: update hooksdir for lease_cmds | ||
5 | |||
6 | update hooksdir for lease_cmds | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
11 | |||
12 | --- | ||
13 | src/hooks/dhcp/lease_cmds/Makefile.am | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am | ||
17 | index cfd6779..22cc4a9 100644 | ||
18 | --- a/src/hooks/dhcp/lease_cmds/Makefile.am | ||
19 | +++ b/src/hooks/dhcp/lease_cmds/Makefile.am | ||
20 | @@ -37,7 +37,7 @@ liblease_cmds_la_CXXFLAGS = $(AM_CXXFLAGS) | ||
21 | liblease_cmds_la_CPPFLAGS = $(AM_CPPFLAGS) | ||
22 | |||
23 | # install the shared object into $(libdir)/hooks | ||
24 | -lib_hooksdir = $(libdir)/hooks | ||
25 | +lib_hooksdir = $(libdir)/kea/hooks | ||
26 | lib_hooks_LTLIBRARIES = libdhcp_lease_cmds.la | ||
27 | |||
28 | libdhcp_lease_cmds_la_SOURCES = | ||
29 | -- | ||
30 | 2.18.0 | ||
31 | |||
diff --git a/meta-networking/recipes-connectivity/kea/kea_1.5.0.bb b/meta-networking/recipes-connectivity/kea/kea_1.7.0.bb index fb166df60..3123099a7 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.5.0.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.7.0.bb | |||
@@ -3,20 +3,19 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It | |||
3 | HOMEPAGE = "http://kea.isc.org" | 3 | HOMEPAGE = "http://kea.isc.org" |
4 | SECTION = "connectivity" | 4 | SECTION = "connectivity" |
5 | LICENSE = "MPL-2.0 & Apache-2.0" | 5 | LICENSE = "MPL-2.0 & Apache-2.0" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=2ed44ce4e0bbfdc1abfa6bf949b7ba3a" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=0e5b01c848c7736a0c9e68f9c9cd0281" |
7 | 7 | ||
8 | DEPENDS += "kea-native" | 8 | DEPENDS += "kea-native" |
9 | 9 | ||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | 11 | http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ |
12 | file://0003-Makefile.am-update-hooksdir-for-lease_cmds.patch \ | ||
13 | file://0001-remove-AC_TRY_RUN.patch \ | 12 | file://0001-remove-AC_TRY_RUN.patch \ |
14 | file://kea-dhcp4.service \ | 13 | file://kea-dhcp4.service \ |
15 | file://kea-dhcp6.service \ | 14 | file://kea-dhcp6.service \ |
16 | file://kea-dhcp-ddns.service \ | 15 | file://kea-dhcp-ddns.service \ |
17 | " | 16 | " |
18 | SRC_URI[md5sum] = "591d38e5fcc0251a8812e8bb1337578a" | 17 | SRC_URI[md5sum] = "c6406ac3d160161056d2fc36557ebd89" |
19 | SRC_URI[sha256sum] = "edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec" | 18 | SRC_URI[sha256sum] = "173c8e893690a611bc1d1c6fbe54a5c20fcd54429399a8dc3a0d7d2eb01bf8cc" |
20 | 19 | ||
21 | inherit autotools systemd | 20 | inherit autotools systemd |
22 | 21 | ||
@@ -54,7 +53,7 @@ PACKAGECONFIG ??= "openssl log4cplus boost" | |||
54 | 53 | ||
55 | PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_TARGET}${prefix},,openssl,openssl" | 54 | PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_TARGET}${prefix},,openssl,openssl" |
56 | PACKAGECONFIG[log4cplus] = "--with-log4cplus=${STAGING_DIR_TARGET}${prefix},,log4cplus,log4cplus" | 55 | PACKAGECONFIG[log4cplus] = "--with-log4cplus=${STAGING_DIR_TARGET}${prefix},,log4cplus,log4cplus" |
57 | PACKAGECONFIG[boost] = "--with-boost-include=${STAGING_INCDIR} --with-boost-lib-dir=${STAGING_LIBDIR} --with-boost-libs=-lboost_system,,boost,boost" | 56 | PACKAGECONFIG[boost] = "--with-boost-libs=-lboost_system,,boost,boost" |
58 | 57 | ||
59 | FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" | 58 | FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" |
60 | FILES_${PN} += "${libdir}/hooks/*.so" | 59 | FILES_${PN} += "${libdir}/hooks/*.so" |