Merge pull request #3123 from mariux64/update-linux

Update linux
mariux64 · Jun 25, 2024 · 002537a · 002537a
2 parents 0b8b3bc + 29fa4e7
commit 002537a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 92 deletions.
diff --git a/linux-6.6.11-460.bee → linux-6.6.35-477.bee b/linux-6.6.11-460.bee → linux-6.6.35-477.bee
@@ -9,8 +9,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/a55a2f53e758309780c015df3bf7378c/mariux-6.6.11-460.tar.gz"
+SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz"
 
 KERNELLOCAL=".mx64.${PKGREVISION}"
 FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}"
@@ -21,10 +20,6 @@ same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.
     && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \
     && exit
 
-mee_patch() {
-    echo "PATCH $@"
-    bee_patch $@
-}
 
 mee_configure() {
     echo "configure $@"
@@ -44,7 +39,7 @@ mee_install() {
     make modules_install  INSTALL_MOD_PATH=${D}
     make install          INSTALL_PATH=${D}/boot
 
-    rm -v ${D}/lib/modules/${FULLKERNELVERSION}/build
+    rm -rf ${D}/lib/modules/${FULLKERNELVERSION}/{source,build}
 
     ln -sv bzImage-${FULLKERNELVERSION} ${D}/boot/mariux.${PKGREVISION}
 }
diff --git a/nvidia_linux-6.1.52-456-510.108.03-0.bee b/nvidia_linux-6.1.52-456-510.108.03-0.bee
diff --git a/nvidia_linux-6.6.11-460-535.104.05-0.bee → nvidia_linux-6.6.35-477-535.104.05-0.bee b/nvidia_linux-6.6.11-460-535.104.05-0.bee → nvidia_linux-6.6.35-477-535.104.05-0.bee
@@ -26,33 +26,17 @@ sourcesubdir_append kernel
 export TAR_OPTIONS=--no-same-owner
 
 mee_extract() {
-    LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2"
-
-    print_info "extracting nvidia archive .."
-
-    start_cmd rmdir ${S}
+    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"
+    if [ ! -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then
+        start_cmd gtar -xf ${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2 -C ${BEE_TMP_TMPDIR}
     fi
-
-    print_info "using kernel sources from ${LINUXSRCDIR} .."
-}
-
-mee_build_pre() {
-    ln -s ${LINUXSRCDIR}/include ${S}/include
+    LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
 }
 
 mee_build() {
-    IGNORE_CC_MISMATCH=1 \
-    make SYSSRC=${LINUXSRCDIR} module
+    make SYSSRC=${LINUXSRCDIR} CC=gcc module
 }
 
 mee_install() {