Commit 49839d63 authored by AlmAck's avatar AlmAck
Browse files

linux kernel 4.14.12 group

parent 635f4630
......@@ -4,7 +4,7 @@ source ../linux.conf
pkgname=acpi_call
_pkgname=acpi_call
pkgver=1.1.0
pkgrel=39
pkgrel=40
pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)."
arch=('x86_64')
url=("http://github.com/mkottman/acpi_call")
......
post_install() {
EXTRAMODULES='extramodules-4.13-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo ""
echo "[+] modprobe acpi_call"
......@@ -12,7 +12,7 @@ post_upgrade() {
}
post_remove() {
EXTRAMODULES='extramodules-4.13-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
......
......@@ -3,7 +3,7 @@ source ../linux.conf
pkgname=bbswitch
pkgver=0.8
pkgrel=33
pkgrel=34
pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
arch=('x86_64')
url=("http://github.com/Bumblebee-Project/bbswitch")
......
post_install() {
EXTRAMODULES='extramodules-4.13-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
EXTRAMODULES='extramodules-4.13-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES='extramodules-4.13-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
......@@ -3,7 +3,7 @@ source ../linux.conf
pkgname=broadcom-wl
pkgver=6.30.223.271
pkgrel=15
pkgrel=16
pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
url='http://www.broadcom.com/support/802.11/linux_sta.php'
arch=('x86_64')
......
......@@ -2,11 +2,11 @@
# kernel.
pkgname=btrfs-progs
pkgver=4.13.3
pkgver=4.14
pkgrel=1
pkgdesc='Btrfs filesystem utilities'
arch=('x86_64')
depends=('glibc' 'util-linux' 'e2fsprogs' 'lzo2' 'zlib')
depends=('glibc' 'util-linux' 'e2fsprogs' 'lzo2' 'zlib' 'zstd')
makedepends=('git' 'asciidoc' 'xmlto')
url='http://btrfs.wiki.kernel.org/'
replaces=('btrfs-progs-unstable')
......@@ -18,7 +18,7 @@ source=("https://github.com/kdave/${pkgname}/archive/v${pkgver}.tar.gz"
'initcpio-hook-btrfs'
'btrfs-scrub@.service'
'btrfs-scrub@.timer')
md5sums=('23e15c3ccbe3ad222ce9fe3219142079'
md5sums=('659ded4acf24196013fdbcb679ce55e7'
'7241ba3a4286d08da0d50b7176941112'
'b09688a915a0ec8f40e2f5aacbabc9ad'
'794b867e09451284c545bae112aa0cfd'
......
......@@ -13,9 +13,9 @@ source=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.xz
http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.sign
http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz
http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign)
sha256sums=('2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c'
sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'SKIP'
'f5fb017ee531dc35e3462ccb2d244d4fdc8ac6df9cd3337aa6df2ffc280b1bd6'
'da5d8db44b0988e4c45346899d3f5a51f8bd6c25f14e729615ca9ff9f17bdefd'
'SKIP')
validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman
......
......@@ -6,7 +6,7 @@ pkgbase=linux-tools
pkgname=('cgroup_event_listener' 'cpupower' 'libtraceevent' 'perf'
'tmon' 'turbostat' 'usbip' 'x86_energy_perf_policy')
pkgver=${_kernelver}
pkgrel=2
pkgrel=1
license=('GPL2')
arch=('x86_64')
url='http://www.kernel.org'
......@@ -29,7 +29,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/linux-${pkgver}.tar.xz"
'cpupower.systemd'
'cpupower.service'
'usbipd.service')
sha256sums=('f470d75f1f5a375f6882958daf96e7f8552fff28702b70abf3744e1711ef5ac9'
sha256sums=('6608f7d480efc5c1078888e9344f4e0b0cd9bef0b6541cbdaec7d138e03856af'
'4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
......
......@@ -6,8 +6,8 @@
# These are the "basic variables" appliable for the normal kernel group
_kernelname="-CHAKRA"
_kernelver=4.13.11
_basekernel=4.13
_kernelver=4.14.12
_basekernel=4.14
_extramodules=extramodules-${_basekernel}${_kernelname}
_kver="$(cat /lib/modules/${_extramodules}/version)"
......
......@@ -17,11 +17,11 @@ source=(http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign}
config.x86_64
# standard config files for mkinitcpio ramdisk
linux.preset)
sha256sums=('2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c'
sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'SKIP'
'f5fb017ee531dc35e3462ccb2d244d4fdc8ac6df9cd3337aa6df2ffc280b1bd6'
'da5d8db44b0988e4c45346899d3f5a51f8bd6c25f14e729615ca9ff9f17bdefd'
'SKIP'
'278bc8386218213441080b10a932e8ac3157fd8f198d931977aee2e1c9e6e37b'
'1a3c7879bda6eadff088c75071ff344ffa682fd240a6cdfd9b14ab654c8a157d'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
......@@ -35,7 +35,10 @@ prepare() {
msg "adding upstream patch"
patch -p1 -i "${srcdir}/patch-${pkgver}"
msg "patch"
chmod +x scripts/checkpatch.pl
chmod +x tools/objtool/sync-check.sh
# security patches
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
......@@ -72,7 +75,7 @@ prepare() {
build() {
cd "$_srcname"
# build!
make ${MAKEFLAGS} LOCALVERSION= bzImage modules
}
......@@ -81,24 +84,19 @@ package_linux() {
groups=('base')
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country')
provides=('nouveau-drm' 'acerhk=0.5.35' 'aufs3')
conflicts=('nvidia-96xx=96.43.20-9' 'acerhk' 'tiacx')
replaces=('nouveau-drm' 'aufs3')
backup=("etc/mkinitcpio.d/${pkgname}.preset")
install=linux.install
cd ${_srcname}
KARCH=x86
# get kernel version
_kernver="$(make LOCALVERSION= kernelrelease)"
_basekernel=${_kernver%%-*}
_basekernel=${_basekernel%.*}
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}"
mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}"
# set correct depmod command for install
cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
......@@ -118,27 +116,22 @@ package_linux() {
-i "${pkgdir}/etc/mkinitcpio.d/linux${_kernelname}.preset"
# remove build and source links
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
# remove the firmware
# we'll get it from the linux-firmware package and we don't want conflicts
rm -rf "${pkgdir}/lib/firmware"
rm -f "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build}
# gzip -9 all modules to save 100MB of space
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
# make room for external modules
ln -s "../extramodules-${_basekernel}${_kernelname:--CHAKRA}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
ln -s "../extramodules-${_basekernel}${_kernelname:--CHAKRA}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
# add real version for building modules and running depmod from post_install/upgrade
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA}/version"
# Now we call depmod...
depmod -b "$pkgdir" -F System.map "$_kernver"
mkdir -p "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA}"
echo "${_kernver}" > "${pkgdir}/usr/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA}/version"
# move module tree /lib -> /usr/lib
mkdir -p "${pkgdir}/usr"
mv "${pkgdir}/lib" "${pkgdir}/usr/"
# now we call depmod...
depmod -b "${pkgdir}/usr" -F System.map "${_kernver}"
# add vmlinux
install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux"
install -Dt "${pkgdir}/usr/lib/modules/${_kernver}/build" -m644 vmlinux
}
package_linux-headers() {
......@@ -154,10 +147,10 @@ package_linux-headers() {
cp -t "${_builddir}" -a include scripts
install -Dt "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile
install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s
install -Dt "${_builddir}/arch/x86" -m644 arch/x86/Makefile
install -Dt "${_builddir}/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
cp -t "${_builddir}/arch/${KARCH}" -a arch/${KARCH}/include
cp -t "${_builddir}/arch/x86" -a arch/x86/include
install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h
install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h
......@@ -181,14 +174,12 @@ package_linux-headers() {
find . -name Kconfig\* -exec install -Dm644 {} "${_builddir}/{}" \;
# add objtool for external module building and enabled VALIDATION_STACK option
if [[ -e tools/objtool/objtool ]]; then
install -Dt "${_builddir}/tools/objtool" tools/objtool/objtool
fi
install -Dt "${_builddir}/tools/objtool" tools/objtool/objtool
# remove unneeded architectures
local _arch
for _arch in "${_builddir}"/arch/*/; do
if [[ ${_arch} != */${KARCH}/ ]]; then
if [[ ${_arch} != */x86/ ]]; then
rm -r "${_arch}"
fi
done
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-CHAKRA
KERNEL_VERSION=4.12.1-2-CHAKRA
KERNEL_VERSION=4.14.12-1-CHAKRA
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
......
......@@ -3,7 +3,7 @@ source ../linux.conf
pkgname=ndiswrapper
pkgver=1.61
pkgrel=5
pkgrel=6
pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
license=('GPL')
arch=('x86_64')
......
......@@ -5,7 +5,7 @@ post_install()
post_upgrade()
{
EXTRAMODULES='extramodules-4.12-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
......
......@@ -5,7 +5,7 @@ pkgbase=nvidia-304xx-utils
pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
# Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx
pkgver=304.137
pkgrel=1
pkgrel=2
arch=('x86_64')
url="http://www.nvidia.com/"
license=('custom')
......
......@@ -4,16 +4,18 @@ source ../linux.conf
pkgbase=nvidia-304xx
pkgname=('nvidia-304xx' 'chd-nvidia-304xx' 'nvidia-304xx-dkms')
pkgver=304.137
pkgrel=1
pkgrel=2
arch=('x86_64')
url="http://www.nvidia.com/"
makedepends=("linux-headers=${_kernelver}")
license=('custom')
_pkg="NVIDIA-Linux-${arch}-${pkgver}-no-compat32"
source=("https://chakralinux.org/code/chakra-hardware-detection.git/plain/hwdb/nvidia_supported"
"http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
source=("https://code.chakralinux.org/tools/chakra-hardware-detection/raw/master/hwdb/nvidia_supported"
"http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
'kernel-4.14.patch')
md5sums=('62d0cdb856cfae64753c0f3acf729d47'
'485506ee6a7c54780488dacddf1d56b1')
'485506ee6a7c54780488dacddf1d56b1'
'cf9259b845e53903586c29a27de29ddb')
prepare() {
cd "${srcdir}"
......@@ -22,6 +24,8 @@ prepare() {
cd "${_pkg}"
# patches here
patch -Np1 --no-backup-if-mismatch < "${srcdir}/kernel-4.14.patch"
cp -a kernel kernel-dkms
}
......
diff -u -r NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c
--- NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c 2017-09-15 01:16:51.000000000 +0200
+++ NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c 2017-11-19 00:51:45.006654148 +0100
@@ -173,8 +173,12 @@
{
int ret = 0;
#if defined(NV_DRM_AVAILABLE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
+#else
ret = drm_pci_init(&nv_drm_driver, pci_driver);
#endif
+#endif
return ret;
}
@@ -183,8 +187,12 @@
)
{
#if defined(NV_DRM_AVAILABLE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
+#else
drm_pci_exit(&nv_drm_driver, pci_driver);
#endif
+#endif
}
RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
post_install() {
EXTRAMODULES='extramodules-4.13-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
EXTRAMODULES='extramodules-4.13-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
EXTRAMODULES='extramodules-4.13-CHAKRA'
EXTRAMODULES='extramodules-4.14-CHAKRA'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment