Updated dependencies (3.24.x)#2269
Open
github-actions[bot] wants to merge 4 commits into
Open
Conversation
larsewi
force-pushed
the
update-dependencies-action-3.24.x-1779697926
branch
from
6fc7d66 to
8abf3c4
Compare
Contributor
|
@cf-bottom Jenkins with exotics please :) |
Some kernel-headers packages ship <linux/openat2.h> but do not export
SYS_openat2 from <asm/unistd.h>, causing rsync 3.4.3's syscall.c to
fail to compile:
syscall.c: In function 'secure_relative_open_linux':
syscall.c:1723:19: error: 'SYS_openat2' undeclared (first use in this function); did you mean 'SYS_openat'?
1723 | dirfd = syscall(SYS_openat2, AT_FDCWD, basedir, &bhow, sizeof bhow);
| ^~~~~~~~~~~
| SYS_openat
Apply a source patch that adds a fallback #define SYS_openat2 437
(the syscall number is the same on all Linux architectures).
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
larsewi
force-pushed
the
update-dependencies-action-3.24.x-1779697926
branch
from
255da8a to
6801371
Compare
Manually cherry-picked the detect-environment portion of commit b550647 ("Added a shell variable for the OS major version") from master; the full commit does not apply cleanly to this branch. Co-authored-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com> Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
RHEL/CentOS 7 and Ubuntu 20.04 ship kernel-headers without <linux/openat2.h>, so rsync 3.4.3's unconditional include fails before the existing SYS_openat2 fallback can take effect. Add a second patch that inlines the header verbatim, applied only on those platforms via $OS / $OS_VERSION_MAJOR; everything else keeps using fix-sys-openat2-undeclared.patch. Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
|
Alright, I triggered a build: (with exotics) Jenkins: https://ci.cfengine.com/job/pr-pipeline/13897/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13897/ |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Automated dependency updates for the 3.24.x branch