HalogenOS/image-builder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix kernel dependency on glibc backtrace

Browse Source
This commit is contained in:
August 2025-07-01 01:02:05 -04:00
parent 5084c428b1
commit 3bd12d3f95
Signed by: shibedrill
GPG Key ID: 5FE0CB25945EFAA2
5 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/build-image.sh
View File

@ -31,7 +31,7 @@ if [ "$SECURESYS" == "true" ]; then echo "Intact"
else echo "Degraded"; fi else echo "Degraded"; fi
echo "================================" echo "================================"
set -x #set -x
export DISTPATH=$DISTPATH export DISTPATH=$DISTPATH
mkdir -p "$DISTPATH" mkdir -p "$DISTPATH"
@ -44,7 +44,7 @@ eselect profile set default/linux/amd64/23.0/musl/hardened/selinux
# STOP TELLING ME ABOUT THE NEWS # STOP TELLING ME ABOUT THE NEWS
eselect news read new > /dev/null eselect news read new > /dev/null
id -nu 250 | tee > /build/artifacts/test #id -nu 250 | tee > /build/artifacts/test
# Copy in host configs # Copy in host configs
cp -r /build/include-host/* / cp -r /build/include-host/* /
@ -52,13 +52,13 @@ cp -r /build/include-host/* /
# squashfs-tools needed for image mksquashfs for image generation # squashfs-tools needed for image mksquashfs for image generation
# gentoolkit needed for euse for setting use flags # gentoolkit needed for euse for setting use flags
# btrfs-progs needed for mkfs.btrfs for generating usr partition fs # btrfs-progs needed for mkfs.btrfs for generating usr partition fs
emerge -j "$NPROC" --quiet --noreplace @halogenos-host #emerge -j "$NPROC" --quiet --noreplace @halogenos-host
# We have to ensure use.disable contains at least one flag # We have to ensure use.disable contains at least one flag
# Otherwise euse -D will disable all global use flags # Otherwise euse -D will disable all global use flags
if [[ "$(cat /etc/portage/use.disable)" = *[![:space:]]* ]]; then #if [[ "$(cat /etc/portage/use.disable)" = *[![:space:]]* ]]; then
euse -D "$(cat /etc/portage/use.disable)" # euse -D "$(cat /etc/portage/use.disable)"
fi #fi
# Set install location # Set install location
export ROOT="$DISTPATH" export ROOT="$DISTPATH"
@ -67,9 +67,9 @@ export ROOT="$DISTPATH"
#emerge -j "$NPROC" --quiet --update --deep --newuse @world #emerge -j "$NPROC" --quiet --update --deep --newuse @world
# Emerge all packages # Emerge all packages
emerge -j "$NPROC" --quiet --noreplace @halogenos-image #emerge -j "$NPROC" --quiet --autounmask=y --autounmask-write --noreplace @halogenos-image
#emerge -j "$NPROC" --quiet --update --deep --noreplace @world #emerge -j "$NPROC" --quiet --update --deep --noreplace @world
emerge -j "$NPROC" --quiet --autounmask=y --autounmask-write sys-kernel/vanilla-kernel emerge -j "$NPROC" --quiet --autounmask=y --autounmask-write =sys-kernel/gentoo-kernel-6.15.4 | tee /build/artifacts/linux-build-log
emerge --depclean emerge --depclean
emerge --unmerge --nodeps portage perl-cleaner emerge --unmerge --nodeps portage perl-cleaner

1
build/include-host/etc/portage/package.accept_keywords/ecryptfs-utils Normal file
View File

@ -0,0 +1 @@
=sys-fs/ecryptfs-utils-111_p20170609-r1 ~amd64

4
build/include-host/etc/portage/package.accept_keywords/kernel
View File

@ -1,2 +1,2 @@
=virtual/dist-kernel-6.14.7 ~amd64 =virtual/dist-kernel-6.15.4 ~amd64
=sys-kernel/vanilla-kernel-6.14.7 ~amd64 =sys-kernel/gentoo-kernel-6.15.4 ~amd64

18
build/include-host/etc/portage/patches/sys-kernel/gentoo-kernel/fix-musl.patch Normal file
View File

@ -0,0 +1,18 @@
--- a/tools/include/linux/kallsyms.h
+++ b/tools/include/linux/kallsyms.h
@@ -18,6 +18,7 @@ static inline const char *kallsyms_lookup(unsigned long addr,
return NULL;
}
+#ifdef HAVE_BACKTRACE_SUPPORT
#include <execinfo.h>
#include <stdlib.h>
static inline void print_ip_sym(const char *loglvl, unsigned long ip)
@@ -30,5 +31,8 @@ static inline void print_ip_sym(const char *loglvl, unsigned long ip)
free(name);
}
+#else
+static inline void print_ip_sym(const char *loglvl, unsigned long ip) {}
+#endif
--

1
build/include-host/etc/portage/sets/halogenos-image
View File

@ -8,5 +8,6 @@ sys-apps/flatpak
sys-apps/fwupd sys-apps/fwupd
sys-apps/shadow sys-apps/shadow
sys-fs/ecryptfs-utils sys-fs/ecryptfs-utils
sys-kernel/linux-firmware
sys-libs/musl sys-libs/musl
virtual/tmpfiles virtual/tmpfiles