importd: fix build failure with missing O_TMPFILE (branch yem/o-tmpfile) #4052
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
| @@ -25,6 +25,7 @@ | |||
| #include <libgen.h> | |||
| #undef basename | |||
|
|
|||
| #include "missing.h" | |||
| #include "sd-daemon.h" | |||
There was a problem hiding this comment.
please place missing.h among the block of local includes, i.e. further down, and we try to keep them in alphabetical order.
(the sd-xyz.h headers are our public API, and we generally try to avoid importing local before public stuff)
|
note we don't use Signed-of-by: in systemd, that's a kernel thing, see CODING_STYLE. Patch looks okish, but please fix the few superficial issues I commented on, thanks! |
poettering
added
the
reviewed/needs-rework 🔨
O_TMPFILE may be missing from the system headers, so use our fallback definition. --- Changes v1 -> v2: - move include with local includes
Currently, a missing __O_TMPFILE was only defined for i386 and x86_64,
leaving any other architectures with an "old" toolchain fail miserably
at build time:
src/import/export-raw.c: In function 'reflink_snapshot':
src/import/export-raw.c:271:26: error: 'O_TMPFILE' undeclared (first use in this function)
new_fd = open(d, O_TMPFILE|O_CLOEXEC|O_NOCTTY|O_RDWR, 0600);
^
__O_TMPFILE (and O_TMPFILE) are available since glibc 2.19. However, a
lot of existing toolchains are still using glibc-2.18, and some even
before that, and it is not really possible to update those toolchains.
Instead of defining it only for i386 and x86_64, define __O_TMPFILE
with the specific values for those archs where it is different from the
generic value. Use the values as found in the Linux kernel (v4.8-rc3,
current as of time of commit).
---
Note: tested on ARM (build+run), with glibc-2.18 and linux headers 3.12.
Untested on other archs, though (I have no board to test this).
Changes v1 -> v2:
- add a comment specifying some are hexa, others are octal.
fileio makes use of O_TMPFILE when it is available. We now always have O_TMPFILE, defined in missing.h if missing from the toolchain headers. Have fileio include missing.h and drop the guards around the use of O_TMPFILE.
|
Thanks for merging! :-) |
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.
Hello!
Here are two fixes to get
importdbuild with older toolchains on allarchitectures:
importdwas not includingmissing.hto get fallback defines,O_TMPFILEwas only provided on i386 and x86_64.The solution for the second issue was to define
O_TMPFILEfor allarchs, using values defined in the kernel, rather than defining it only
for x86.
Additionally,
basic/fileiowas guarding out any use ofO_TMPFILE,because it was not including
missing.heither. Doing so, we can dropthe guards around
O_TMPFILE.Regards,
Yann E. MORIN.