Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: archlinux support #372

Merged
merged 2 commits into from
Jan 27, 2025
Merged

fix: archlinux support #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
781217e
fix(pkg/driverbuilder): fixed archlinux kernel URLs support.
FedeDP Jan 27, 2025
d560183
chore(docker,pkg): added new archlinux builder image to build recent …
FedeDP Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docker/builders/builder-arch-x86_64_gcc14.2.1.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM archlinux:base-devel-20250119.0.299327

LABEL maintainer="cncf-falco-dev@lists.cncf.io"

RUN pacman -Sy && pacman -Sy --noconfirm cmake pahole clang llvm git cpio wget openssl bc


# Properly create soft link
RUN ln -s /usr/bin/gcc /usr/bin/gcc-14.2.1
30 changes: 15 additions & 15 deletions pkg/driverbuilder/builder/archlinux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ func (c *archlinux) URLs(kr kernelrelease.KernelRelease) ([]string, error) {
urls = append(
urls,
fmt.Sprintf(
"%s/linux-headers-%s%s-%s.pkg.tar.%s",
"%s/linux-headers-%s-%s-%s.pkg.tar.%s",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eg: https://archive.archlinux.org/packages/l/linux-headers/linux-headers-6.12.10.arch1-1-x86_64.pkg.tar.zst

baseURL,
kr.Fullversion,
kr.FullExtraversion,
kr.String(),
kr.KernelVersion,
kr.Architecture.ToNonDeb(),
compressionAlgo,
),
Expand All @@ -90,10 +90,10 @@ func (c *archlinux) URLs(kr kernelrelease.KernelRelease) ([]string, error) {
urls = append(
urls,
fmt.Sprintf(
"%s/linux-hardened-headers-%s%s-%s.pkg.tar.%s",
"%s/linux-hardened-headers-%s-%s-%s.pkg.tar.%s",
baseURL,
kr.Fullversion,
kr.FullExtraversion,
kr.String(),
kr.KernelVersion,
kr.Architecture.ToNonDeb(),
compressionAlgo,
),
Expand All @@ -105,10 +105,10 @@ func (c *archlinux) URLs(kr kernelrelease.KernelRelease) ([]string, error) {
urls = append(
urls,
fmt.Sprintf(
"%s/linux-zen-headers-%s%s-%s.pkg.tar.%s",
"%s/linux-zen-headers-%s-%s-%s.pkg.tar.%s",
baseURL,
kr.Fullversion,
kr.FullExtraversion,
kr.String(),
kr.KernelVersion,
kr.Architecture.ToNonDeb(),
compressionAlgo,
),
Expand All @@ -120,10 +120,10 @@ func (c *archlinux) URLs(kr kernelrelease.KernelRelease) ([]string, error) {
urls = append(
urls,
fmt.Sprintf(
"%s/linux-lts-headers-%s%s-%s.pkg.tar.%s",
"%s/linux-lts-headers-%s-%s-%s.pkg.tar.%s",
baseURL,
kr.Fullversion,
kr.FullExtraversion,
kr.String(),
kr.KernelVersion,
kr.Architecture.ToNonDeb(),
compressionAlgo,
),
Expand All @@ -136,10 +136,10 @@ func (c *archlinux) URLs(kr kernelrelease.KernelRelease) ([]string, error) {
urls = append(
urls,
fmt.Sprintf(
"%s/linux-aarch64-headers-%s%s-%s.pkg.tar.%s",
"%s/linux-aarch64-headers-%s-%s-%s.pkg.tar.%s",
baseURL,
kr.Fullversion,
kr.FullExtraversion,
kr.String(),
kr.KernelVersion,
kr.Architecture.ToNonDeb(),
compressionAlgo,
),
Expand Down
5 changes: 4 additions & 1 deletion pkg/driverbuilder/builder/builders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@ type GCCVersionRequestor interface {
func defaultGCC(kr kernelrelease.KernelRelease) semver.Version {
switch kr.Major {
case 6:
if kr.Minor >= 10 {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For kernels >= 6.10, use gcc 14.2.1 image; since the image is archlinux only, this change is not going to update the behavior for other distros.

return semver.Version{Major: 14, Minor: 2, Patch: 1}
}
if kr.Minor >= 5 {
return semver.Version{Major: 13}
}
Expand All @@ -239,7 +242,7 @@ func defaultGCC(kr kernelrelease.KernelRelease) semver.Version {
case 2:
return semver.Version{Major: 4, Minor: 8}
default:
return semver.Version{Major: 13}
return semver.Version{Major: 14, Minor: 2, Patch: 1}
}
}

Expand Down
Loading