From 72b7b37e4e232a174c41335dafd92eb6ae32ebdc Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 16 Jan 2023 16:08:31 +0100 Subject: [PATCH 1/5] linux: Add LTS version 5.15.88-444 with Broadcom logging fixes Also cherry-pick a cbmem driver fix. --- linux-5.15.88-444.bee | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 linux-5.15.88-444.bee diff --git a/linux-5.15.88-444.bee b/linux-5.15.88-444.bee new file mode 100755 index 000000000..d5b7da77c --- /dev/null +++ b/linux-5.15.88-444.bee @@ -0,0 +1,50 @@ +#!/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/21220f2c31c56ddae59c34a5dd5a99b8/mariux-5.15.86-443.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_patch() { + echo "PATCH $@" + bee_patch $@ +} + +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 -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} + + ln -sv bzImage-${FULLKERNELVERSION} ${D}/boot/mariux.${PKGREVISION} +} From 4fa8bcdecdb0bc03597476edf57811c836fb87fe Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 18 Jan 2023 16:52:11 +0100 Subject: [PATCH 2/5] linux: Add version 5.15.89 Add version 5.15.89 and remove version 5.15.88. The kernel mariux-5.15.89-445.tar.gz contains another patch which shoud avoid the "request-key: Cannot find command to construct key ,,;" messages in the syslog with a sec=mariux nfs client. --- linux-5.15.88-444.bee => linux-5.15.89-445.bee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename linux-5.15.88-444.bee => linux-5.15.89-445.bee (83%) diff --git a/linux-5.15.88-444.bee b/linux-5.15.89-445.bee similarity index 83% rename from linux-5.15.88-444.bee rename to linux-5.15.89-445.bee index d5b7da77c..4d50ef556 100755 --- a/linux-5.15.88-444.bee +++ b/linux-5.15.89-445.bee @@ -9,8 +9,8 @@ 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/21220f2c31c56ddae59c34a5dd5a99b8/mariux-5.15.86-443.tar.gz" +#SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/77597078ddd3447d777e4a251d43b8a9/mariux-5.15.89-445.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From 968427f68e2ce159f38d051d8bd5eb8261de36a1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 19 Jan 2023 15:24:40 +0100 Subject: [PATCH 3/5] nvidia_linux: Build version 510.60.02 for Linux 5.15.89-445 --- nvidia_linux-5.15.89-445-510.60.02-0.bee | 64 ++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 nvidia_linux-5.15.89-445-510.60.02-0.bee diff --git a/nvidia_linux-5.15.89-445-510.60.02-0.bee b/nvidia_linux-5.15.89-445-510.60.02-0.bee new file mode 100755 index 000000000..640c319b0 --- /dev/null +++ b/nvidia_linux-5.15.89-445-510.60.02-0.bee @@ -0,0 +1,64 @@ +#!/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/2288e18f3b767e66d465fb4add1df080/NVIDIA-Linux-x86_64-510.60.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() { + LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2" + + print_info "extracting nvidia archive .." + + start_cmd rmdir ${S} + start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} + + if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source" + elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + else + print_info "extracting linux build ${LINUXPKG} .." + start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR} + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + fi + + print_info "using kernel sources from ${LINUXSRCDIR} .." +} + +mee_build_pre() { + ln -s ${LINUXSRCDIR}/include ${S}/include +} + +mee_build() { + IGNORE_CC_MISMATCH=1 \ + make SYSSRC=${LINUXSRCDIR} 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 68d96ed8e5aa022446bfeb9f3f1076dfb376e63a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 19 Feb 2023 18:30:57 +0100 Subject: [PATCH 4/5] linux: Add version 5.15.94 Add version 5.15.94 and remove version 5.15.89. The kernel mariux-5.15.94-447 contains patches to rate limit the "scsi_dma_map failed: request for %d bytes" warnings messages. --- linux-5.15.89-445.bee => linux-5.15.94-447.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-5.15.89-445.bee => linux-5.15.94-447.bee (92%) diff --git a/linux-5.15.89-445.bee b/linux-5.15.94-447.bee similarity index 92% rename from linux-5.15.89-445.bee rename to linux-5.15.94-447.bee index 4d50ef556..ea2424505 100755 --- a/linux-5.15.89-445.bee +++ b/linux-5.15.94-447.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/77597078ddd3447d777e4a251d43b8a9/mariux-5.15.89-445.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/3ca1edded3502e9d2c30debb35b83c18/mariux-5.15.94-447.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From 8ee0ab67b44db20ab4d5fc490ecc9faa0dd7eca5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 19 Feb 2023 19:32:30 +0100 Subject: [PATCH 5/5] nvidia_linux: Build version 510.60.02 for Linux 5.15.94-447 Build version 510.60.02 for Linux 5.15.94-447 and remove for Linux 5.15.89-445A. --- ...45-510.60.02-0.bee => nvidia_linux-5.15.94-447-510.60.02-0.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-5.15.89-445-510.60.02-0.bee => nvidia_linux-5.15.94-447-510.60.02-0.bee (100%) diff --git a/nvidia_linux-5.15.89-445-510.60.02-0.bee b/nvidia_linux-5.15.94-447-510.60.02-0.bee similarity index 100% rename from nvidia_linux-5.15.89-445-510.60.02-0.bee rename to nvidia_linux-5.15.94-447-510.60.02-0.bee