[PATCH BlueZ] build: Do not regenerate internal ELL headers with external ELL

[PATCH BlueZ] build: Do not regenerate internal ELL headers with external ELL

[wonkru-dev]

[-- Attachment #1.1: Type: text/plain, Size: 13 bytes --]

Empty Message

[-- Attachment #1.2: Type: text/html, Size: 24 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Do-not-regenerate-internal-ELL-headers-with-external.patch --]
[-- Type: text/x-patch; name=0001-Do-not-regenerate-internal-ELL-headers-with-external.patch, Size: 1079 bytes --]

From bb73b844c5884db269c3782a1322dba08febe5bd Mon Sep 17 00:00:00 2001
From: old <152850693+CelestifyX@users.noreply.github.com>
Date: Sat, 17 Oct 2026 18:35:48 +0200
Subject: [PATCH BlueZ] build: Do not regenerate internal ELL headers with external ELL

---
 Makefile.am | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index f742458d1..f3a6deef6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -850,8 +850,12 @@ endif
 if MESH
 unit_tests += unit/test-mesh-crypto
 unit_test_mesh_crypto_CPPFLAGS = $(ell_cflags)
+if EXTERNAL_ELL
+unit_test_mesh_crypto_SOURCES = unit/test-mesh-crypto.c mesh/crypto.h
+else
 unit_test_mesh_crypto_SOURCES = unit/test-mesh-crypto.c \
 				mesh/crypto.h ell/internal ell/ell.h
+endif
 unit_test_mesh_crypto_LDADD = $(ell_ldadd)
 endif
 
@@ -973,11 +977,13 @@ ell/internal: Makefile
 		fi \
 	done > $@
 
+if !EXTERNAL_ELL
 ell/ell.h: Makefile
 	$(AM_V_at)echo -n > $@
 	$(AM_V_GEN)for f in $(ell_headers) ; do \
 		echo "#include <$$f>" >> $@ ; \
 	done
+endif
 
 maintainer-clean-local:
 	-rm -rf ell
-- 
2.55.0

RE: [BlueZ] build: Do not regenerate internal ELL headers with external ELL

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

This is an automated email and please do not reply to this email.

Dear Submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.

----- Output -----

hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Please resolve the issue and submit the patches again.


---
Regards,
Linux Bluetooth

[BlueZ] build: Do not regenerate internal ELL headers with external ELL

[wonkru-dev]

[-- Attachment #1.1: Type: text/plain, Size: 13 bytes --]

Empty Message

[-- Attachment #1.2: Type: text/html, Size: 24 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Do-not-regenerate-internal-ELL-headers-with-external.patch --]
[-- Type: text/x-patch; name=0001-Do-not-regenerate-internal-ELL-headers-with-external.patch, Size: 1064 bytes --]

From bb73b844c5884db269c3782a1322dba08febe5bd Mon Sep 17 00:00:00 2001
From: Vylen Linux Team <wonkru-dev@proton.me>
Date: Sat, 17 Oct 2026 18:35:48 +0200
Subject: [PATCH BlueZ] build: Do not regenerate internal ELL headers with external ELL

---
 Makefile.am | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am	2026-10-17 22:09:46.713884545 +0200
+++ b/Makefile.am	2026-10-17 22:08:41.617000000 +0200
@@ -850,8 +850,12 @@
 if MESH
 unit_tests += unit/test-mesh-crypto
 unit_test_mesh_crypto_CPPFLAGS = $(ell_cflags)
+if EXTERNAL_ELL
+unit_test_mesh_crypto_SOURCES = unit/test-mesh-crypto.c mesh/crypto.h
+else
 unit_test_mesh_crypto_SOURCES = unit/test-mesh-crypto.c \
 				mesh/crypto.h ell/internal ell/ell.h
+endif
 unit_test_mesh_crypto_LDADD = $(ell_ldadd)
 endif
 
@@ -973,11 +977,13 @@
 		fi \
 	done > $@
 
+if !EXTERNAL_ELL
 ell/ell.h: Makefile
 	$(AM_V_at)echo -n > $@
 	$(AM_V_GEN)for f in $(ell_headers) ; do \
 		echo "#include <$$f>" >> $@ ; \
 	done
+endif
 
 maintainer-clean-local:
 	-rm -rf ell