src/shared/dissect-image.c: fix build without blkdid #16901
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
N_DEVICE_NODE_LIST_ATTEMPTS is unconditionally used since version 246 and ac1f3ad However, this variable is only defined if HAVE_BLKID is set resulting in the following build failure if cryptsetup is enabled but not libblkid: ../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++) { | Fixes: - http://autobuild.buildroot.org/results/67782c225c08387c1bbcbea9eee3ca12bc6577cd Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
bluca
approved these changes
Aug 29, 2020
buildroot-auto-update
pushed a commit
to buildroot/buildroot
that referenced
this pull request
Aug 29, 2020
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:
systemd/systemd#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
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
yuwata
added
dissect
good-to-merge/waiting-for-ci 👍
|
LGTM. |
peckato1
pushed a commit
to peckato1/systemd
that referenced
this pull request
Oct 1, 2020
N_DEVICE_NODE_LIST_ATTEMPTS is unconditionally used since version 246 and systemd@ac1f3ad However, this variable is only defined if HAVE_BLKID is set resulting in the following build failure if cryptsetup is enabled but not libblkid: ../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++) { | Fixes: - http://autobuild.buildroot.org/results/67782c225c08387c1bbcbea9eee3ca12bc6577cd (cherry picked from commit 28e2641)
awanga
pushed a commit
to awanga/alt-f-next
that referenced
this pull request
Oct 7, 2020
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:
systemd/systemd#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
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
vbatts
pushed a commit
to kinvolk/systemd
that referenced
this pull request
Nov 12, 2020
N_DEVICE_NODE_LIST_ATTEMPTS is unconditionally used since version 246 and systemd@ac1f3ad However, this variable is only defined if HAVE_BLKID is set resulting in the following build failure if cryptsetup is enabled but not libblkid: ../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++) { | Fixes: - http://autobuild.buildroot.org/results/67782c225c08387c1bbcbea9eee3ca12bc6577cd (cherry picked from commit 28e2641) (cherry picked from commit d6b1e65)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
N_DEVICE_NODE_LIST_ATTEMPTS is unconditionally used since version 246 and ac1f3ad
However, this variable is only defined if HAVE_BLKID is set resulting in the following build failure if cryptsetup is enabled but not libblkid:
Fixes:
Signed-off-by: Fabrice Fontaine fontaine.fabrice@gmail.com