Skip to contentSkip to conversation

package/systemd: disable cryptsetup for host package

PATCH New Fabrice Fontaine 2 participants 4 messages Aug 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/systemd: disable cryptsetup for host package

Build with cryptsetup and without libblkid will fail on:

../src/shared/dissect-image.c:1336:34: error: 'N_DEVICE_NODE_LIST_ATTEMPTS' undeclared (first use in this function)

 1336 |         for (unsigned i = 0; i < N_DEVICE_NODE_LIST_ATTEMPTS; i++) {
      |                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~

This bug has been reported upstream:
https://github.com/systemd/systemd/pull/16901
and is not an issue for the target variant as libblkid is select by BR2_PACKAGE_UTIL_LINUX_MOUNT

As cryptsetup does not seem needed for host-systemd, just disable it

Fixes:
- http://autobuild.buildroot.org/results/67782c225c08387c1bbcbea9eee3ca12bc6577cd

---
 package/systemd/systemd.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/systemd/systemd.mk +2 -1
index e356cb1add..115ccbda06 100644
@@ -699,7 +699,8 @@ HOST_SYSTEMD_CONF_OPTS = \
 	-Dinitrd=false \
 	-Dxdg-autostart=false \
 	-Dkernel-install=false \
-	-Dsystemd-analyze=false
+	-Dsystemd-analyze=false \
+	-Dlibcryptsetup=false
 
 HOST_SYSTEMD_DEPENDENCIES = \
 	$(BR2_COREUTILS_HOST_DEPENDENCY) \
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/2 package/systemd: disable audit for host package

Disable audit for host package to avoid getting the following error if it is found on host:

[84/662] Generating audit_type-list.txt with a meson_exe.py custom command In file included from <command-line>:32:
./../src/basic/missing_audit.h:7:10: fatal error: libaudit.h: No such file or directory
7 | #include <libaudit.h>
| ^~~~~~~~~~~~

Fixes:
- http://autobuild.buildroot.org/results/67782c225c08387c1bbcbea9eee3ca12bc6577cd

---
 package/systemd/systemd.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/systemd/systemd.mk +2 -1
index 115ccbda06..81fa2bd0f0 100644
@@ -700,7 +700,8 @@ HOST_SYSTEMD_CONF_OPTS = \
 	-Dxdg-autostart=false \
 	-Dkernel-install=false \
 	-Dsystemd-analyze=false \
-	-Dlibcryptsetup=false
+	-Dlibcryptsetup=false \
+	-Daudit=false
 
 HOST_SYSTEMD_DEPENDENCIES = \
 	$(BR2_COREUTILS_HOST_DEPENDENCY) \
Signature · 1 line
2.28.0
#2 lore raw

PATCH 2/2 package/systemd: disable audit for host package

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Disable audit for host package to avoid getting the following error if it is found on host:

[84/662] Generating audit_type-list.txt with a meson_exe.py custom command In file included from <command-line>:32:
./../src/basic/missing_audit.h:7:10: fatal error: libaudit.h: No such file or directory
7 | #include <libaudit.h>
| ^~~~~~~~~~~~

Quoted 4 lines

Fixes:
- http://autobuild.buildroot.org/results/67782c225c08387c1bbcbea9eee3ca12bc6577cd

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 package/systemd: disable cryptsetup for host package

In reply to Fabrice Fontaine
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Build with cryptsetup and without libblkid will fail on:
../src/shared/dissect-image.c:1336:34: error: 'N_DEVICE_NODE_LIST_ATTEMPTS' undeclared (first use in this function)

 1336 |         for (unsigned i = 0; i < N_DEVICE_NODE_LIST_ATTEMPTS; i++) {
      |                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~

This bug has been reported upstream:
https://github.com/systemd/systemd/pull/16901
and is not an issue for the target variant as libblkid is select by BR2_PACKAGE_UTIL_LINUX_MOUNT

Quoted 6 lines

As cryptsetup does not seem needed for host-systemd, just disable it

Fixes:
- http://autobuild.buildroot.org/results/67782c225c08387c1bbcbea9eee3ca12bc6577cd

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard