Skip to content

Commit

Permalink
fix: revert musl to 1.2.4
Browse files Browse the repository at this point in the history
Kmod segfaults with musl 1.2.5.
I missed this while updating other stuff.

Signed-off-by: Noel Georgi <git@frezbo.dev>
  • Loading branch information
frezbo committed Apr 2, 2024
1 parent dd71e02 commit 05db2a8
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 52 deletions.
6 changes: 3 additions & 3 deletions Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ vars:
mellanox_ofed_sha512: 58604ea89aa8351727532c48f0c59b4e533ba8bfcef9533f45d94e15ffdcf3a5c464398706cad14ebf3826b132972bd044fadbf7f047e60bdb0c2a454c96acd7

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

# renovate: datasource=github-releases depName=nvidia/open-gpu-kernel-modules
nvidia_driver_version: 535.129.03
Expand Down
30 changes: 30 additions & 0 deletions musl/patches/elf.h-add-typedefs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
https://gitlab.alpinelinux.org/alpine/aports/-/raw/master/main/musl/0001-elf.h-add-typedefs-for-Elf-_Relr.patch

From 981144ebc9ff30b085af107f1337543de7b0bf94 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 6 Nov 2023 12:29:16 +0100
Subject: [PATCH] elf.h: add typedefs for Elf*_Relr

Add typedefs for Elf32_Relr and Elf64_relr as a follow-up to commit
d32dadd60efb (ldso: support DT_RELR relative relocation format)
---
include/elf.h | 3 +++
1 file changed, 3 insertions(+)

diff --git a/include/elf.h b/include/elf.h
index 23f2c4bc..aa186d9d 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -32,6 +32,9 @@ typedef uint16_t Elf64_Section;
typedef Elf32_Half Elf32_Versym;
typedef Elf64_Half Elf64_Versym;

+typedef Elf32_Word Elf32_Relr;
+typedef Elf64_Xword Elf64_Relr;
+
#define EI_NIDENT (16)

typedef struct {
--
2.42.1

48 changes: 0 additions & 48 deletions musl/patches/handle-aux-at-base.patch

This file was deleted.

2 changes: 1 addition & 1 deletion musl/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ steps:
tar -xzf musl.tar.gz --strip-components=1
patch -p1 < /pkg/patches/handle-aux-at-base.patch
patch -p1 < /pkg/patches/elf.h-add-typedefs.patch
mkdir /bin
ln -sv /toolchain/bin/bash /bin/sh
Expand Down

0 comments on commit 05db2a8

Please sign in to comment.