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.

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

feat: update musl to v1.2.5, Linux headers, rekres #106

Merged
merged 1 commit into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"matchPackageNames": [
"git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
],
"allowedVersions": "<= 6.1"
"allowedVersions": "<= 6.6"
},
{
"matchPackagePatterns": [
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-03-27T10:26:41Z by kres latest.
# Generated on 2024-05-09T10:54:11Z by kres 1e986af.

name: default
concurrency:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
labels: ${{ steps.retrieve-pr-labels.outputs.result }}
services:
buildkitd:
image: moby/buildkit:v0.13.1
image: moby/buildkit:v0.13.2
options: --privileged
ports:
- 1234:1234
Expand All @@ -47,6 +47,7 @@ jobs:
run: |
git fetch --prune --unshallow
- name: Set up Docker Buildx
id: setup-buildx
uses: docker/setup-buildx-action@v3
with:
append: |
Expand Down Expand Up @@ -102,7 +103,7 @@ jobs:
- default
services:
buildkitd:
image: moby/buildkit:v0.13.1
image: moby/buildkit:v0.13.2
options: --privileged
ports:
- 1234:1234
Expand All @@ -116,6 +117,7 @@ jobs:
run: |
git fetch --prune --unshallow
- name: Set up Docker Buildx
id: setup-buildx
uses: docker/setup-buildx-action@v3
with:
append: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/weekly.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-03-27T10:26:41Z by kres latest.
# Generated on 2024-05-09T10:54:11Z by kres 1e986af.

name: weekly
concurrency:
Expand All @@ -16,7 +16,7 @@ jobs:
- pkgs
services:
buildkitd:
image: moby/buildkit:v0.13.1
image: moby/buildkit:v0.13.2
options: --privileged
ports:
- 1234:1234
Expand All @@ -30,6 +30,7 @@ jobs:
run: |
git fetch --prune --unshallow
- name: Set up Docker Buildx
id: setup-buildx
uses: docker/setup-buildx-action@v3
with:
append: |
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-03-27T10:26:41Z by kres latest.
# Generated on 2024-05-09T10:54:11Z by kres 1e986af.

# common variables

Expand All @@ -9,6 +9,7 @@ TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*)
ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined')
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
ARTIFACTS := _out
IMAGE_TAG ?= $(TAG)
OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]')
GOARCH := $(shell uname -m | tr '[:upper:]' '[:lower:]')

Expand Down Expand Up @@ -93,7 +94,7 @@ If you already have a compatible builder instance, you may use that instead.
## Artifacts

All artifacts will be output to ./$(ARTIFACTS). Images will be tagged with the
registry "$(REGISTRY)", username "$(USERNAME)", and a dynamic tag (e.g. $(IMAGE):$(TAG)).
registry "$(REGISTRY)", username "$(USERNAME)", and a dynamic tag (e.g. $(IMAGE):$(IMAGE_TAG)).
The registry and username can be overridden by exporting REGISTRY, and USERNAME
respectively.

Expand Down
12 changes: 6 additions & 6 deletions Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ vars:
mpc_sha512: 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97

# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
linux_version: 6.6.18
linux_sha256: 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d
linux_sha512: 7453d9ae753345e9312ad01da7805f68c1fb04f33aaec58ac3ba08e4b7af132c19e1822d8635fb747eb2d72cc8d89c89f3e5b7ff2e2207903cb2eb8b7dc5e884
linux_version: 6.6.30
linux_sha256: b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6
linux_sha512: 1c1cb9449686fc334385e9997073503ac6312d6855e8ef26bb1e73267447cce14f1f0a22b5c585a0a3c6c8dd1ed0e3c246671773ab8990fdf3c2f081219a9212

# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.musl-libc.org/musl
musl_version: 1.2.4
musl_sha256: 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039
musl_sha512: 498ec5d7941194a8806f4d42f0f6d218c862996ef1398b737d0d06995e0b7a6574b240a48088f6b84016b14b2776fe463f829dcb11149cdfc1023d496b235c55
musl_version: 1.2.5
musl_sha256: a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4
musl_sha512: 7bb7f7833923cd69c7a1a9b8a5f1784bfd5289663eb6061dcd43d583e45987df8a68a1be05d75cc1c88a3f5b610653d1a70f4a9cff4d8f7fd41ae73ee058c17c

labels:
org.opencontainers.image.source: https://github.com/siderolabs/toolchain
30 changes: 0 additions & 30 deletions musl/patches/elf.h-add-typedefs.patch

This file was deleted.

40 changes: 0 additions & 40 deletions musl/patches/revert-faccessat2.patch

This file was deleted.

7 changes: 5 additions & 2 deletions musl/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ steps:
sha512: "{{ .musl_sha512 }}"
env:
PATH: "{{ .BOOTSTRAP }}/bin:{{ .PATH }}"
# disable any optimizations, as musl does its own
CFLAGS: ""
CXXFLAGS: ""
LDFLAGS: ""
prepare:
- |
tar -xzf musl.tar.gz --strip-components=1

patch -p1 < /pkg/patches/revert-faccessat2.patch
patch -p1 < /pkg/patches/elf.h-add-typedefs.patch
patch -p1 < /pkg/patches/handle-aux-at-base.patch

mkdir build
cd build
Expand Down
Loading