From f31c6b66231ac679fe30200051f4bd6b2b7b78e1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 8 Sep 2017 16:06:14 +0200 Subject: [PATCH 1/2] linux: Add LTS version 4.9.48 We are going to backport two patches so update to the latest release first. --- linux-4.9.48-171.bee | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100755 linux-4.9.48-171.bee diff --git a/linux-4.9.48-171.bee b/linux-4.9.48-171.bee new file mode 100755 index 000000000..d4b8ad81f --- /dev/null +++ b/linux-4.9.48-171.bee @@ -0,0 +1,81 @@ +#!/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" + +PATCHURL+=(/src/mariux/patches/0001-iomap-fix-integer-truncation-issues-in-the-zeroing-a.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} +} From d272a51841fd60eede98c636fec9ff4282444cc1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 8 Sep 2017 16:12:14 +0200 Subject: [PATCH 2/2] linux: Add backported patches from mainline We have a problem witch accumulating "NFSv4 callback" threads. https://bugzilla.redhat.com/show_bug.cgi?id=1427493 There are patches available in the mainline: https://www.spinics.net/lists/linux-nfs/msg63334.html https://www.spinics.net/lists/linux-nfs/msg63335.html https://www.spinics.net/lists/linux-nfs/msg63336.html Apply these patches. --- linux-4.9.48-171.bee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-4.9.48-171.bee b/linux-4.9.48-171.bee index d4b8ad81f..0d14f9df8 100755 --- a/linux-4.9.48-171.bee +++ b/linux-4.9.48-171.bee @@ -15,6 +15,8 @@ echo $KERNELVERSION SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}${PKGEXTRAVERSION_DASH}.tar.xz" PATCHURL+=(/src/mariux/patches/0001-iomap-fix-integer-truncation-issues-in-the-zeroing-a.patch) +PATCHURL+=(/src/mariux/patches/linux-0001-SUNRPC-Refactor-svc_set_num_threads.patch) +PATCHURL+=(/src/mariux/patches/linux-0002-NFSv4-Fix-callback-server-shutdown.patch) # EXCLUDE=""