diff options
author | Ross Burton <ross@burtonini.com> | 2020-09-03 21:31:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-05 22:19:19 +0100 |
commit | e2fabd7e5fcca3f8c551ceea2225317a1abd60e2 (patch) | |
tree | 80f6155137207dc767cfda1f7997486e7c6ef288 /meta/recipes-connectivity/kea | |
parent | 7244c2d05c459c0f4592d2502c8ddc2ebfc29461 (diff) | |
download | poky-e2fabd7e5fcca3f8c551ceea2225317a1abd60e2.tar.gz |
kea: no need to depend on kea-native
kea-msg-compiler is only needed if you alter the messages and the
generated sources need to be rebuilt. When this is the case, there are
better ways to build kea-msg-compiler that don't involve building all of
Kea.
Don't depend on kea-native, remove BBCLASSEXTEND=native, and the target
overrides.
(From OE-Core rev: 5e6174c58d5e3a95eccee773b6670242cb9ab8f4)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/kea')
-rw-r--r-- | meta/recipes-connectivity/kea/kea_1.7.7.bb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/kea/kea_1.7.7.bb b/meta/recipes-connectivity/kea/kea_1.7.7.bb index e25f8e6fb0..c69a180833 100644 --- a/meta/recipes-connectivity/kea/kea_1.7.7.bb +++ b/meta/recipes-connectivity/kea/kea_1.7.7.bb | |||
@@ -5,8 +5,6 @@ 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=68d95543d2096459290a4e6b9ceccffa" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa" |
7 | 7 | ||
8 | DEPENDS += "kea-native" | ||
9 | |||
10 | SRC_URI = "\ | 8 | SRC_URI = "\ |
11 | http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | 9 | http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ |
12 | file://0001-remove-AC_TRY_RUN.patch \ | 10 | file://0001-remove-AC_TRY_RUN.patch \ |
@@ -32,16 +30,14 @@ DEBUG_OPTIMIZATION_append_mipsel = " -O" | |||
32 | BUILD_OPTIMIZATION_remove_mipsel = " -Og" | 30 | BUILD_OPTIMIZATION_remove_mipsel = " -Og" |
33 | BUILD_OPTIMIZATION_append_mipsel = " -O" | 31 | BUILD_OPTIMIZATION_append_mipsel = " -O" |
34 | 32 | ||
35 | do_configure_prepend_class-target() { | 33 | do_configure_prepend() { |
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 | 34 | # 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 | 35 | # 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" | 36 | 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 | 37 | sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in |
42 | } | 38 | } |
43 | 39 | ||
44 | do_install_append_class-target() { | 40 | do_install_append() { |
45 | install -d ${D}${systemd_system_unitdir} | 41 | install -d ${D}${systemd_system_unitdir} |
46 | install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} | 42 | 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' \ | 43 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
@@ -62,6 +58,4 @@ PACKAGECONFIG[boost] = "--with-boost-libs=-lboost_system,,boost,boost" | |||
62 | FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" | 58 | FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" |
63 | FILES_${PN} += "${libdir}/hooks/*.so" | 59 | FILES_${PN} += "${libdir}/hooks/*.so" |
64 | 60 | ||
65 | BBCLASSEXTEND += "native" | ||
66 | |||
67 | PARALLEL_MAKEINST = "" | 61 | PARALLEL_MAKEINST = "" |