Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2829 from mariux64/add-linux-5.15.88-444
Add Linux 5.15.88-444 or later fixing Broadcom/LSI logging and other things
  • Loading branch information
donald committed Feb 20, 2023
2 parents d67964c + 8ee0ab6 commit 531b139
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 0 deletions.
50 changes: 50 additions & 0 deletions linux-5.15.94-447.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/3ca1edded3502e9d2c30debb35b83c18/mariux-5.15.94-447.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}
}
64 changes: 64 additions & 0 deletions nvidia_linux-5.15.94-447-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
}

0 comments on commit 531b139

Please sign in to comment.