diff mbox series

[meta-oe] minifi-cpp: Fix do_configure error builder aarch64

Message ID 20231212093804.1012506-1-liezhi.yang@windriver.com
State Accepted
Headers show
Series [meta-oe] minifi-cpp: Fix do_configure error builder aarch64 | expand

Commit Message

Robert Yang Dec. 12, 2023, 9:38 a.m. UTC
From: Robert Yang <liezhi.yang@windriver.com>

Fixed do_configure error when build on aarch64 host:
error: cannot guess build type; you must specify one

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...onfig.guess-Support-build-on-aarch64.patch | 31 +++++++++++++++++++
 .../minifi-cpp/minifi-cpp_0.7.0.bb            |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0001-config.guess-Support-build-on-aarch64.patch

Comments

Khem Raj Dec. 12, 2023, 4:19 p.m. UTC | #1
On 12/12/23 1:38 AM, liezhi.yang@windriver.com wrote:
> From: Robert Yang <liezhi.yang@windriver.com>
> 
> Fixed do_configure error when build on aarch64 host:
> error: cannot guess build type; you must specify one
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   ...onfig.guess-Support-build-on-aarch64.patch | 31 +++++++++++++++++++
>   .../minifi-cpp/minifi-cpp_0.7.0.bb            |  1 +
>   2 files changed, 32 insertions(+)
>   create mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0001-config.guess-Support-build-on-aarch64.patch
> 
> diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-config.guess-Support-build-on-aarch64.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-config.guess-Support-build-on-aarch64.patch
> new file mode 100644
> index 0000000000..3086a70455
> --- /dev/null
> +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-config.guess-Support-build-on-aarch64.patch
> @@ -0,0 +1,31 @@
> +From 92fdbfdd6b55ff0b65edd9a283ac85ad349e325b Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang@windriver.com>
> +Date: Tue, 12 Dec 2023 07:27:52 +0000
> +Subject: [PATCH] config.guess: Fix do_configure error builder aarch64
> +
> +Fixed configure error when build on aarch64 host:
> +error: cannot guess build type; you must specify one
> +
> +Upstream-Status: Pending

would you mind posting it upstream as well ? IIRC we were stuck on an 
older version of minifi-cpp perhaps it needs bumping to latest as well.

> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + config.guess      |   2 +-
> + 1 files changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/thirdparty/uuid-1.6.2/config.guess b/thirdparty/uuid-1.6.2/config.guess
> +index ca2a03c..a858bfd 100755
> +--- a/thirdparty/uuid-1.6.2/config.guess
> ++++ b/thirdparty/uuid-1.6.2/config.guess
> +@@ -835,7 +835,7 @@ EOF
> +     i*86:Minix:*:*)
> + 	echo ${UNAME_MACHINE}-pc-minix
> + 	exit ;;
> +-    arm*:Linux:*:*)
> ++    arm*:Linux:*:*|aarch64:Linux:*:*)
> + 	eval $set_cc_for_build
> + 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
> + 	    | grep -q __ARM_EABI__
> +--
> +2.34.1
> +
> diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
> index 67a2d9fa5f..5059b63212 100644
> --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
> +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
> @@ -40,6 +40,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht
>               file://minifi.service \
>               file://systemd-volatile.conf \
>               file://sysvinit-volatile.conf \
> +            file://0001-config.guess-Support-build-on-aarch64.patch \
>               "
>   
>   SRC_URI[curl.md5sum] = "d0bcc586873cfef08b4b9594e5395a33"
Ross Burton Dec. 12, 2023, 4:42 p.m. UTC | #2
> On 12 Dec 2023, at 09:38, Robert Yang via lists.openembedded.org <liezhi.yang=windriver.com@lists.openembedded.org> wrote:
> +            file://0001-config.guess-Support-build-on-aarch64.patch \

If that’s a standard autotools config.guess then use gnu-configize to install new files entirely.

Also this is a huge red flag as it means this recipe is embeddings its own copy of the uuid library instead of using the system library.

Ross
Ross Burton Dec. 12, 2023, 4:48 p.m. UTC | #3
On 12 Dec 2023, at 16:42, Ross Burton via lists.openembedded.org <ross.burton=arm.com@lists.openembedded.org> wrote:
> Also this is a huge red flag as it means this recipe is embeddings its own copy of the uuid library instead of using the system library.

OH DEAR GOD NO.

https://github.com/apache/nifi-minifi-cpp/tree/main/thirdparty

If I were an OSV I’d be BBMASKing that recipe out because it’s going to be carrying an impressive number of CVEs.

Ross
Khem Raj Dec. 12, 2023, 5 p.m. UTC | #4
On Tue, Dec 12, 2023 at 8:49 AM Ross Burton <Ross.Burton@arm.com> wrote:
>
> On 12 Dec 2023, at 16:42, Ross Burton via lists.openembedded.org <ross.burton=arm.com@lists.openembedded.org> wrote:
> > Also this is a huge red flag as it means this recipe is embeddings its own copy of the uuid library instead of using the system library.
>
> OH DEAR GOD NO.
>
> https://github.com/apache/nifi-minifi-cpp/tree/main/thirdparty
>
> If I were an OSV I’d be BBMASKing that recipe out because it’s going to be carrying an impressive number of CVEs.
>

yeah :) Now you see the reality

> Ross
Khem Raj Dec. 13, 2023, 7:07 a.m. UTC | #5
On Tue, 12 Dec 2023 17:38:04 +0800, liezhi.yang@windriver.com wrote:
> Fixed do_configure error when build on aarch64 host:
> error: cannot guess build type; you must specify one
> 
> 

Applied, thanks!

[1/1] minifi-cpp: Fix do_configure error builder aarch64
      commit: adecc463a3c090e5a9c54875a42047a427384f71

Best regards,
Ross Burton Dec. 13, 2023, 11:31 a.m. UTC | #6
On 13 Dec 2023, at 07:07, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote:
> 
> 
> On Tue, 12 Dec 2023 17:38:04 +0800, liezhi.yang@windriver.com wrote:
>> Fixed do_configure error when build on aarch64 host:
>> error: cannot guess build type; you must specify one
>> 
>> 
> 
> Applied, thanks!
> 
> [1/1] minifi-cpp: Fix do_configure error builder aarch64
>      commit: adecc463a3c090e5a9c54875a42047a427384f71

I stand by my comment that patching the config.guess is the wrong thing when we explicitly have a command whose job is to install updated config.guess files.

Ross
Khem Raj Dec. 13, 2023, 3:55 p.m. UTC | #7
On Wed, Dec 13, 2023 at 3:31 AM Ross Burton <Ross.Burton@arm.com> wrote:

> On 13 Dec 2023, at 07:07, Khem Raj via lists.openembedded.org <raj.khem=
> gmail.com@lists.openembedded.org> wrote:
> >
> >
> > On Tue, 12 Dec 2023 17:38:04 +0800, liezhi.yang@windriver.com wrote:
> >> Fixed do_configure error when build on aarch64 host:
> >> error: cannot guess build type; you must specify one
> >>
> >>
> >
> > Applied, thanks!
> >
> > [1/1] minifi-cpp: Fix do_configure error builder aarch64
> >      commit: adecc463a3c090e5a9c54875a42047a427384f71
>
> I stand by my comment that patching the config.guess is the wrong thing
> when we explicitly have a command whose job is to install updated
> config.guess files.


This is vendored code but I think overwriting config.guess might be better
way still.


>
> Ross
Khem Raj Dec. 13, 2023, 11:42 p.m. UTC | #8
Robert, can you test and send improvements that Ross is suggesting here.

On Wed, Dec 13, 2023 at 7:55 AM Khem Raj <raj.khem@gmail.com> wrote:
>
>
>
> On Wed, Dec 13, 2023 at 3:31 AM Ross Burton <Ross.Burton@arm.com> wrote:
>>
>> On 13 Dec 2023, at 07:07, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote:
>> >
>> >
>> > On Tue, 12 Dec 2023 17:38:04 +0800, liezhi.yang@windriver.com wrote:
>> >> Fixed do_configure error when build on aarch64 host:
>> >> error: cannot guess build type; you must specify one
>> >>
>> >>
>> >
>> > Applied, thanks!
>> >
>> > [1/1] minifi-cpp: Fix do_configure error builder aarch64
>> >      commit: adecc463a3c090e5a9c54875a42047a427384f71
>>
>> I stand by my comment that patching the config.guess is the wrong thing when we explicitly have a command whose job is to install updated config.guess files.
>
>
> This is vendored code but I think overwriting config.guess might be better way still.
>
>>
>>
>> Ross
Robert Yang Dec. 14, 2023, 9:49 a.m. UTC | #9
Hi Khem and Ross,

On 12/14/23 07:42, Khem Raj wrote:
> Robert, can you test and send improvements that Ross is suggesting here.

I'm working on upgrade minifi-cpp from 0.7.0 to 0.15.0, I think that the patch
is not needed after upgrade, but the upgrade is not easy.

// Robert.

> 
> On Wed, Dec 13, 2023 at 7:55 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>>
>>
>> On Wed, Dec 13, 2023 at 3:31 AM Ross Burton <Ross.Burton@arm.com> wrote:
>>>
>>> On 13 Dec 2023, at 07:07, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote:
>>>>
>>>>
>>>> On Tue, 12 Dec 2023 17:38:04 +0800, liezhi.yang@windriver.com wrote:
>>>>> Fixed do_configure error when build on aarch64 host:
>>>>> error: cannot guess build type; you must specify one
>>>>>
>>>>>
>>>>
>>>> Applied, thanks!
>>>>
>>>> [1/1] minifi-cpp: Fix do_configure error builder aarch64
>>>>       commit: adecc463a3c090e5a9c54875a42047a427384f71
>>>
>>> I stand by my comment that patching the config.guess is the wrong thing when we explicitly have a command whose job is to install updated config.guess files.
>>
>>
>> This is vendored code but I think overwriting config.guess might be better way still.
>>
>>>
>>>
>>> Ross
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-config.guess-Support-build-on-aarch64.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-config.guess-Support-build-on-aarch64.patch
new file mode 100644
index 0000000000..3086a70455
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-config.guess-Support-build-on-aarch64.patch
@@ -0,0 +1,31 @@ 
+From 92fdbfdd6b55ff0b65edd9a283ac85ad349e325b Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 12 Dec 2023 07:27:52 +0000
+Subject: [PATCH] config.guess: Fix do_configure error builder aarch64
+
+Fixed configure error when build on aarch64 host:
+error: cannot guess build type; you must specify one
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ config.guess      |   2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/thirdparty/uuid-1.6.2/config.guess b/thirdparty/uuid-1.6.2/config.guess
+index ca2a03c..a858bfd 100755
+--- a/thirdparty/uuid-1.6.2/config.guess
++++ b/thirdparty/uuid-1.6.2/config.guess
+@@ -835,7 +835,7 @@ EOF
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+-    arm*:Linux:*:*)
++    arm*:Linux:*:*|aarch64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_EABI__
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
index 67a2d9fa5f..5059b63212 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
@@ -40,6 +40,7 @@  SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht
             file://minifi.service \
             file://systemd-volatile.conf \
             file://sysvinit-volatile.conf \
+            file://0001-config.guess-Support-build-on-aarch64.patch \
             "
 
 SRC_URI[curl.md5sum] = "d0bcc586873cfef08b4b9594e5395a33"