linux 4.8.6 use the linux.conf global file, minor changes to the kernel configurations, ndiswrapper 1.61

linux.conf

@@ -5,11 +5,12 @@
 #
 # These are the "basic variables" appliable for the normal kernel group
 
-_basekernel=4.8
+_kernelname="-CHAKRA"
 _kernelver=4.8.6
-_extramodules=extramodules-${_basekernel}-CHAKRA
-_kver="$(cat /lib/modules/${_extramodules}/version)"
+_basekernel=4.8
 
+_extramodules=extramodules-${_basekernel}${_kernelname}
+_kver="$(cat /lib/modules/${_extramodules}/version)"
 
 # Fetch from ndiswrapper-lts/PKGBUILD
 _rootOfSourceTree=/usr/lib/modules/${_kver}/build/

linux/PKGBUILD

@@ -1,7 +1,10 @@
+# Source global configuration
+source ../linux.conf
+
 pkgbase=linux
 pkgname=('linux' 'linux-headers' 'linux-docs')
-_srcname=linux-4.8
-pkgver=4.8.6
+_srcname=linux-${_basekernel}
+pkgver=${_kernelver}
 pkgrel=1
 arch=('x86_64')
 url="http://www.kernel.org/"
@@ -114,13 +117,13 @@ package_linux() {
     -i "${startdir}/${install}"
 
   # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/linux.preset"
+  install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/linux${_kernelname}.preset"
   sed \
     -e "1s|'linux.*'|'${pkgname}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|" \
-    -i "${pkgdir}/etc/mkinitcpio.d/linux.preset"
+    -i "${pkgdir}/etc/mkinitcpio.d/linux${_kernelname}.preset"
 
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}

linux/config.x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.8.4-1 Kernel Configuration
+# Linux/x86 4.8.6-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -54,7 +54,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-CHAKRA"
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -109,7 +109,6 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
-# CONFIG_NO_HZ is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 
@@ -6466,7 +6465,6 @@ CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
 CONFIG_FWTTY_MAX_CARD_PORTS=32
-# CONFIG_MTD_SPINAND_MT29F is not set
 CONFIG_LNET=m
 CONFIG_LNET_MAX_PAYLOAD=1048576
 CONFIG_LNET_SELFTEST=m
@@ -7033,7 +7031,8 @@ CONFIG_EXT4_FS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y 
+CONFIG_EXT4_ENCRYPTION=y
+CONFIG_EXT4_FS_ENCRYPTION=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
@@ -7830,6 +7829,7 @@ CONFIG_PKCS7_MESSAGE_PARSER=m
 #
 # Certificates for signature checking
 #
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
@@ -7915,9 +7915,6 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -7941,7 +7938,7 @@ CONFIG_CLZ_TAB=y
 CONFIG_CORDIC=m
 CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
+CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
 CONFIG_UCS2_STRING=y
 CONFIG_FONT_SUPPORT=y

ndiswrapper/PKGBUILD

@@ -2,9 +2,8 @@
 source ../linux.conf
 
 pkgname=ndiswrapper
-_commit=d3ffd3008d4e0d696b0efad2d079b2339dfd9178
-pkgver=1.60
-pkgrel=6
+pkgver=1.61
+pkgrel=1
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
 license=('GPL')
 arch=('x86_64')
@@ -16,27 +15,27 @@ provides=("ndiswrapper-utils=$pkgver")
 replaces=('ndiswrapper-utils')
 conflicts=('ndiswrapper-utils')
 makedepends=('linux-headers')
-source=("git+https://github.com/pgiri/ndiswrapper.git#commit=$_commit")
-sha1sums=('SKIP')
+source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz")
+sha1sums=('213854ca8a83f9b5972db8fa873d346124e4bcb5')
 
 prepare() {
   [ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false
   msg "Found kernel version: $_kver"
 
-  cd "$srcdir/$pkgname/$pkgname"
+  cd "$srcdir/$pkgname-$pkgver"
 
   sed -i -e 's|strnicmp|strncasecmp|' driver/ndis.c
   sed -i "/modinfo/s/s/usr\//" driver/Makefile
 }
 
 build() {
-  cd "$srcdir/$pkgname/$pkgname"
+  cd "$srcdir/$pkgname-$pkgver"
   make -C driver KVERS_UNAME=${_kver}
   make -C utils
 }
 
 package() {
-  cd "$srcdir/$pkgname/$pkgname"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make sbindir=usr/sbin usrsbindir=usr/bin KBUILD=${_rootOfSourceTree} INST_DIR="usr/lib/modules/$_extramodules" \
         KVERS=$_kver DESTDIR="$pkgdir/" install