From 99f92fd0455f4d201b40ea7351e7dea979887661 Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 18 Mar 2018 20:07:16 -0300 Subject: upgpkg: libre/linux-libre-hardened 4.15.10_gnu.a-1 --- libre/linux-libre-hardened/PKGBUILD | 307 +++++++++++++++++++++++++----------- 1 file changed, 215 insertions(+), 92 deletions(-) (limited to 'libre/linux-libre-hardened/PKGBUILD') diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD index 1c1fa1dc1..14c282d78 100644 --- a/libre/linux-libre-hardened/PKGBUILD +++ b/libre/linux-libre-hardened/PKGBUILD @@ -1,7 +1,3 @@ -# Maintainer (Arch): Levente Polyak -# Contributor (Arch): Daniel Micay -# Contributor (Arch): Tobias Powalowski -# Contributor (Arch): Thomas Baechler # Maintainer: David P. # Contributor: André Silva # Contributor: Márcio Silva @@ -12,97 +8,182 @@ # Contributor: Luke R. # Contributor: Andreas Grapentin -# parabola changes and rationale (based on community/linux-hardened): -# - changed source url to linux-libre +# Based on linux package +# NOTE: Not based on linux-hardened due to its low quality pkgbase=linux-libre-hardened -_srcname=linux-4.15 -_pkgver=4.15.2_gnu -pkgver=${_pkgver}.a +_pkgbasever=4.15-gnu +_pkgver=4.15.10-gnu +_hardenedver=a + +_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname +_replacesoldkernels=() # '%' gets replaced with _kernelname +_replacesoldmodules=() # '%' gets replaced with _kernelname + +_srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} +pkgver=${_pkgver//-/_}.${_hardenedver} pkgrel=1 -url='https://jxself.org/git/?p=linux-libre-hardened.git' -arch=('x86_64' 'i686') +rcnrel=armv7-x1 +arch=('i686' 'x86_64' 'armv7h') +url="https://jxself.org/git/?p=linux-libre-hardened.git" license=('GPL2') makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf') +makedepends_armv7h=('git') options=('!strip') -source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver%.*}-gnu/linux-libre-${_pkgver%.*}-gnu.tar.xz - https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver%.*}-gnu/linux-libre-${_pkgver%.*}-gnu.tar.xz.sign - https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver//_/-}/patch-${_pkgver%.*}-gnu-${_pkgver//_/-}.xz - https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver//_/-}/patch-${_pkgver%.*}-gnu-${_pkgver//_/-}.xz.sign - https://github.com/thestinger/${pkgbase//-libre/}/releases/download/${pkgver//_gnu/}/${pkgbase//-libre/}-${pkgver//_gnu/}.patch{,.sig} - config.x86_64 config.i686 # the main kernel config files - 60-linux.hook # pacman hook for depmod - 90-linux.hook # pacman hook for initramfs regeneration - linux.preset # standard config files for mkinitcpio ramdisk - - # https://bugs.archlinux.org/task/56711 - drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch - https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm{,.sig} - https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm{,.sig} - https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm{,.sig} +source=( + "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign} + "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"{,.sign} + "https://github.com/copperhead/linux-hardened/releases/download/${_pkgver%-*}.${_hardenedver}/linux-hardened-${_pkgver%-*}.${_hardenedver}.patch"{,.sig} + "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"{,.sig} + "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig} + "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig} + # the main kernel config files + 'config.i686' 'config.x86_64' 'config.armv7h' + # pacman hooks for depmod and initramfs regeneration + '60-linux.hook' '90-linux.hook' + # standard config files for mkinitcpio ramdisk + 'linux.preset' + # armv7h patches + "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig} + '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' + '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' + '0003-SMILE-Plug-device-tree-file.patch' + '0004-fix-mvsdio-eMMC-timing.patch' + '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch' + '0006-set-default-cubietruck-led-triggers.patch' + '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' + '0008-disable-USB3-port-on-ODROID-XU.patch' + '0009-ARM-dove-enable-ethernet-on-D3Plug.patch' + '0010-power-add-power-sequence-library.patch' + '0011-usb-core-add-power-sequence-handling-for-USB-devices.patch' + '0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch' + '0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch' + '0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch' + # other patches + '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' + '0002-fix-Atmel-maXTouch-touchscreen-support.patch' + 'drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch' +) +validpgpkeys=( + '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva + '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay + '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. ) -sha256sums=('e6556514286f9cd6b46f5d5769b2cc3c61ac7d6fa9c9c400e3c2fb5949490186' +sha512sums=('a55cc663c6fb1e1cfa7905282b368b5d5888bc2398f0acf37e5bb9a232ded04fd566b1980e654da26aaec005332e458581495184d6bd4cec669181085d4d78a5' 'SKIP' - '81ec59f4d123f7b8bb358c765b4cae32979c6859816641f4830e6c87dc974875' + '74d7cb1a74a4020e71646da8853287b062562c8a8c965a6e4b4e6a8c5a5c43711c6a74359634cf119821f4f6caef4caf8e1647ff82cce3eb4b189d918956ff68' 'SKIP' - 'c8a0c7fc3ef0ea4d7fe6f786b9987952e62c6bce7e3b20002358848c2117cfd9' + '60dd173dac918586f5801310d80cdd6f465f4cc13fc8a37940448abfd06e13ca26fafdf6c2292165ac66750f49e8443a5bf499cb51d863e17939658e467401a3' 'SKIP' - '01b079383cac8c28c081f1bd6ab928559b431194784fb60662c204d22e0ac061' - 'e7758db2c565738fd9931f814b3b206cfbadcb90063ef7185cc0647f307adb6f' - 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' - '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' - 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - 'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148' - 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' + '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' - '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' + '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' - 'SKIP') -validpgpkeys=( - '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. - '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay - ) + '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' + 'SKIP' + '3faa1da097e775a927660f9fe2c12cb3da2c365ad70233047cd8a8df0df93beafa5a5af16b397048394ec563c152dd77f75e0fe8b39133336bbfae0784af8f35' + '0f24f0236b6e1aa6261dc9a71ca63ed62691b2a87155573ffe51724be886f75c3be4a8eac63763ebb1f00bf1ad77a0601ed04987cb84c1a48d482e241b6a5399' + '2f2d1e978a18947c618b92ca89b37ef5f02a1a827d35ecece5a323d2c1b6f65f8b184a2bf482f0262f359db034eb70024d967cae31954a1b0fda42c64d60d975' + '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' + '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' + '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' + 'b2d123b84b33dbdaea28c3ea4517f962f3b1ec9b5318ebf33a3a10138a421641d25762a859d588b2ccb05f17804b3dad3e2e16ad5cfcd6dc77bbfe81d1ef642a' + 'SKIP' + 'ba44aa1252aa1b172e0bc8bbbff864ff60cad6739b2aed2f6a2402848aa65cdb8a8ca6bb9341569b089d60dfd83c3bdd744b5810061ac76b19f0d337afe4cc8d' + '738bc2874351d9e1b94319e6caf615b49753155c99dc9318a1ce9eced50f87627a7331762951f55e2bea8abdb97b80a617a08f3f0bc735e56ff831a8bbb19816' + 'f45d8d417eb3f4b6e02e337480bd99a8ebb4b9ac004c53a5432255e5841578fb64530663b6eacb3c8f40aaade8e1dc1e584aa1cf4b560103119e4b32e19b66c3' + '25ee5d9859d3df2d054fd6d53fe6b8931d6ac9f85533c54f3dd926fce917c81bd96cb3858189a20cf28a32b43efd1566cb5513f7db18a0bb8ead1a4e8a7be6fc' + 'a1aa8272760da0c8d2772cc8a57d8600f08db176206afd2a155055d2969bf0295f342a156841964a07de53fbf0356385b604ad75e5556569872dfad1863b2c27' + 'b58efc374344d10290371f3dfe8a124f855015d3ce169ccf538e6c1476092abf7ac689f0f10fb6a191fa19545b49ce13957ada066b37415f37dd5989ff93db37' + 'd2326e2e3ef6f2f5e911e6ad2fc3ac33b6f53fc5bb03e61d0e8371e6c7199028b226356926472ba676ca68a6cc57d33856c662615ed5b52566570670d0f96c89' + 'bc47549f2a79a79659d4d53f739e091c1e8f54cef8c1776be2034675cbb43f584a128607b1d4dd6a9f465706bb1470c6cb4277877dd3218e7280f503babf8300' + 'd90f3a3b74d65b84c4c2c229d10d2bb854e39e3429ba1469f8bb286819d559c68e00302de2be5043cf274b39a58686dc822c60afe1c553c4c967ef168d98af05' + '0c1a4334fcb4e75d25ec43873275b2f8a599a096b05a51ef2f9d48f3c8425a153f5f0df775e030e61b792f8b34e9c848229028fb6d2411f85028441826951dd5' + '0ccccf4411df6b86486b14e9354bf48355a2dc5bfefce693c5afc1a340db6f9db525a0306897ccbb5ed80304fa38ef13f32355cfeee1c9b684db0a9c0063d5c1' + '1a491eab1b07e9fb0b8a8dba4ef17d658c85106e7f62f3a37c34513aa9cd50b4bbb273aa445380f2e2135adea68c7102718e71bf2c9f4d3a5c24515620606605' + '9ae97a7f29323542d70576e8800e2090a69a43caee3182a453e80c3c3265d6cc04e2b5701e5d24d8a2717e29272950231b7e477aa32d69c7333c083626fc6802' + '9b8829fd9bf6c91e5c9e21184c7f57b22d786c20a15512e91cc75890a5d08a633df555973b29f2da9a7d9b965abd0c76ecdefa5498217837389ad1d0be0fb754' + '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' + 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' + '46f470d6f4df2b697db656e262d20c198e623da7332da5e35299834480a6f1ef9d3567b4827a4f3a3bd83ef4c3082d95045a437fea1f22f83a76e07bed508e2d') + _kernelname=${pkgbase#linux-libre} -: ${_kernelname:=-PARABOLA} +_grsecname=-grsec +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") +_replacesarchgrsec=("${_replacesarchkernel[@]/${_kernelname}/${_grsecname}}") +_replacesgrsec=("${pkgbase/${_kernelname}/${_grsecname}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") + +case "${CARCH}" in + i686|x86_64) KARCH=x86;; + armv7h) KARCH=arm;; +esac prepare() { cd ${_srcname} + # add upstream patch + if [ "${_pkgbasever}" != "${_pkgver}" ]; then + patch -p1 -i ../patch-${_pkgbasever}-${_pkgver} + fi + + if [ "${CARCH}" = "armv7h" ]; then + # RCN patch (CM3 firmware deblobbed and AUFS removed) + # Note: For stability reasons, AUFS has been removed in the RCN patch. + # We are supporting AUFS in linux-libre-pck through PCK patch. + # See https://wiki.parabola.nu/PCK for further details. + git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch" + + # ALARM patches + patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch" + patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch" + patch -p1 -i "${srcdir}/0003-SMILE-Plug-device-tree-file.patch" + patch -p1 -i "${srcdir}/0004-fix-mvsdio-eMMC-timing.patch" + patch -p1 -i "${srcdir}/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch" + patch -p1 -i "${srcdir}/0006-set-default-cubietruck-led-triggers.patch" + patch -p1 -i "${srcdir}/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch" + patch -p1 -i "${srcdir}/0008-disable-USB3-port-on-ODROID-XU.patch" + patch -p1 -i "${srcdir}/0009-ARM-dove-enable-ethernet-on-D3Plug.patch" + patch -p1 -i "${srcdir}/0010-power-add-power-sequence-library.patch" + patch -p1 -i "${srcdir}/0011-usb-core-add-power-sequence-handling-for-USB-devices.patch" + patch -p1 -i "${srcdir}/0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch" + patch -p1 -i "${srcdir}/0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch" + patch -p1 -i "${srcdir}/0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch" + fi + + # add hardened patches + patch -Np1 -i "${srcdir}/linux-hardened-${_pkgver%-*}.${_hardenedver}.patch" + # add freedo as boot logo install -m644 -t drivers/video/logo \ "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm} - # add upstream patch - msg2 "Applying upstream patch" - patch -Np1 < ../patch-${_pkgver%.*}-gnu-${_pkgver//_/-} - - # apply all patches - for _patch in "${source[@]}"; do - _patch=${_patch%%::*} - _patch=${_patch##*/} - if [[ "${_patch}" =~ \.patch$ ]] && - [[ "${_patch}" != "${pkgbase//-libre/}-${pkgver//_gnu/}.patch" ]]; then - msg2 "Applying patch ${_patch}" - patch -Np1 < "../${_patch}" - fi - done - - # linux hardened patch - msg2 "Applying hardened patch" - patch -Np1 < ../${pkgbase//-libre/}-${pkgver//_gnu/}.patch - # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - cat ../config.$CARCH - >.config <.config <=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=("linux-hardened") - conflicts=("linux-hardened") - replaces=("linux-hardened") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}" "${_replacesarchgrsec[@]}" "${_replacesgrsec[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install cd ${_srcname} # get kernel version - _kernver="$(make LOCALVERSION= kernelrelease)" + _kernver="$(make kernelrelease)" _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} mkdir -p "${pkgdir}"/{boot,usr/lib/modules} - make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}/usr" modules_install - cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" + make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install + if [ "${CARCH}" = "armv7h" ]; then + make LOCALVERSION= INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs/${pkgbase}" dtbs_install + cp arch/$KARCH/boot/zImage "${pkgdir}/boot/vmlinuz-${pkgbase}" + elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then + cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" + fi # make room for external modules local _extramodules="extramodules-${_basekernel}${_kernelname}" @@ -163,15 +254,26 @@ _package() { # now we call depmod... depmod -b "${pkgdir}/usr" -F System.map "${_kernver}" - # add vmlinux - install -Dt "${pkgdir}/usr/lib/modules/${_kernver}/build" -m644 vmlinux + if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then + # add vmlinux + install -Dt "${pkgdir}/usr/lib/modules/${_kernver}/build" -m644 vmlinux + fi # sed expression for following substitutions + if [ "${CARCH}" = "armv7h" ]; then local _subst=" + s|/boot/vmlinuz-%PKGBASE%|${_kernver}|g s|%PKGBASE%|${pkgbase}|g s|%KERNVER%|${_kernver}|g s|%EXTRAMODULES%|${_extramodules}|g " + elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then + local _subst=" + s|%PKGBASE%|${pkgbase}|g + s|%KERNVER%|${_kernver}|g + s|%EXTRAMODULES%|${_extramodules}|g + " + fi # hack to allow specifying an initially nonexisting install file sed "${_subst}" "${startdir}/${install}" > "${startdir}/${install}.pkg" @@ -189,11 +291,11 @@ _package() { } _package-headers() { - pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" - provides=("linux-hardened-headers") - conflicts=("linux-hardened-headers") - replaces=("linux-hardened-headers") - + pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" + provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") + replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}" "${_replacesarchgrsec[@]/%/-headers}" "${_replacesgrsec[@]/%/-headers}") + cd ${_srcname} local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build" @@ -204,11 +306,14 @@ _package-headers() { cp -t "${_builddir}" -a include scripts - install -Dt "${_builddir}/arch/x86" -m644 arch/x86/Makefile - [[ "$CARCH" == i686 ]] && install -t "${_builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu - install -Dt "${_builddir}/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s + install -Dt "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile + install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s + + if [[ ${CARCH} = i686 ]]; then + install -t "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile_32.cpu + fi - cp -t "${_builddir}/arch/x86" -a arch/x86/include + cp -t "${_builddir}/arch/${KARCH}" -a arch/${KARCH}/include install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h @@ -231,17 +336,35 @@ _package-headers() { find . -name Kconfig\* -exec install -Dm644 {} "${_builddir}/{}" \; # add objtool for external module building and enabled VALIDATION_STACK option - [[ "$CARCH" == x86_64 ]] && install -Dt "${_builddir}/tools/objtool" tools/objtool/objtool + if [[ -e tools/objtool/objtool ]]; then + install -Dt "${_builddir}/tools/objtool" tools/objtool/objtool + fi # remove unneeded architectures local _arch for _arch in "${_builddir}"/arch/*/; do - [[ ${_arch} == */x86/ ]] && continue + [[ ${_arch} == */${KARCH}/ ]] && continue rm -r "${_arch}" done # remove files already in linux-docs package rm -r "${_builddir}/Documentation" + + # parabola changes + # + # since we don't want to diverge too much from arch's pkgbuild, we'll + # start marking our changes as such + if [ "${CARCH}" = "armv7h" ]; then + for i in dove exynos omap2; do + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-${i}" + cp -a arch/${KARCH}/mach-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-${i}/" + done + for i in omap orion samsung versatile; do + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}" + cp -a arch/${KARCH}/plat-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}/" + done + fi + # end of parabola changes # remove now broken symlinks find -L "${_builddir}" -type l -printf 'Removing %P\n' -delete @@ -263,10 +386,10 @@ _package-headers() { } _package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" - provides=("linux-hardened-docs") - conflicts=("linux-hardened-docs") - replaces=("linux-hardened-docs") + pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" + provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") + replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}" "${_replacesarchgrsec[@]/%/-docs}" "${_replacesgrsec[@]/%/-docs}") cd ${_srcname} local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build" -- cgit v1.2.3