From 331cfeead8750204607e2c78e918d52427fb3d71 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 18 Apr 2025 12:58:42 +0200 Subject: [PATCH 1/9] linux: Add version 6.12.23 --- linux-6.12.23-480.bee | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 linux-6.12.23-480.bee diff --git a/linux-6.12.23-480.bee b/linux-6.12.23-480.bee new file mode 100755 index 000000000..ca230d95f --- /dev/null +++ b/linux-6.12.23-480.bee @@ -0,0 +1,46 @@ +#!/bin/env beesh + +# note: BEE_MAKEFLAGS="-j $(nproc)" ./linux-xxx.bee + +KERNELVERSION=${PKGVERSION} + +# append extra version to get for example 4.8-rc4 +KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH} + +echo $KERNELVERSION + +#SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/ad55c3afddf5251f5a78b02801640d97/mariux-6.12.23-480.tar.gz" + +KERNELLOCAL=".mx64.${PKGREVISION}" +FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" + +B=${S} + +same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.bee.* 2>/dev/null) \ + && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \ + && exit + + +mee_configure() { + echo "configure $@" + echo "CONFIG_LOCALVERSION=\"$KERNELLOCAL\"" > .config + grep -v 'CONFIG_LOCALVERSION=' config-mpi >> .config + make olddefconfig +} + +mee_build() { + echo "build $@" + make ${BEE_MAKEFLAGS} +} + +mee_install() { + echo "install $@" + + make modules_install INSTALL_MOD_PATH=${D} + make install INSTALL_PATH=${D}/boot + + rm -rf ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} + + ln -sv bzImage-${FULLKERNELVERSION} ${D}/boot/mariux.${PKGREVISION} +} From 44f5fa15311ae3e272704edf75acafe42ec6ecab Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 29 Apr 2025 10:55:56 +0200 Subject: [PATCH 2/9] linux-6.12.12: Rebuld with BTF debug info +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +CONFIG_DEBUG_INFO_BTF=y --- linux-6.12.23-480.bee => linux-6.12.23-481.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-6.12.23-480.bee => linux-6.12.23-481.bee (92%) diff --git a/linux-6.12.23-480.bee b/linux-6.12.23-481.bee similarity index 92% rename from linux-6.12.23-480.bee rename to linux-6.12.23-481.bee index ca230d95f..2b23efa95 100755 --- a/linux-6.12.23-480.bee +++ b/linux-6.12.23-481.bee @@ -10,7 +10,7 @@ KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH} echo $KERNELVERSION #SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz" -SRCURL[0]="https://beehive.molgen.mpg.de/ad55c3afddf5251f5a78b02801640d97/mariux-6.12.23-480.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/f3b9e9b370a675f10aab0e0ff112326d/mariux-6.12.23-481.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From 59b779996414472ba6d057b86ba0d2d0bfa570c1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 May 2025 10:20:00 +0200 Subject: [PATCH 3/9] nvidia_current: Add version 570.144 from 2025-04-17 https://www.nvidia.com/en-us/drivers/details/243330/ --- nvidia_current-570.144-0.bee | 102 +++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100755 nvidia_current-570.144-0.bee diff --git a/nvidia_current-570.144-0.bee b/nvidia_current-570.144-0.bee new file mode 100755 index 000000000..2c7002e4b --- /dev/null +++ b/nvidia_current-570.144-0.bee @@ -0,0 +1,102 @@ +#!/bin/env beesh + +# resources: +# http://www.nvidia.com/object/unix.html +# ./README.txt +# ./.manifest +# https://github.com/NVIDIA/nvidia-installer +# ./nvidia-installer -A +# ./nvidia-installer --ui=none --accept-license --no-kernel-module --expert +# + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${PKGEXTRAVERSION:+-${PKGEXTRAVERSION}}.run" + +#SRCURL[0]="https://de.download.nvidia.com/XFree86/Linux-x86_64/$PKGVERSION/NVIDIA-Linux-x86_64-$PKGVERSION.run" +SRCURL[0]="https://beehive.molgen.mpg.de/c2a4ccbd3d29ed83d0d9dcd742eb034a/NVIDIA-Linux-x86_64-570.144.run" + + +BEE_CONFIGURE=none + +build_in_sourcedir + +PREFIX=/usr/share/nvidia/${PKGVERSION} +LIBDIR=${PREFIX}/lib +BINDIR=${PREFIX}/bin + +# fix tar option for user namespace usage (`unshare -U -r BEEFILE`) +export TAR_OPTIONS=--no-same-owner + +mee_extract() { + rmdir ${S} + sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} +} + +#mee_patch() { +# bee_patch +#} + +mee_build() { + #bee_build + true +} + +mee_install() { + #bee_install + + mkdir -pv ${D}${PREFIX}/{bin,lib,drivers,man/man1} + mkdir -pv ${D}/usr/lib + + NVDRV="nvidia_drv.so" + + NVBIN=( \ + "nvidia-cuda-mps-control" \ + "nvidia-cuda-mps-server" \ + "nvidia-debugdump" \ + "nvidia-modprobe" \ + "nvidia-persistenced" \ + "nvidia-settings" \ + "nvidia-smi" \ + "nvidia-xconfig" \ + ) + + for i in lib*.so.$PKGVERSION; do + install -v -t ${D}${LIBDIR} "$i" + ln -sv "${LIBDIR}/$i" ${D}/usr/lib/ + if soname="$(soname "$i")"; then + #echo "$soname\n" + test -e "${D}${LIBDIR}/${soname}" || ln -sv "$i" "${D}${LIBDIR}/${soname}" + fi + done + + # libglxserver_nvidia.so should reside in /usr/lib/xorg/modules/extensions, + # here we cheat away and stay in line with the /node/usr_share_mxgfx mechanism. + # Additional note: don't put/link libglx.so into /usr/lib. + ln -sv libglxserver_nvidia.so.$PKGVERSION ${D}${LIBDIR}/libglxserver_nvidia.so + + # libnvidia-api was introduced with 525, but w/o a 'PKGVERSION' + install -v -t ${D}${LIBDIR} libnvidia-api.so.1 + + mkdir -vp ${D}/usr/lib/xorg/modules/extensions + + cd ${D}/usr/lib/xorg/modules/extensions + ln -sv /usr/share/mxgfx/lib/libglxserver_nvidia.so libglxserver_nvidia.so + cd $B + + echo "installing ${NVDRV} as drivers/$(basename ${NVDRV})"; + install -c -v ${NVDRV} ${D}${PREFIX}/drivers + + mkdir -pv ${D}/usr/share/man/man1 + + for i in ${NVBIN[@]} ; do + echo "installing ${i} as bin/${i}" + install -v -c -m 755 ${i} ${D}${BINDIR} + if [ -e ${i}.1.gz ]; then + install -v -c -m 644 ${i}.1.gz ${D}${PREFIX}/man/man1 + fi + done + + mkdir -pv ${D}/lib/firmware/nvidia/${PKGVERSION} + install -v -c -m 644 firmware/gsp_ga10x.bin ${D}/lib/firmware/nvidia/${PKGVERSION} + install -v -c -m 644 firmware/gsp_tu10x.bin ${D}/lib/firmware/nvidia/${PKGVERSION} + +} From bb1c10d839fb6223bc75a32d49b4776713891808 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 May 2025 10:30:51 +0200 Subject: [PATCH 4/9] nvidia_linux: Build 570.144 for Linux 6.12.23-481 --- nvidia_linux-6.12.23-481-570.144-0.bee | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 nvidia_linux-6.12.23-481-570.144-0.bee diff --git a/nvidia_linux-6.12.23-481-570.144-0.bee b/nvidia_linux-6.12.23-481-570.144-0.bee new file mode 100755 index 000000000..c2777a233 --- /dev/null +++ b/nvidia_linux-6.12.23-481-570.144-0.bee @@ -0,0 +1,48 @@ +#!/bin/env beesh + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}.run" + +#SRCURL[0]="https://de.download.nvidia.com/XFree86/Linux-x86_64/$PKGVERSION/NVIDIA-Linux-x86_64-$PKGVERSION.run" +SRCURL[0]="https://beehive.molgen.mpg.de/c2a4ccbd3d29ed83d0d9dcd742eb034a/NVIDIA-Linux-x86_64-570.144.run" + +PATCHURL+=() + +LINUXPKG=${PKGEXTRANAME}.${ARCH} + +LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}") + +# '4.4.mx64.75' to '4.4.0.mx64.75' +if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(\.mx64.*) ]]; then + LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}" +fi + + +build_in_sourcedir +sourcesubdir_append kernel + +: ${BEE_TMP_TMPDIR:=/tmp} + +# fix tar option for user namespace usage (`unshare -U -r BEEFILE`) +export TAR_OPTIONS=--no-same-owner + +mee_extract() { + rmdir ${S} + start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} + + if [ ! -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then + start_cmd gtar -xf ${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2 -C ${BEE_TMP_TMPDIR} + fi + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" +} + +mee_build() { + make SYSSRC=${LINUXSRCDIR} CC=gcc module +} + +mee_install() { + mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION} + + cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/ + + ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/current +} From fa0f7e73c9408fc0960a7c7b0c33d544735f539f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 May 2025 16:57:05 +0200 Subject: [PATCH 5/9] nvidia_linux: Build 535.230.02-0 for Linux 6.12.23-481 --- nvidia_linux-6.12.23-481-535.230.02-0.bee | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 nvidia_linux-6.12.23-481-535.230.02-0.bee diff --git a/nvidia_linux-6.12.23-481-535.230.02-0.bee b/nvidia_linux-6.12.23-481-535.230.02-0.bee new file mode 100755 index 000000000..ec4e3c4aa --- /dev/null +++ b/nvidia_linux-6.12.23-481-535.230.02-0.bee @@ -0,0 +1,48 @@ +#!/bin/env beesh + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}.run" + +#SRCURL[0]="https://de.download.nvidia.com/XFree86/Linux-x86_64/$PKGVERSION/NVIDIA-Linux-x86_64-$PKGVERSION.run" +SRCURL[0]="https://beehive.molgen.mpg.de/2e34184b91fa9bcc7cc5d4f8707ef0d6/NVIDIA-Linux-x86_64-535.230.02.run" + +PATCHURL+=() + +LINUXPKG=${PKGEXTRANAME}.${ARCH} + +LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}") + +# '4.4.mx64.75' to '4.4.0.mx64.75' +if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(\.mx64.*) ]]; then + LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}" +fi + + +build_in_sourcedir +sourcesubdir_append kernel + +: ${BEE_TMP_TMPDIR:=/tmp} + +# fix tar option for user namespace usage (`unshare -U -r BEEFILE`) +export TAR_OPTIONS=--no-same-owner + +mee_extract() { + rmdir ${S} + start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} + + if [ ! -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then + start_cmd gtar -xf ${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2 -C ${BEE_TMP_TMPDIR} + fi + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" +} + +mee_build() { + make SYSSRC=${LINUXSRCDIR} CC=gcc module +} + +mee_install() { + mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION} + + cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/ + + ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/current +} From a55e30fcaff4226158010ba5619831b0b2ca77b6 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 6 May 2025 13:01:24 +0200 Subject: [PATCH 6/9] linux: Ugrade version from 6.12.23 TO 6.12.27 Update version. 6.12.27-482 also has `CONFIG_NET_SCH_INGRESS=m`. --- linux-6.12.23-481.bee => linux-6.12.27-482.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-6.12.23-481.bee => linux-6.12.27-482.bee (92%) diff --git a/linux-6.12.23-481.bee b/linux-6.12.27-482.bee similarity index 92% rename from linux-6.12.23-481.bee rename to linux-6.12.27-482.bee index 2b23efa95..97d747dd8 100755 --- a/linux-6.12.23-481.bee +++ b/linux-6.12.27-482.bee @@ -10,7 +10,7 @@ KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH} echo $KERNELVERSION #SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz" -SRCURL[0]="https://beehive.molgen.mpg.de/f3b9e9b370a675f10aab0e0ff112326d/mariux-6.12.23-481.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/2ea42aa30df2254b30577c8ef43e2ba1/mariux-6.12.27-482.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From c89e5d827f07d944b4c20aa04cd269752120b26a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 6 May 2025 13:46:04 +0200 Subject: [PATCH 7/9] nvidia_linux: Build version 570.144 for linux 6.12.27-482 Build version 570.144 for linux 6.12.27-482 and remove other builds for linux 6.12.*. --- nvidia_linux-6.12.23-481-535.230.02-0.bee | 48 ------------------- ... => nvidia_linux-6.12.27-482-570.144-0.bee | 0 2 files changed, 48 deletions(-) delete mode 100755 nvidia_linux-6.12.23-481-535.230.02-0.bee rename nvidia_linux-6.12.23-481-570.144-0.bee => nvidia_linux-6.12.27-482-570.144-0.bee (100%) diff --git a/nvidia_linux-6.12.23-481-535.230.02-0.bee b/nvidia_linux-6.12.23-481-535.230.02-0.bee deleted file mode 100755 index ec4e3c4aa..000000000 --- a/nvidia_linux-6.12.23-481-535.230.02-0.bee +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/env beesh - -NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}.run" - -#SRCURL[0]="https://de.download.nvidia.com/XFree86/Linux-x86_64/$PKGVERSION/NVIDIA-Linux-x86_64-$PKGVERSION.run" -SRCURL[0]="https://beehive.molgen.mpg.de/2e34184b91fa9bcc7cc5d4f8707ef0d6/NVIDIA-Linux-x86_64-535.230.02.run" - -PATCHURL+=() - -LINUXPKG=${PKGEXTRANAME}.${ARCH} - -LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}") - -# '4.4.mx64.75' to '4.4.0.mx64.75' -if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(\.mx64.*) ]]; then - LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}" -fi - - -build_in_sourcedir -sourcesubdir_append kernel - -: ${BEE_TMP_TMPDIR:=/tmp} - -# fix tar option for user namespace usage (`unshare -U -r BEEFILE`) -export TAR_OPTIONS=--no-same-owner - -mee_extract() { - rmdir ${S} - start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} - - if [ ! -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then - start_cmd gtar -xf ${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2 -C ${BEE_TMP_TMPDIR} - fi - LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" -} - -mee_build() { - make SYSSRC=${LINUXSRCDIR} CC=gcc module -} - -mee_install() { - mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION} - - cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/ - - ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/current -} diff --git a/nvidia_linux-6.12.23-481-570.144-0.bee b/nvidia_linux-6.12.27-482-570.144-0.bee similarity index 100% rename from nvidia_linux-6.12.23-481-570.144-0.bee rename to nvidia_linux-6.12.27-482-570.144-0.bee From be49f5b74a76b13e10d83876e9666c598f481fe2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 22 May 2025 11:32:22 +0200 Subject: [PATCH 8/9] linux: Ugrade version from 6.12.27 to 6.12.29 --- linux-6.12.27-482.bee => linux-6.12.29-483.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-6.12.27-482.bee => linux-6.12.29-483.bee (92%) diff --git a/linux-6.12.27-482.bee b/linux-6.12.29-483.bee similarity index 92% rename from linux-6.12.27-482.bee rename to linux-6.12.29-483.bee index 97d747dd8..4c84f09f0 100755 --- a/linux-6.12.27-482.bee +++ b/linux-6.12.29-483.bee @@ -10,7 +10,7 @@ KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH} echo $KERNELVERSION #SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz" -SRCURL[0]="https://beehive.molgen.mpg.de/2ea42aa30df2254b30577c8ef43e2ba1/mariux-6.12.27-482.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/8502679ddd7885c8d3d99763f2d27cd0/mariux-6.12.29-483.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From a6cfa08c4e2379dd3437b18ca2e95846cab7369a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 22 May 2025 11:33:37 +0200 Subject: [PATCH 9/9] nvidia_linux: Build version 570.144 for linux 6.12.29-483 --- ...27-482-570.144-0.bee => nvidia_linux-6.12.29-483-570.144-0.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-6.12.27-482-570.144-0.bee => nvidia_linux-6.12.29-483-570.144-0.bee (100%) diff --git a/nvidia_linux-6.12.27-482-570.144-0.bee b/nvidia_linux-6.12.29-483-570.144-0.bee similarity index 100% rename from nvidia_linux-6.12.27-482-570.144-0.bee rename to nvidia_linux-6.12.29-483-570.144-0.bee