diff options
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 172 |
1 files changed, 76 insertions, 96 deletions
@@ -1,48 +1,43 @@ # Maintainer: Rob McCathie <korrode at gmail> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Thomas Baechler <thomas@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> pkgbase=linux-netbook -_srcname=linux-3.14 -_bfq=v7r8 -pkgver=3.14.74 +_srcname=linux-4.4 +_bfq=v7r11 +pkgver=4.4.16 pkgrel=1 arch=('i686') url="https://github.com/korrode/linux-netbook" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" - "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" - # the main kernel config files - 'config' +source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" + "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" + # the main kernel config file + "config" # standard config files for mkinitcpio ramdisk - "${pkgbase}.preset" + "$pkgbase.preset" # ARCH patches - 'change-default-console-loglevel.patch' - '0001-Bluetooth-allocate-static-minor-for-vhci.patch' - '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' - '0003-module-remove-MODULE_GENERIC_TABLE.patch' - '0006-genksyms-fix-typeof-handling.patch' + "change-default-console-loglevel.patch" + "0001-sdhci-revert.patch" + "ecryptfs.patch" # BFQ patches - "0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.14.0-${_bfq}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}-3.14.patch" - "0002-block-introduce-the-BFQ-${_bfq}-I-O-sched.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.14.0-${_bfq}/0002-block-introduce-the-BFQ-${_bfq}-I-O-sched-for-3.14.patch" - "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfq}.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.14.0-${_bfq}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfq}-for-3.14.0.patch" + "0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-${_bfq}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}-4.4.0.patch" + "0002-block-introduce-the-BFQ-${_bfq}-I-O-sched.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-${_bfq}/0002-block-introduce-the-BFQ-${_bfq}-I-O-sched-for-4.4.0.patch" + "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfq}.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-${_bfq}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfq}-for.patch" # Graysky's more CPU optimisations patch - "http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+.patch.gz") -sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa' - '4cfd1ae6b0d5d42ca1fde75fd8826618f96873170d4f3d28a7f81e323667bf27' - '127729f9d0d93a8d84ca52c35b9eb8716eb8db9e5cd784e32a384e867ce50f13' + "http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz") +sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' + '7181b6cb3a1611dab9179f57846a3f03bf2705aa3e4cddd9fbd0398bde50d5f9' + '3e480308e381a456370c0a29e5b225319ad213988d4570c048bfe41e25ab4581' 'e794216a8ae80182b506957e313586777a5bbb1ccf0760d904a933c511768127' - 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' - '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' - '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' - '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - 'df7cd35f98869d128198b7161117b3cd40430fd946b620909a310763fc602241' - '125d96763f0357194b4345861df1f829eb7f56447d7b341c766c0eadceb41444' - 'c818a23416125a0f1dcbe9c808607383d3a54d89afe5533aac3aa75adf0fdc78' - 'c6c4a9f77683b95c37636b20c4bc8a1f8214c87feef7fc469e58534fcc32fb4a') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' + 'a2e240ab338f02ebde278131cf5810e9aa3846a8238e3d26dc235eace05ab4e7' + 'd1cf14cc696b0f716454fe8eb9746383700889d5d22ad829611f0433cc77b4ce' + 'b17c3fb18c5b8c20a45a38198f293679ca6aef08d16f12cd816a5cfafac4b2c4' + '69a21bc286a628128cfc4723558829cb6ff6c2d7c4dfd4468457898674187b25' + 'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791') _kernelname=${pkgbase#linux} prepare() { @@ -54,29 +49,26 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # https://bugs.archlinux.org/task/50126 - broken ecryptfs + patch -p1 -i "${srcdir}/ecryptfs.patch" + + # revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9faac7b95ea4f9e83b7a914084cc81ef1632fd91 + # fixes #47778 sdhci broken on some boards + # https://bugzilla.kernel.org/show_bug.cgi?id=106541 + patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - - # Fix vhci warning in kmod (to restore every kernel maintainer's sanity) - patch -p1 -i "${srcdir}/0001-Bluetooth-allocate-static-minor-for-vhci.patch" - - # Fix atkbd aliases - patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch" - patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch" - - # Fix generation of symbol CRCs - # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 - patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" # add BFQ scheduler patch -p1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}.patch" patch -p1 -i "${srcdir}/0002-block-introduce-the-BFQ-${_bfq}-I-O-sched.patch" patch -p1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfq}.patch" - + # Make Atom optimisation work with newer gcc - patch -p1 -i "${srcdir}/enable_additional_cpu_optimizations_for_gcc_v4.9+.patch" + patch -p1 -i "${srcdir}/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch" cat "${srcdir}/config" > ./.config @@ -117,9 +109,8 @@ _package() { [ "${pkgbase}" = "linux" ] && groups=('base') depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=("kernel26${_kernelname}=${pkgver}" "linux-netbook-manjaro") - conflicts=("kernel26${_kernelname}") - replaces=("kernel26${_kernelname}" "linux-netbook-manjaro") + provides=("linux-netbook-manjaro=${pkgver}") + replaces=("linux-netbook-manjaro") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux-netbook.install @@ -145,8 +136,7 @@ _package() { -i "${startdir}/${install}" # install mkinitcpio preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" \ - "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ -e "1s|'linux.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ @@ -158,15 +148,11 @@ _package() { rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware rm -rf "${pkgdir}/lib/firmware" - # 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:--ARCH}" \ - "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_kernelname:--netbook}" "${pkgdir}/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:--ARCH}" - echo "${_kernver}" > \ - "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--netbook}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--netbook}/version" # Now we call depmod... depmod -b "${pkgdir}" -F System.map "${_kernver}" @@ -181,9 +167,8 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" - provides=("kernel26${_kernelname}-headers=${pkgver}" "linux-netbook-manjaro-headers") - conflicts=("kernel26${_kernelname}-headers") - replaces=("kernel26${_kernelname}-headers" "linux-netbook-manjaro-headers") + provides=("linux-netbook-manjaro-headers=${pkgver}") + replaces=("linux-netbook-manjaro-headers") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -219,12 +204,10 @@ _package-headers() { cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" if [ "${CARCH}" = "i686" ]; then - cp arch/${KARCH}/Makefile_32.cpu \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" + cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" fi - cp arch/${KARCH}/kernel/asm-offsets.s \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/" + cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/" # add docbook makefile install -D -m644 Documentation/DocBook/Makefile \ @@ -246,41 +229,33 @@ _package-headers() { # in reference to: # http://bugs.archlinux.org/task/9912 mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core" - cp drivers/media/dvb-core/*.h \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/" + cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/" # and... # http://bugs.archlinux.org/task/11194 mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/" - cp include/config/dvb/*.h \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/" + cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/" # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" - cp drivers/media/dvb-frontends/lgdt330x.h \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" + cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" - cp drivers/media/i2c/msp3400-driver.h \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" + cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" # add dvb headers # in reference to: # http://bugs.archlinux.org/task/20402 mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb" - cp drivers/media/usb/dvb-usb/*.h \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/" + cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/" mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends" - cp drivers/media/dvb-frontends/*.h \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" + cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners" - cp drivers/media/tuners/*.h \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/" + cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/" # add xfs and shmem for aufs building mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs" mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm" - cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h" # copy in Kconfig files for i in $(find . -name "Kconfig*"); do @@ -305,26 +280,31 @@ _package-headers() { # remove unneeded architectures rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + + # remove files already in linux-docs package + rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-01" + rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-02" + rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.select-break" } -_package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" - provides=("kernel26${_kernelname}-docs=${pkgver}" "linux-netbook-manjaro-docs") - conflicts=("kernel26${_kernelname}-docs") - replaces=("kernel26${_kernelname}-docs" "linux-netbook-manjaro-docs") - - cd "${srcdir}/${_srcname}" - - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build" - cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build" - find "${pkgdir}" -type f -exec chmod 444 {} \; - find "${pkgdir}" -type d -exec chmod 755 {} \; - - # remove a file already in linux package - rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile" -} - -pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") +#_package-docs() { +# pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" +# provides=("linux-netbook-manjaro-docs=${pkgver}") +# replaces=("linux-netbook-manjaro-docs") +# +# cd "${srcdir}/${_srcname}" +# +# mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build" +# cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build" +# find "${pkgdir}" -type f -exec chmod 444 {} \; +# find "${pkgdir}" -type d -exec chmod 755 {} \; +# +# # remove a file already in linux package +# rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile" +#} + +#pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") +pkgname=("${pkgbase}" "${pkgbase}-headers") for _p in ${pkgname[@]}; do eval "package_${_p}() { $(declare -f "_package${_p#${pkgbase}}") |