From 3967c8ca75c79341198660a9970998477e439a5b Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 20 Sep 2022 18:15:32 +0200 Subject: [PATCH 01/10] linux: Add version 5.15.69 Create bee file with cp linux-5.10.113-434.bee linux-5.15.69-435.bee and update SRCURL. --- linux-5.15.69-435.bee | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 linux-5.15.69-435.bee diff --git a/linux-5.15.69-435.bee b/linux-5.15.69-435.bee new file mode 100755 index 000000000..4f598981b --- /dev/null +++ b/linux-5.15.69-435.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/f278caa4e8e9dbd758a7c5ba1914d8a4/mariux-5.15.69-435.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 2a78a19a223c5ff0d5095f0409c7627b5cf131e8 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 20 Sep 2022 18:34:53 +0200 Subject: [PATCH 02/10] nvidia-linux: Add version 510.60.02 for Linux 5.15.69 Create bee file with cp nvidia_linux-5.10.113-434-510.60.02-0.bee nvidia_linux-5.15.69-435-510.60.02-0.bee --- nvidia_linux-5.15.69-435-510.60.02-0.bee | 64 ++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 nvidia_linux-5.15.69-435-510.60.02-0.bee diff --git a/nvidia_linux-5.15.69-435-510.60.02-0.bee b/nvidia_linux-5.15.69-435-510.60.02-0.bee new file mode 100755 index 000000000..640c319b0 --- /dev/null +++ b/nvidia_linux-5.15.69-435-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 84606049e7e0c925df75a7bf8e0901e677ddea46 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 21 Sep 2022 21:17:55 +0200 Subject: [PATCH 03/10] linux-5.15.69: Rebuild with nfs patch Use mariux-5.15.69-436 which added upstream commit 6e176d47160c ("NFSv4: Fixes for nfs4_inode_return_delegation()"): Author: Trond Myklebust Date: Sun Oct 10 10:58:12 2021 +0200 NFSv4: Fixes for nfs4_inode_return_delegation() We mustn't call nfs_wb_all() on anything other than a regular file. Furthermore, we can exit early when we don't hold a delegation. Reported-by: David Wysochanski Signed-off-by: Trond Myklebust diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 11118398f495..7c9eb679dbdb 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -755,11 +755,13 @@ int nfs4_inode_return_delegation(struct inode *inode) struct nfs_delegation *delegation; delegation = nfs_start_delegation_return(nfsi); - /* Synchronous recall of any application leases */ - break_lease(inode, O_WRONLY | O_RDWR); - nfs_wb_all(inode); - if (delegation != NULL) + if (delegation != NULL) { + /* Synchronous recall of any application leases */ + break_lease(inode, O_WRONLY | O_RDWR); + if (S_ISREG(inode->i_mode)) + nfs_wb_all(inode); return nfs_end_delegation_return(inode, delegation, 1); + } return 0; } --- linux-5.15.69-435.bee => linux-5.15.69-436.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-5.15.69-435.bee => linux-5.15.69-436.bee (92%) diff --git a/linux-5.15.69-435.bee b/linux-5.15.69-436.bee similarity index 92% rename from linux-5.15.69-435.bee rename to linux-5.15.69-436.bee index 4f598981b..8f3073683 100755 --- a/linux-5.15.69-435.bee +++ b/linux-5.15.69-436.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/f278caa4e8e9dbd758a7c5ba1914d8a4/mariux-5.15.69-435.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/27c71d95b8be538622dd4bbbba0986af/mariux-5.15.69-436.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From 1c690293fd54612fb22c10c23c0a72be3117f609 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 21 Sep 2022 21:39:58 +0200 Subject: [PATCH 04/10] nvidia_linux: Rebuild version 510.60.02 for Linux 5.15.69-436 --- ...35-510.60.02-0.bee => nvidia_linux-5.15.69-436-510.60.02-0.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-5.15.69-435-510.60.02-0.bee => nvidia_linux-5.15.69-436-510.60.02-0.bee (100%) diff --git a/nvidia_linux-5.15.69-435-510.60.02-0.bee b/nvidia_linux-5.15.69-436-510.60.02-0.bee similarity index 100% rename from nvidia_linux-5.15.69-435-510.60.02-0.bee rename to nvidia_linux-5.15.69-436-510.60.02-0.bee From c248c300eb7243583f8b91f223620fd16f712747 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 23 Sep 2022 08:59:58 +0200 Subject: [PATCH 05/10] linux-5.15.69: Reenable /proc/PID/io Use mariux-5.15.69-437 which includes fix to reenable /proc/pid/io [1]. [1]: https://github.molgen.mpg.de/mariux64/linux/commit/8d0e75ece55 --- linux-5.15.69-436.bee => linux-5.15.69-437.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-5.15.69-436.bee => linux-5.15.69-437.bee (92%) diff --git a/linux-5.15.69-436.bee b/linux-5.15.69-437.bee similarity index 92% rename from linux-5.15.69-436.bee rename to linux-5.15.69-437.bee index 8f3073683..a0b2ca6b8 100755 --- a/linux-5.15.69-436.bee +++ b/linux-5.15.69-437.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/27c71d95b8be538622dd4bbbba0986af/mariux-5.15.69-436.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/f509cf4f7438b8346b9d544d9396d3bb/mariux-5.15.69-437.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From 1c501113702164c2b67c8db6830d266185c54bcb Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 23 Sep 2022 09:04:22 +0200 Subject: [PATCH 06/10] nvidia_linux: Rebuild version 510.60.02 for Linux 5.15.69-437 --- ...36-510.60.02-0.bee => nvidia_linux-5.15.69-437-510.60.02-0.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-5.15.69-436-510.60.02-0.bee => nvidia_linux-5.15.69-437-510.60.02-0.bee (100%) diff --git a/nvidia_linux-5.15.69-436-510.60.02-0.bee b/nvidia_linux-5.15.69-437-510.60.02-0.bee similarity index 100% rename from nvidia_linux-5.15.69-436-510.60.02-0.bee rename to nvidia_linux-5.15.69-437-510.60.02-0.bee From 4b51999aa4067b3489e773b41c2508312e79aa62 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 28 Sep 2022 14:47:51 +0200 Subject: [PATCH 07/10] linux-5.15: Upgrade version from 5.15.69 to 5.15.71 Rebuild with a new patch to supress sporadic ext4 warnings when mxqd uses fcntl EXT4_IOC_SHUTDOWN on its job tmpdirs. Update minor Linux version while we are at it. --- linux-5.15.69-437.bee => linux-5.15.71-438.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-5.15.69-437.bee => linux-5.15.71-438.bee (92%) diff --git a/linux-5.15.69-437.bee b/linux-5.15.71-438.bee similarity index 92% rename from linux-5.15.69-437.bee rename to linux-5.15.71-438.bee index a0b2ca6b8..fe228d25a 100755 --- a/linux-5.15.69-437.bee +++ b/linux-5.15.71-438.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/f509cf4f7438b8346b9d544d9396d3bb/mariux-5.15.69-437.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/080495fae709dd5e660533854b8802bb/mariux-5.15.71-438.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From a8929856e54a82041366851a32639b9c3398b94c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 28 Sep 2022 15:00:16 +0200 Subject: [PATCH 08/10] nvidia_linux: Rebuild version 510.60.02 for Linux 5.15.71-438 --- ...37-510.60.02-0.bee => nvidia_linux-5.15.71-438-510.60.02-0.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-5.15.69-437-510.60.02-0.bee => nvidia_linux-5.15.71-438-510.60.02-0.bee (100%) diff --git a/nvidia_linux-5.15.69-437-510.60.02-0.bee b/nvidia_linux-5.15.71-438-510.60.02-0.bee similarity index 100% rename from nvidia_linux-5.15.69-437-510.60.02-0.bee rename to nvidia_linux-5.15.71-438-510.60.02-0.bee From 48f697f8d3004fac3cb819cf09f435772a22bae1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 7 Oct 2022 09:59:19 +0200 Subject: [PATCH 09/10] linux-5.15: Upgrade version from 5.15.71 to 5.15.72 --- linux-5.15.71-438.bee => linux-5.15.72-439.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-5.15.71-438.bee => linux-5.15.72-439.bee (92%) diff --git a/linux-5.15.71-438.bee b/linux-5.15.72-439.bee similarity index 92% rename from linux-5.15.71-438.bee rename to linux-5.15.72-439.bee index fe228d25a..eac0ca656 100755 --- a/linux-5.15.71-438.bee +++ b/linux-5.15.72-439.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/080495fae709dd5e660533854b8802bb/mariux-5.15.71-438.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/87208e28585db901ea762c5be91d067a/mariux-5.15.72-439.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From f745b0bcaa56f331a7ab172aed748c6c00ea93d1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 7 Oct 2022 10:00:08 +0200 Subject: [PATCH 10/10] nvidia_linux: Rebuild version 510.60.02 for Linux 5.15.72-439 --- ...38-510.60.02-0.bee => nvidia_linux-5.15.72-439-510.60.02-0.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-5.15.71-438-510.60.02-0.bee => nvidia_linux-5.15.72-439-510.60.02-0.bee (100%) diff --git a/nvidia_linux-5.15.71-438-510.60.02-0.bee b/nvidia_linux-5.15.72-439-510.60.02-0.bee similarity index 100% rename from nvidia_linux-5.15.71-438-510.60.02-0.bee rename to nvidia_linux-5.15.72-439-510.60.02-0.bee