From fd3370433d450193eba456b3423330d9d4e28c48 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 6 Sep 2016 17:57:20 +0200 Subject: [PATCH 1/4] linux: Add release candidate version 4.8-rc5 Announcement [1]: > So rc5 is noticeably bigger than rc4 was, and my hope last week that > we were starting to calm down and shrink the releases seems to have > been premature. > > That said, most of the diffstat looks fairly flat (which tends to > imply lots of small trivial changes rather than big invasive ones). > There's some stuff going on in the mellanox mlx5 network driver, and > there is some nfs and overlayfs noise, but on the whole it just looks > like a lot of small fixes. It may be _more_ of those small fixes than > I'd prefer at this stage, but I suspect what happened was that rc4 > looked so nice and small simply because some of the fixes ended up > being delayed until rc5. > > Not that any of this looks worrisome per se, but if things don't start > calming down from now, this may be one of those releases that will > need an rc8. We'll see. > > [ That said, looking at the stats of the individual commits, it all > looks pretty small and simple - there's just more of them than I would > have wished for ] > > The shortlog is appended for those who want to get a feel for the > kinds of details that happened. > > Linus [1] https://lkml.org/lkml/2016/9/4/212 --- linux-4.8_rc5-101.bee | 79 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 linux-4.8_rc5-101.bee diff --git a/linux-4.8_rc5-101.bee b/linux-4.8_rc5-101.bee new file mode 100755 index 000000000..889f80ce5 --- /dev/null +++ b/linux-4.8_rc5-101.bee @@ -0,0 +1,79 @@ +#!/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/testing/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} +} From 7b358c4edb6d944202ad336433a024a80d97d19c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 6 Sep 2016 18:36:04 +0200 Subject: [PATCH 2/4] nvidia_linux: Build 367.44 for Linux 4.8-rc5 --- nvidia_linux-4.8_rc5-101-367.44-0.bee | 89 +++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100755 nvidia_linux-4.8_rc5-101-367.44-0.bee diff --git a/nvidia_linux-4.8_rc5-101-367.44-0.bee b/nvidia_linux-4.8_rc5-101-367.44-0.bee new file mode 100755 index 000000000..20c10e34c --- /dev/null +++ b/nvidia_linux-4.8_rc5-101-367.44-0.bee @@ -0,0 +1,89 @@ +#!/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/0003-kernel-Adapt-source-for-Linux-4.8.patch') + +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]}.0${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 22c8941eab4ad38bdd329c733fd936880288bf68 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 07:01:02 +0200 Subject: [PATCH 3/4] nvidia_linux: Remove 367.44 for Linux 4.8-rc4 --- nvidia_linux-4.8_rc4-100-367.44-0.bee | 89 --------------------------- 1 file changed, 89 deletions(-) delete mode 100755 nvidia_linux-4.8_rc4-100-367.44-0.bee diff --git a/nvidia_linux-4.8_rc4-100-367.44-0.bee b/nvidia_linux-4.8_rc4-100-367.44-0.bee deleted file mode 100755 index 20c10e34c..000000000 --- a/nvidia_linux-4.8_rc4-100-367.44-0.bee +++ /dev/null @@ -1,89 +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/0003-kernel-Adapt-source-for-Linux-4.8.patch') - -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]}.0${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 df063f8fe20065866132c4cf6c6873f985e2d28d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 07:01:34 +0200 Subject: [PATCH 4/4] linux: Remove version 4.8-rc4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release candidate version isn’t used anymore, and superseded by Linux 4.8-rc5. ``` $ pssh -i -H "`hostconfig --list mx64`" uname -a | grep "4.8.0-rc4" $ ``` --- linux-4.8_rc4-100.bee | 79 ------------------------------------------- 1 file changed, 79 deletions(-) delete mode 100755 linux-4.8_rc4-100.bee diff --git a/linux-4.8_rc4-100.bee b/linux-4.8_rc4-100.bee deleted file mode 100755 index 889f80ce5..000000000 --- a/linux-4.8_rc4-100.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/testing/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} -}