From 3aacf0345329e60c49f3116882c56fa14856dec7 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 6 Mar 2024 16:07:56 +0400 Subject: [PATCH] feat: update releases Go 1.22.1 via tools. ``` | Package | Update | Change | |---|---|---| | [LINBIT/drbd](https://togithub.com/LINBIT/drbd) | patch | `9.2.7` -> `9.2.8` | | git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git | minor | `20240115` -> `20240220` | | git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git | patch | `6.6.18` -> `6.6.20` | | git://git.musl-libc.org/musl | patch | `1.2.4` -> `1.2.5` | | [tukaani-project/xz](https://togithub.com/tukaani-project/xz) | minor | `v5.4.6` -> `v5.6.0` | ``` DRBD is re-enabled, fingers crossed. Signed-off-by: Andrey Smirnov --- Makefile | 2 +- Pkgfile | 26 +++++++-------- kernel/build/config-amd64 | 4 +-- kernel/build/config-arm64 | 4 +-- musl/patches/elf.h-add-typedefs.patch | 30 ----------------- musl/patches/handle-aux-at-base.patch | 48 +++++++++++++++++++++++++++ musl/pkg.yaml | 2 +- 7 files changed, 67 insertions(+), 49 deletions(-) delete mode 100644 musl/patches/elf.h-add-typedefs.patch create mode 100644 musl/patches/handle-aux-at-base.patch diff --git a/Makefile b/Makefile index 376b7822..8551a644 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-02-28T18:54:55Z by kres latest. +# Generated on 2024-03-06T18:22:59Z by kres latest. # common variables diff --git a/Pkgfile b/Pkgfile index 0c20c135..97d18346 100644 --- a/Pkgfile +++ b/Pkgfile @@ -3,7 +3,7 @@ format: v1alpha2 vars: - TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.7.0-alpha.0-6-gb6b4d9e + TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.7.0-alpha.0-10-g14bf457 # renovate: datasource=github-releases depName=containernetworking/plugins cni_version: v1.4.0 @@ -27,9 +27,9 @@ vars: dosfstools_sha512: 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156 # renovate: datasource=github-tags extractVersion=^drbd-(?.*)$ depName=LINBIT/drbd - drbd_version: 9.2.7 - drbd_sha256: a6c03a2c4a478fac2a6593f87fac7814c900bcc309b8db347ed2810f82b6a58c - drbd_sha512: dd91f2ac5987026094a79c2526f469032010a18d0c88ac4c0591641554c9f8424b7caf836817728d62950068c6c14f0de4f5b3fe4ad94ae295b74e6ee5ea647f + drbd_version: 9.2.8 + drbd_sha256: 2ea2b594fb9c69bef02af701e1528676f048abe2bd5edb8eda6d033f95ed2b73 + drbd_sha512: 8da9986eab61cf9a16a67f29a93ba146592bfdac7bc370e70d4dcae37919bc4fb691a77ea4a2395cbb9bfacfce0a97e0a22ea5b13394d5f66e322f51f77368ef # renovate: datasource=github-releases depName=eudev-project/eudev eudev_version: v3.2.14 @@ -68,9 +68,9 @@ vars: ipxe_sha512: e41713e441b3e463ee05f0b4ea73575052ca6eb07a81dc92b15fb61e1d766082b1be24f39236614a7c166e9a6b19870c918c85f1cda88e822ee2b2203aeae14c # renovate: datasource=git-tags extractVersion=^v(?.*)$ 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.20 + linux_sha256: e2f6c7f39b304248193370f8c5755553ab73ad5672e92dae994a344084d8dd22 + linux_sha512: c11a0e7c07f085a7dff334cf6ce9a4f6720b9b832d7cd1bc802b2e14bb82f1e455040292b0289d2d0f91242ba27333442cf3f0bdd41b802ccd177d16379d4e25 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git kmod_version: 31 @@ -93,9 +93,9 @@ vars: libjson_c_sha512: 4cbedd559502bf9014cfcd1d0bb8bb80d2abac4e969d95d4170123cd9cbafb0756b913fdbb83f666d14f674d6539a60ed1c5d0eb03c36b8037a2e00dc1636e19 # renovate: datasource=github-releases depName=tukaani-project/xz - xz_version: v5.4.6 - xz_sha256: b92d4e3a438affcf13362a1305cd9d94ed47ddda22e456a42791e630a5644f5c - xz_sha512: 495cc890d25c075c927c907b77e60d86dd8a4c377cea5b1172c8e916984149a7bb5fb32db25091f7219346b83155b47e4bc0404cc8529d992014cd7ed0c278b7 + xz_version: v5.6.0 + xz_sha256: cdafe1632f139c82937cc1ed824f7a60b7b0a0619dfbbd681dcac02b1ac28f5b + xz_sha512: 2158a1e426066a2355f0810f2d65ceb9a7ec47f7e2e4b79c81d08b52f202ca80fb024b819dc4ca8631730248b9a6d431297fdd71e7e1d108eebcb94777e3a80d # renovate: datasource=github-releases extractVersion=^popt-(?.*)-release$ depName=rpm-software-management/popt libpopt_version: 1.19 @@ -113,9 +113,9 @@ vars: liburcu_sha512: 7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f # renovate: datasource=git-tags depName=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git - linux_firmware_version: 20240115 - linux_firmware_sha256: 86c2799516c9dc24e73214bd58ccd8297356186e97c5458baf4eb7cc8dbfea0a - linux_firmware_sha512: 0a57cc19b8a98a399857008520a89c46f93a64c3ea20f53ecb84a49c2c127d408ffbc641a81eb440545d4dcfd38175006aa0404e0dddd80e4bace4cc118f5fcd + linux_firmware_version: 20240220 + linux_firmware_sha256: e03f906bb5386fef16eaa45e592046cbf12f9d4e89f5f527282a6b78fe39460d + linux_firmware_sha512: 921ab79e4a2c70784cb48e491bc75e861eaeeeed859becc86a61b1100e838e0ce35b16d2d34943976925db538d4d44ae4dcc2aa711569f140dc9838fb9039e2e # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://sourceware.org/git/lvm2.git lvm2_version: 2_03_22 diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64 index 8e426f8b..c8699fe7 100644 --- a/kernel/build/config-amd64 +++ b/kernel/build/config-amd64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.18 Kernel Configuration +# Linux/x86 6.6.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -19,7 +19,7 @@ CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=125 +CONFIG_PAHOLE_VERSION=126 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64 index 2474b2ce..4bf1a68e 100644 --- a/kernel/build/config-arm64 +++ b/kernel/build/config-arm64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.18 Kernel Configuration +# Linux/arm64 6.6.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=125 +CONFIG_PAHOLE_VERSION=126 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/musl/patches/elf.h-add-typedefs.patch b/musl/patches/elf.h-add-typedefs.patch deleted file mode 100644 index b69017f8..00000000 --- a/musl/patches/elf.h-add-typedefs.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 -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 - diff --git a/musl/patches/handle-aux-at-base.patch b/musl/patches/handle-aux-at-base.patch new file mode 100644 index 00000000..826b7364 --- /dev/null +++ b/musl/patches/handle-aux-at-base.patch @@ -0,0 +1,48 @@ +https://git.alpinelinux.org/aports/plain/main/musl/handle-aux-at_base.patch + +This is required to make the gcompat ELF interpreter stub work with some +packed binaries. + +diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c +index b125eb1..616c6a6 100644 +--- a/src/env/__init_tls.c ++++ b/src/env/__init_tls.c +@@ -66,8 +66,10 @@ void *__copy_tls(unsigned char *mem) + } + + #if ULONG_MAX == 0xffffffff ++typedef Elf32_Ehdr Ehdr; + typedef Elf32_Phdr Phdr; + #else ++typedef Elf64_Ehdr Ehdr; + typedef Elf64_Phdr Phdr; + #endif + +@@ -77,15 +79,23 @@ extern const size_t _DYNAMIC[]; + static void static_init_tls(size_t *aux) + { + unsigned char *p; +- size_t n; ++ size_t n, e; + Phdr *phdr, *tls_phdr=0; + size_t base = 0; + void *mem; + +- for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) { ++ if (aux[AT_BASE]) { ++ Ehdr *ehdr = (void *)aux[AT_BASE]; ++ p = (unsigned char *)aux[AT_BASE] + ehdr->e_phoff; ++ n = ehdr->e_phnum; ++ e = ehdr->e_phentsize; ++ } else { ++ p = (void *)aux[AT_PHDR]; ++ n = aux[AT_PHNUM]; ++ e = aux[AT_PHENT]; ++ } ++ for (; n; n--, p+=e) { + phdr = (void *)p; +- if (phdr->p_type == PT_PHDR) +- base = aux[AT_PHDR] - phdr->p_vaddr; + if (phdr->p_type == PT_DYNAMIC && _DYNAMIC) + base = (size_t)_DYNAMIC - phdr->p_vaddr; + if (phdr->p_type == PT_TLS) diff --git a/musl/pkg.yaml b/musl/pkg.yaml index fbd52bd5..530415c6 100644 --- a/musl/pkg.yaml +++ b/musl/pkg.yaml @@ -15,7 +15,7 @@ steps: tar -xzf musl.tar.gz --strip-components=1 - patch -p1 < /pkg/patches/elf.h-add-typedefs.patch + patch -p1 < /pkg/patches/handle-aux-at-base.patch mkdir /bin ln -sv /toolchain/bin/bash /bin/sh