diff --git a/PKGBUILD b/PKGBUILD index 3bc747e8f79a690b1bc1e187cf49b6b8f2bba283..65b8aef4a7ddae6e4b522755c856827ebf8eaf06 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,9 @@ # Customized version of linux for seblu computers pkgname=linux-seblu -pkgver=4.11 +pkgver=4.11.3 +#_repourl='git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' +_repourl='git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git' pkgrel=1 pkgdesc='The Linux Kernel cooked by Seblu' arch=('x86_64') @@ -12,12 +14,13 @@ options=('!strip') makedepends=('kmod' 'git' 'make' 'gcc' 'bc' 'sed') depends=('linux-firmware' 'kernel-install-hook') install=linux-seblu.install -source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v${pkgver/_/-}" +_reponame=${_repourl##*/} +source=("$_repourl#tag=v${pkgver/_/-}" "config.$CARCH") md5sums=('SKIP' 'SKIP') prepare() { - cd linux + cd ${_reponame%.git} # apply patches for _f in "${source[@]}"; do @@ -48,7 +51,7 @@ prepare() { } build() { - cd linux + cd ${_reponame%.git} msg2 'Make prepare' make prepare @@ -61,7 +64,8 @@ build() { } package() { - cd linux + cd ${_reponame%.git} + # get real compiled kernel version kernrel=$(make kernelrelease) pkgdesc+=", version $kernrel" @@ -102,7 +106,7 @@ install_sources() { ln -rs "$kernsrc" "$pkgdir/usr/lib/modules/$kernrel"/build # Copy kernel config files - cd "$srcdir"/linux + cd "$srcdir/${_reponame%.git}" install -D -m644 Makefile "$kernsrc/Makefile" install -D -m644 kernel/Makefile "$kernsrc/kernel/Makefile" install -D -m644 .config "$kernsrc/.config" diff --git a/config.x86_64 b/config.x86_64 index 4b653d068db9759d7c5e2a8511dc039705216335..0d63c74fab0cd4b7230f99836d8bac7980916bd4 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -280,10 +280,7 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_GCC_PLUGINS=y -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -CONFIG_GCC_PLUGIN_STRUCTLEAK=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set +# CONFIG_GCC_PLUGINS is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set