From 223092b3e2b4a5f766ac42e7e0d6048667de8767 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 1 Jun 2017 18:17:18 +0200 Subject: [PATCH 1/3] nvidia_linux: Remove 367.57 for obsolete Linux 4.8.11 --- nvidia_linux-4.8.11-125-367.57-0.bee | 88 ---------------------------- 1 file changed, 88 deletions(-) delete mode 100755 nvidia_linux-4.8.11-125-367.57-0.bee diff --git a/nvidia_linux-4.8.11-125-367.57-0.bee b/nvidia_linux-4.8.11-125-367.57-0.bee deleted file mode 100755 index 6bd106763..000000000 --- a/nvidia_linux-4.8.11-125-367.57-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}" - -LINUXPKG=${PKGEXTRANAME}.${ARCH} - -LINUXKLOCALVER=$(beeversion --format "%v%-e.mx64.%r" "${LINUXPKG}") - -# '4.4.mx64.75' to '4.4.0.mx64.75' -# '4.8-rc2.mx64.95' to '4.8.0-rc2.mx64.95' -if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(-?.*)(\.mx64.*) ]]; then - LINUXKLOCALVER="${BASH_REMATCH[1]}${BASH_REMATCH[2]}${BASH_REMATCH[3]}" -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 88697042d73710d45e2ffb5c8409cb1dccb7d306 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 1 Jun 2017 18:16:56 +0200 Subject: [PATCH 2/3] nvidia_linux: Remove 340.98 for obsolete Linux 4.8.11 --- nvidia_linux-4.8.11-125-340.98-0.bee | 88 ---------------------------- 1 file changed, 88 deletions(-) delete mode 100755 nvidia_linux-4.8.11-125-340.98-0.bee diff --git a/nvidia_linux-4.8.11-125-340.98-0.bee b/nvidia_linux-4.8.11-125-340.98-0.bee deleted file mode 100755 index 6bd106763..000000000 --- a/nvidia_linux-4.8.11-125-340.98-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}" - -LINUXPKG=${PKGEXTRANAME}.${ARCH} - -LINUXKLOCALVER=$(beeversion --format "%v%-e.mx64.%r" "${LINUXPKG}") - -# '4.4.mx64.75' to '4.4.0.mx64.75' -# '4.8-rc2.mx64.95' to '4.8.0-rc2.mx64.95' -if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(-?.*)(\.mx64.*) ]]; then - LINUXKLOCALVER="${BASH_REMATCH[1]}${BASH_REMATCH[2]}${BASH_REMATCH[3]}" -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 6120cbdf4fd07cbd0fc9997bd410b8453fb3b8ed Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 1 Jun 2017 18:17:49 +0200 Subject: [PATCH 3/3] linux: Remove obsolete version 4.8.11 The 4.8 Linux kernel series reached end of life (EOL), and is superseded by the stable version 4.9, and the current version is 4.11. No system uses this Linux kernel version anymore. So remove it. --- linux-4.8.11-125.bee | 79 -------------------------------------------- 1 file changed, 79 deletions(-) delete mode 100755 linux-4.8.11-125.bee diff --git a/linux-4.8.11-125.bee b/linux-4.8.11-125.bee deleted file mode 100755 index fc68c0aaa..000000000 --- a/linux-4.8.11-125.bee +++ /dev/null @@ -1,79 +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 - -# append extra version to get for example 4.8.0-rc4 -KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH} - -echo $KERNELVERSION - -SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}${PKGEXTRAVERSION_DASH}.tar.xz" - -# 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} -}