diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template index a75cd56b0d..f8003c79ad 100644 --- a/srcpkgs/linux5.11/template +++ b/srcpkgs/linux5.11/template @@ -1,6 +1,6 @@ # Template file for 'linux5.11' pkgname=linux5.11 -version=5.11.11 +version=5.11.12 revision=1 wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -10,7 +10,7 @@ homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4 - e5e0f6b2e0137e6a8afcfea7aca1c3f1ac1b5c72debcc79f3cb4ddd84df3f199" + ec443b0e6c9c10d94dc25b1662245d6421f75e223e7ea6de51e4f2c465b08164" skip_extraction="patch-${version}.xz" python_version=3 patch_args="-Np1" @@ -52,9 +52,6 @@ export KBUILD_BUILD_HOST=voidlinux if [ "$CROSS_BUILD" ]; then _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" fi -if [ "${_patchver}" ]; then - _version="EXTRAVERSION=${_patchver}" -fi pre_patch() { xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1 @@ -85,13 +82,6 @@ do_configure() { msg_normal "Detected a .config file for your arch, using it.\n" cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config make ${makejobs} ARCH=$arch ${_cross} oldconfig - elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then - msg_normal "Detected a .config file for your cpu family, using it.\n" - cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config - make ${makejobs} ARCH=$arch ${_cross} oldconfig - else - msg_normal "Defaulting to 'allmodconfig'.\n" - make ${makejobs} ARCH=$arch ${_cross} allmodconfig fi # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config @@ -109,8 +99,8 @@ do_build() { mips*) _args="uImage modules dtbs"; arch=mips;; esac export LDFLAGS= - make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare - make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args} + make ARCH=$arch ${_cross} ${makejobs} prepare + make ARCH=$arch ${_cross} ${makejobs} ${_args} } do_install() { @@ -125,7 +115,7 @@ do_install() { mips*) arch=mips;; esac - # Run depmod after compressing modules. + # Run depmod after compressing modules - makes depmod.sh a noop sed -i '2iexit 0' scripts/depmod.sh # Install kernel, firmware and modules