* [PATCH 1/3] kea: no need to depend on kea-native
@ 2020-09-03 10:47 Ross Burton
2020-09-03 10:47 ` [PATCH 2/3] kea: don't use PACKAGECONFIG inappropriately Ross Burton
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ross Burton @ 2020-09-03 10:47 UTC (permalink / raw)
To: openembedded-core
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.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-connectivity/kea/kea_1.7.7.bb | 10 ++--------
1 file 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"
LICENSE = "MPL-2.0 & Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa"
-DEPENDS += "kea-native"
-
SRC_URI = "\
http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
file://0001-remove-AC_TRY_RUN.patch \
@@ -32,16 +30,14 @@ DEBUG_OPTIMIZATION_append_mipsel = " -O"
BUILD_OPTIMIZATION_remove_mipsel = " -Og"
BUILD_OPTIMIZATION_append_mipsel = " -O"
-do_configure_prepend_class-target() {
- mkdir -p ${B}/src/lib/log/compiler/
- ln -sf ${STAGING_BINDIR_NATIVE}/kea-msg-compiler ${B}/src/lib/log/compiler/kea-msg-compiler
+do_configure_prepend() {
# replace abs_top_builddir to avoid introducing the build path
# don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target
find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g"
sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in
}
-do_install_append_class-target() {
+do_install_append() {
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir}
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"
FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a"
FILES_${PN} += "${libdir}/hooks/*.so"
-BBCLASSEXTEND += "native"
-
PARALLEL_MAKEINST = ""
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] kea: don't use PACKAGECONFIG inappropriately
2020-09-03 10:47 [PATCH 1/3] kea: no need to depend on kea-native Ross Burton
@ 2020-09-03 10:47 ` Ross Burton
2020-09-03 10:47 ` [PATCH 3/3] kea: bump to 1.7.10 Ross Burton
2020-09-03 14:26 ` [OE-core] [PATCH 1/3] kea: no need to depend on kea-native Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2020-09-03 10:47 UTC (permalink / raw)
To: openembedded-core
The Kea recipe has PACKAGECONFIG options for boost, openssl, and
log4cplus. However, these are not optional but mandatory dependencies.
Remove the PACKAGECONFIGs and replace with explicit DEPENDS and
EXTRA_OECONF. Also the RDEPENDS in the PACKAGECONFIGs are redundant as
the library dependencies are generated correctly.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-connectivity/kea/kea_1.7.7.bb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-connectivity/kea/kea_1.7.7.bb b/meta/recipes-connectivity/kea/kea_1.7.7.bb
index c69a180833..c72ebff056 100644
--- a/meta/recipes-connectivity/kea/kea_1.7.7.bb
+++ b/meta/recipes-connectivity/kea/kea_1.7.7.bb
@@ -5,6 +5,8 @@ SECTION = "connectivity"
LICENSE = "MPL-2.0 & Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa"
+DEPENDS = "boost log4cplus openssl"
+
SRC_URI = "\
http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
file://0001-remove-AC_TRY_RUN.patch \
@@ -30,6 +32,11 @@ DEBUG_OPTIMIZATION_append_mipsel = " -O"
BUILD_OPTIMIZATION_remove_mipsel = " -Og"
BUILD_OPTIMIZATION_append_mipsel = " -O"
+EXTRA_OECONF = "--with-boost-include=${STAGING_INCDIR} \
+ --with-boost-libs=-lboost_system \
+ --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \
+ --with-openssl=${STAGING_DIR_TARGET}${prefix}"
+
do_configure_prepend() {
# replace abs_top_builddir to avoid introducing the build path
# don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target
@@ -49,12 +56,6 @@ do_install_append() {
rm -rf "${D}${localstatedir}"
}
-PACKAGECONFIG ??= "openssl log4cplus boost"
-
-PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_TARGET}${prefix},,openssl,openssl"
-PACKAGECONFIG[log4cplus] = "--with-log4cplus=${STAGING_DIR_TARGET}${prefix},,log4cplus,log4cplus"
-PACKAGECONFIG[boost] = "--with-boost-libs=-lboost_system,,boost,boost"
-
FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a"
FILES_${PN} += "${libdir}/hooks/*.so"
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] kea: bump to 1.7.10
2020-09-03 10:47 [PATCH 1/3] kea: no need to depend on kea-native Ross Burton
2020-09-03 10:47 ` [PATCH 2/3] kea: don't use PACKAGECONFIG inappropriately Ross Burton
@ 2020-09-03 10:47 ` Ross Burton
2020-09-03 14:26 ` [OE-core] [PATCH 1/3] kea: no need to depend on kea-native Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2020-09-03 10:47 UTC (permalink / raw)
To: openembedded-core
This is the latest release in the 1.7.x series so should be a safe
upgrade, and means we can drop a patch as the AC_TRY_RUN has an
optimistic fallback for cross-compiling now.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../kea/files/0001-remove-AC_TRY_RUN.patch | 34 -------------------
.../kea/{kea_1.7.7.bb => kea_1.7.10.bb} | 4 +--
2 files changed, 1 insertion(+), 37 deletions(-)
delete mode 100644 meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch
rename meta/recipes-connectivity/kea/{kea_1.7.7.bb => kea_1.7.10.bb} (92%)
diff --git a/meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch b/meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch
deleted file mode 100644
index d7ca9ff8fa..0000000000
--- a/meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9d6b8321c5b46199baca907f3d42bdcaaf1958a8 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Thu, 23 May 2019 23:59:42 -0700
-Subject: [PATCH] remove AC_TRY_RUN
-
-AC_TRY_RUN doesn't work in cross compile env,
-use AC_COMPILE_IFELSE instead to fix below configure
-error:
- | checking for usuable C++11 regex... configure: error: in `/builddir/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build':
- | configure: error: cannot run test program while cross compiling
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c880b77..dd40c7c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -580,7 +580,7 @@ AC_TRY_COMPILE([
- AC_MSG_RESULT(no))
-
- AC_MSG_CHECKING(for usuable C++11 regex)
--AC_TRY_RUN([
-+AC_COMPILE_IFELSE([
- #include <regex>
- #include <iostream>
- int main() {
---
-2.21.0
-
diff --git a/meta/recipes-connectivity/kea/kea_1.7.7.bb b/meta/recipes-connectivity/kea/kea_1.7.10.bb
similarity index 92%
rename from meta/recipes-connectivity/kea/kea_1.7.7.bb
rename to meta/recipes-connectivity/kea/kea_1.7.10.bb
index c72ebff056..78e0a0e979 100644
--- a/meta/recipes-connectivity/kea/kea_1.7.7.bb
+++ b/meta/recipes-connectivity/kea/kea_1.7.10.bb
@@ -9,13 +9,11 @@ DEPENDS = "boost log4cplus openssl"
SRC_URI = "\
http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
- file://0001-remove-AC_TRY_RUN.patch \
file://kea-dhcp4.service \
file://kea-dhcp6.service \
file://kea-dhcp-ddns.service \
"
-SRC_URI[md5sum] = "4f8d1251fd41ef2e822a4eb3f0797d46"
-SRC_URI[sha256sum] = "0bba8b045672884a928ff4b2a8575ac5ba420eb6ba47a9338f1932bc38dcf866"
+SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82"
inherit autotools systemd
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH 1/3] kea: no need to depend on kea-native
2020-09-03 10:47 [PATCH 1/3] kea: no need to depend on kea-native Ross Burton
2020-09-03 10:47 ` [PATCH 2/3] kea: don't use PACKAGECONFIG inappropriately Ross Burton
2020-09-03 10:47 ` [PATCH 3/3] kea: bump to 1.7.10 Ross Burton
@ 2020-09-03 14:26 ` Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2020-09-03 14:26 UTC (permalink / raw)
To: Ross Burton, openembedded-core
On Thu, 2020-09-03 at 11:47 +0100, Ross Burton wrote:
> 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.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
> meta/recipes-connectivity/kea/kea_1.7.7.bb | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
Sorry, but:
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2400
https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/2380
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/869
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/2401
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/2402
(basically all the world builds)
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-03 14:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-03 10:47 [PATCH 1/3] kea: no need to depend on kea-native Ross Burton
2020-09-03 10:47 ` [PATCH 2/3] kea: don't use PACKAGECONFIG inappropriately Ross Burton
2020-09-03 10:47 ` [PATCH 3/3] kea: bump to 1.7.10 Ross Burton
2020-09-03 14:26 ` [OE-core] [PATCH 1/3] kea: no need to depend on kea-native Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.