From 83e81c02ce5fad2e2ea340398e48c741a59e7c6a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 11 Sep 2023 12:12:28 +0200 Subject: [PATCH 1/5] linux: Add version 5.15.131 --- linux-5.15.131-453.bee | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 linux-5.15.131-453.bee diff --git a/linux-5.15.131-453.bee b/linux-5.15.131-453.bee new file mode 100755 index 000000000..caf492ed4 --- /dev/null +++ b/linux-5.15.131-453.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/2ce87ac48d02e4724cd1ca8567949e52/mariux-5.15.131-453.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 7ad14a98277917479b699b06f33c7f1793fa2ed1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 11 Sep 2023 12:26:42 +0200 Subject: [PATCH 2/5] nvidia_linux: Build version 510.60.02 for Linux 5.15.131-453 --- nvidia_linux-5.15.131-453-510.60.02-0.bee | 64 +++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 nvidia_linux-5.15.131-453-510.60.02-0.bee diff --git a/nvidia_linux-5.15.131-453-510.60.02-0.bee b/nvidia_linux-5.15.131-453-510.60.02-0.bee new file mode 100755 index 000000000..640c319b0 --- /dev/null +++ b/nvidia_linux-5.15.131-453-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 e6079c779bbe528ebce5a198cc9c1c3c919790ba Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 11 Sep 2023 12:59:55 +0200 Subject: [PATCH 3/5] nvidia_linux: Update version from 510.60.02 to 510.108.03 for Linux 5.15.131-453 --- ...10.60.02-0.bee => nvidia_linux-5.15.131-453-510.108.03-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename nvidia_linux-5.15.131-453-510.60.02-0.bee => nvidia_linux-5.15.131-453-510.108.03-0.bee (94%) diff --git a/nvidia_linux-5.15.131-453-510.60.02-0.bee b/nvidia_linux-5.15.131-453-510.108.03-0.bee similarity index 94% rename from nvidia_linux-5.15.131-453-510.60.02-0.bee rename to nvidia_linux-5.15.131-453-510.108.03-0.bee index 640c319b0..f5dfd34df 100755 --- a/nvidia_linux-5.15.131-453-510.60.02-0.bee +++ b/nvidia_linux-5.15.131-453-510.108.03-0.bee @@ -3,7 +3,7 @@ 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" +SRCURL[0]="https://beehive.molgen.mpg.de/a225bcb0373cbf6c552ed906bc5c614e/NVIDIA-Linux-x86_64-510.108.03.run" PATCHURL+=() From 7f307f451d3580b67a163d402ec329c2f3fa9eeb Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 11 Sep 2023 13:24:28 +0200 Subject: [PATCH 4/5] linux: Rebuild version 5.15.131 Rebuild to enable MICROCODE_LATE_LOADING. --- linux-5.15.131-453.bee => linux-5.15.131-454.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-5.15.131-453.bee => linux-5.15.131-454.bee (92%) diff --git a/linux-5.15.131-453.bee b/linux-5.15.131-454.bee similarity index 92% rename from linux-5.15.131-453.bee rename to linux-5.15.131-454.bee index caf492ed4..c0739dda1 100755 --- a/linux-5.15.131-453.bee +++ b/linux-5.15.131-454.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/2ce87ac48d02e4724cd1ca8567949e52/mariux-5.15.131-453.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/246f8c1a896f60f265b17b94ccff2d97/mariux-5.15.131-454.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" From 9f9afd8dd315055c79b3679afcf23d9fdd1a850d Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 11 Sep 2023 13:58:36 +0200 Subject: [PATCH 5/5] nvidia_linux: Build version 510.108.03 for Linux 5.15.131-454 --- ...510.108.03-0.bee => nvidia_linux-5.15.131-454-510.108.03-0.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-5.15.131-453-510.108.03-0.bee => nvidia_linux-5.15.131-454-510.108.03-0.bee (100%) diff --git a/nvidia_linux-5.15.131-453-510.108.03-0.bee b/nvidia_linux-5.15.131-454-510.108.03-0.bee similarity index 100% rename from nvidia_linux-5.15.131-453-510.108.03-0.bee rename to nvidia_linux-5.15.131-454-510.108.03-0.bee