From b8cda25ad09bdc52c06066ff9cad87399653b265 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 2 Nov 2016 15:13:24 +0100 Subject: [PATCH 1/4] nvidia_linux: Remove 340.96 for obsolete Linux 4.4.14 --- nvidia_linux-4.4.14-90-340.96-0.bee | 88 ----------------------------- 1 file changed, 88 deletions(-) delete mode 100755 nvidia_linux-4.4.14-90-340.96-0.bee diff --git a/nvidia_linux-4.4.14-90-340.96-0.bee b/nvidia_linux-4.4.14-90-340.96-0.bee deleted file mode 100755 index a1efa971c..000000000 --- a/nvidia_linux-4.4.14-90-340.96-0.bee +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/env beesh - -# calculate package extra versions and legacy level -# - use extraversions to define nvidia extraversion and/or legacy level -# - legacy level should be the last part of extraversion -# - legacy level 2 to 5 will be calculated from version number.. - -mxnvversion=${PKGEXTRAVERSION##*_} -: ${mxnvversion=current} - -nvextraversion="${PKGEXTRAVERSION_DASH}" - -if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then - nvextraversion="${nvextraversion%_*}" - nvextraversion="${nvextraversion#-${mxnvversion}}" -else - if [ "${PKGVERSION:0:4}" = "340." ] ; then - mxnvversion="legacy5" - elif [ "${PKGVERSION:0:4}" = "304." ] ; then - mxnvversion="legacy4" - elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then - mxnvversion="legacy3" - elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then - mxnvversion="legacy2" - else - mxnvversion="current" - fi -fi - -print_info "calculated mxnvversion = '${mxnvversion}'" -print_info "calculated nvextraversion = '${nvextraversion}'" - -NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run" - -SRCURL[0]="ftp://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" -#PATCHURL+=('/src/mariux/patches/nvidia-linux-readcr4_writecr4.patch') - -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} - -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() { - start_cmd 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}/${mxnvversion} -} From 328f2bd80ed071af7edbe5b1f606c6cf44f97c98 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 2 Nov 2016 15:13:49 +0100 Subject: [PATCH 2/4] nvidia_linux: Remove 352.79 for Linux 4.4.14 --- nvidia_linux-4.4.14-90-352.79-1.bee | 90 ----------------------------- 1 file changed, 90 deletions(-) delete mode 100755 nvidia_linux-4.4.14-90-352.79-1.bee diff --git a/nvidia_linux-4.4.14-90-352.79-1.bee b/nvidia_linux-4.4.14-90-352.79-1.bee deleted file mode 100755 index a7b207fd4..000000000 --- a/nvidia_linux-4.4.14-90-352.79-1.bee +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/env beesh - -# calculate package extra versions and legacy level -# - use extraversions to define nvidia extraversion and/or legacy level -# - legacy level should be the last part of extraversion -# - legacy level 2 to 5 will be calculated from version number.. - -mxnvversion=${PKGEXTRAVERSION##*_} -: ${mxnvversion=current} - -nvextraversion="${PKGEXTRAVERSION_DASH}" - -if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then - nvextraversion="${nvextraversion%_*}" - nvextraversion="${nvextraversion#-${mxnvversion}}" -else - if [ "${PKGVERSION:0:4}" = "340." ] ; then - mxnvversion="legacy5" - elif [ "${PKGVERSION:0:4}" = "304." ] ; then - mxnvversion="legacy4" - elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then - mxnvversion="legacy3" - elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then - mxnvversion="legacy2" - else - mxnvversion="current" - fi -fi - -print_info "calculated mxnvversion = '${mxnvversion}'" -print_info "calculated nvextraversion = '${nvextraversion}'" - -NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run" - -SRCURL[0]="ftp://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" -#PATCHURL+=('/src/mariux/patches/nvidia-linux-readcr4_writecr4.patch') - -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} - -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() { - start_cmd make SYSSRC=${LINUXSRCDIR} module - ( cd uvm && start_cmd make SYSSRC=${LINUXSRCDIR} module ) -} - -mee_install() { - mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION} - - cp -v nvidia.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/nvidia.ko - cp -v uvm/nvidia-uvm.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/nvidia-uvm.ko - - ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion} -} From d9d28979b5951841a429053d0b1bce4501c939a9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 2 Nov 2016 15:14:04 +0100 Subject: [PATCH 3/4] nvidia_linux: Remove 367.18 for Linux 4.4.14 --- nvidia_linux-4.4.14-90-367.18-0.bee | 88 ----------------------------- 1 file changed, 88 deletions(-) delete mode 100755 nvidia_linux-4.4.14-90-367.18-0.bee diff --git a/nvidia_linux-4.4.14-90-367.18-0.bee b/nvidia_linux-4.4.14-90-367.18-0.bee deleted file mode 100755 index a1efa971c..000000000 --- a/nvidia_linux-4.4.14-90-367.18-0.bee +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/env beesh - -# calculate package extra versions and legacy level -# - use extraversions to define nvidia extraversion and/or legacy level -# - legacy level should be the last part of extraversion -# - legacy level 2 to 5 will be calculated from version number.. - -mxnvversion=${PKGEXTRAVERSION##*_} -: ${mxnvversion=current} - -nvextraversion="${PKGEXTRAVERSION_DASH}" - -if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then - nvextraversion="${nvextraversion%_*}" - nvextraversion="${nvextraversion#-${mxnvversion}}" -else - if [ "${PKGVERSION:0:4}" = "340." ] ; then - mxnvversion="legacy5" - elif [ "${PKGVERSION:0:4}" = "304." ] ; then - mxnvversion="legacy4" - elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then - mxnvversion="legacy3" - elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then - mxnvversion="legacy2" - else - mxnvversion="current" - fi -fi - -print_info "calculated mxnvversion = '${mxnvversion}'" -print_info "calculated nvextraversion = '${nvextraversion}'" - -NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run" - -SRCURL[0]="ftp://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" -#PATCHURL+=('/src/mariux/patches/nvidia-linux-readcr4_writecr4.patch') - -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} - -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() { - start_cmd 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}/${mxnvversion} -} From 0538f373b1d07b6cfc58ccbf907e23dae10570b7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 2 Nov 2016 15:16:34 +0100 Subject: [PATCH 4/4] linux: Remove obsolete version 4.4.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linux 4.4.14 is superseded by Linux 4.4.27, 4.7.10, and Linux 4.8.6. Also, it has the “[Dirty Cow](https://dirtycow.ninja/)” vulnerability. So remove it. ``` $ pssh -i -H "`hostconfig --list mx64`" uname -a | grep "4.4.14" $ ``` --- linux-4.4.14-90.bee | 82 --------------------------------------------- 1 file changed, 82 deletions(-) delete mode 100755 linux-4.4.14-90.bee diff --git a/linux-4.4.14-90.bee b/linux-4.4.14-90.bee deleted file mode 100755 index 0f13fee15..000000000 --- a/linux-4.4.14-90.bee +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/env beesh - -# note: CONFIG=/boot/config-WHATEVER BEE_MAKEFLAGS='-j 40' ./linux-xxx.bee - -KERNELVERSION=${PKGVERSION} -if [ -z "${PKGVERSION[3]}" ] ; then - KERNELVERSION=${KERNELVERSION}.0 -fi - -echo $KERNELVERSION - -SRCURL[0]="http://www.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}.tar.xz" - -# backported to stable # PATCHURL+=(/src/mariux/patches/linux-0001-NFS-Fix-attribute-cache-revalidation.patch) -PATCHURL+=(/src/mariux/patches/linux-0002-NFS-Ensure-we-revalidate-attributes-before-using-exe.patch) -PATCHURL+=(/src/mariux/patches/linux-0003-NFSv4-Don-t-perform-cached-access-checks-before-we-v.patch) -PATCHURL+=(/src/mariux/patches/linux-0001-net-better-skb-sender_cpu-and-skb-napi_id-cohabitati.patch) - -# EXCLUDE="" - -#CONFIG= - -KERNELLOCAL=".mx64.${PKGREVISION}" -FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" - -B=${S} - -mee_patch() { - echo "PATCH $@" - bee_patch $@ -} - -mee_configure() { - echo "configure $@" - if [ -e /proc/config.gz ] ; then - zcat /proc/config.gz >config-current - RUNNING=config-current - else - RUNNING=/boot/config-$(uname -r) - fi - - : ${CONFIG:=${RUNNING}} - - if [ ! -e ${CONFIG} ] ; then - echo "can't find config '${CONFIG}'" - exit 1 - fi - - cp -v ${CONFIG} .config - - LOCALVERSION="\"${KERNELLOCAL}\"" - sed -i -e "s@CONFIG_LOCALVERSION=.*@CONFIG_LOCALVERSION=${LOCALVERSION}@" .config - - echo "doing make -C ${S} olddefconfig in ${PWD} .." - - make olddefconfig - - echo "doing make -C ${S} menuconfig in ${PWD} .." - - make menuconfig -} - -mee_build() { - echo "build $@" - make ${BEE_MAKEFLAGS} -} - -mee_install() { - echo "install $@" - - make modules_install INSTALL_MOD_PATH=${D} - make install INSTALL_PATH=${D}/boot -# make firmware_install INSTALL_MOD_PATH=${D} - - rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} - - ln -sv /usr/src/linux/${PKGALLPKG}/source ${D}/lib/modules/${FULLKERNELVERSION}/source - ln -sv /usr/src/linux/${PKGALLPKG}/build ${D}/lib/modules/${FULLKERNELVERSION}/build - - ln -sv bzImage-${FULLKERNELVERSION} ${D}/boot/mariux.${PKGREVISION} -} -