From 3bd12d3f955732db25e6dc508baa1b4e3ba8ce7f Mon Sep 17 00:00:00 2001 From: shibedrill Date: Tue, 1 Jul 2025 01:02:05 -0400 Subject: [PATCH] Fix kernel dependency on glibc backtrace --- build/build-image.sh | 16 ++++++++-------- .../package.accept_keywords/ecryptfs-utils | 1 + .../etc/portage/package.accept_keywords/kernel | 4 ++-- .../sys-kernel/gentoo-kernel/fix-musl.patch | 18 ++++++++++++++++++ .../etc/portage/sets/halogenos-image | 1 + 5 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 build/include-host/etc/portage/package.accept_keywords/ecryptfs-utils create mode 100644 build/include-host/etc/portage/patches/sys-kernel/gentoo-kernel/fix-musl.patch diff --git a/build/build-image.sh b/build/build-image.sh index 0d2a346..ce297f8 100755 --- a/build/build-image.sh +++ b/build/build-image.sh @@ -31,7 +31,7 @@ if [ "$SECURESYS" == "true" ]; then echo "Intact" else echo "Degraded"; fi echo "================================" -set -x +#set -x export DISTPATH=$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 eselect news read new > /dev/null -id -nu 250 | tee > /build/artifacts/test +#id -nu 250 | tee > /build/artifacts/test # Copy in host configs cp -r /build/include-host/* / @@ -52,13 +52,13 @@ cp -r /build/include-host/* / # squashfs-tools needed for image mksquashfs for image generation # gentoolkit needed for euse for setting use flags # 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 # Otherwise euse -D will disable all global use flags -if [[ "$(cat /etc/portage/use.disable)" = *[![:space:]]* ]]; then - euse -D "$(cat /etc/portage/use.disable)" -fi +#if [[ "$(cat /etc/portage/use.disable)" = *[![:space:]]* ]]; then +# euse -D "$(cat /etc/portage/use.disable)" +#fi # Set install location export ROOT="$DISTPATH" @@ -67,9 +67,9 @@ export ROOT="$DISTPATH" #emerge -j "$NPROC" --quiet --update --deep --newuse @world # 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 --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 --unmerge --nodeps portage perl-cleaner diff --git a/build/include-host/etc/portage/package.accept_keywords/ecryptfs-utils b/build/include-host/etc/portage/package.accept_keywords/ecryptfs-utils new file mode 100644 index 0000000..8125ebd --- /dev/null +++ b/build/include-host/etc/portage/package.accept_keywords/ecryptfs-utils @@ -0,0 +1 @@ +=sys-fs/ecryptfs-utils-111_p20170609-r1 ~amd64 \ No newline at end of file diff --git a/build/include-host/etc/portage/package.accept_keywords/kernel b/build/include-host/etc/portage/package.accept_keywords/kernel index 8788b6a..4782eaf 100644 --- a/build/include-host/etc/portage/package.accept_keywords/kernel +++ b/build/include-host/etc/portage/package.accept_keywords/kernel @@ -1,2 +1,2 @@ -=virtual/dist-kernel-6.14.7 ~amd64 -=sys-kernel/vanilla-kernel-6.14.7 ~amd64 \ No newline at end of file +=virtual/dist-kernel-6.15.4 ~amd64 +=sys-kernel/gentoo-kernel-6.15.4 ~amd64 \ No newline at end of file diff --git a/build/include-host/etc/portage/patches/sys-kernel/gentoo-kernel/fix-musl.patch b/build/include-host/etc/portage/patches/sys-kernel/gentoo-kernel/fix-musl.patch new file mode 100644 index 0000000..d86aff0 --- /dev/null +++ b/build/include-host/etc/portage/patches/sys-kernel/gentoo-kernel/fix-musl.patch @@ -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 + #include + 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 +-- \ No newline at end of file diff --git a/build/include-host/etc/portage/sets/halogenos-image b/build/include-host/etc/portage/sets/halogenos-image index f7f1fe9..f79cd61 100644 --- a/build/include-host/etc/portage/sets/halogenos-image +++ b/build/include-host/etc/portage/sets/halogenos-image @@ -8,5 +8,6 @@ sys-apps/flatpak sys-apps/fwupd sys-apps/shadow sys-fs/ecryptfs-utils +sys-kernel/linux-firmware sys-libs/musl virtual/tmpfiles \ No newline at end of file