diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-01-17 22:14:24 -0800 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-01-17 22:14:24 -0800 |
commit | 4330d572ebf4a01e058fe993c1705f068cf4be20 (patch) | |
tree | a35983d87703f51ea6d20700ee3ab47a2757aa40 /PKGBUILD | |
parent | Updated to 5.4.10.a (diff) | |
download | linux-libre-hardened-4330d572ebf4a01e058fe993c1705f068cf4be20.tar.xz |
Updated to 5.4.12.a
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 135 |
1 files changed, 66 insertions, 69 deletions
@@ -19,7 +19,7 @@ _pkgbase=linux-hardened pkgbase=linux-libre-hardened _supver=5 _majver=4 -_minver=10 +_minver=12 _hardenedver=a _gccpatchver='20190822' if [ "$_minver" == "0" ]; then @@ -52,14 +52,13 @@ source=( 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch 0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch - 0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch - 0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch - 0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch - 0011-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch - 0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch - 0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch - 0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch - 0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch + 0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch + 0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch + 0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch + 0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch + 0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch + 0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch + 0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}/${_pkgbase}-${pkgver}.patch{,.sig} graysky_bdver2-hotfix.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz @@ -71,31 +70,30 @@ validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva 'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak ) -sha256sums=('d56d4db5a539058382b500c9d8ebec1f76964647220eb3ed107f49c9dabecbab' - 'SKIP' - '47f29ee08459bcb50f5e16f2d73142e6d4cb5ab9de66ab576a2b8a3f44ac84ad' - 'SKIP' - 'f04a451706241e85f49d85c7d9bd892495b2e9d4eb0a353de333e375ed3b3d14' - '15dcdeec72aa042ceb272326225d22dd5f934cd7fa0746924eced3eb4f77703e' - '2d3afe3896644896510cd7a4694a94692a7ca8173006ce8eaa37c87abf2830c8' - '4b3c1cab1ec9258e7632cbdf9bb289186b66d702ada3e5672275297b76f3b226' - 'bd333d79a0f0a21f9da070e27f55786a0355036021b72e91757517daf6412a6d' - '2516be40fe063f7a448c69f170d628dbf549c3e084c2c7eb6910fd4782a6e73f' - '1bcec07561c785e22ca43a140b07b586bc7717ea3c08e7549ec7a3bdfa39b7e2' - 'e2084feabc3abeed37579ff515c367014356a652b85794b1612fea4daabe85d3' - '988ffbb96d85564a9d96145e5973339a8f78ae95d919efb2ee7bb50f7a8e8fc9' - '5257159e20a5fcb102a3b3ee6de33882a9e132e7f1d4345b8730effdd0240bb6' - '03cb03ababc0365f14b7acce5c659438a78cc65a5be0c2349d449361fd54d267' - '33ec2170ace6b4f7dbc1cc751110d325d8619202d0f312587adbc4bef7a045ce' - '54104b9118d9151379589f0b95bce38aaea5d7068e80e7ab5dbdad0b73d7b1b7' - 'f9464bc1980e54f6d090f20658907318456c2d86654c8681fd518083c2596be7' - '03eb363cfb3e040b6ad54bd134b99cc58f45a7a4ae1faa6fb1d64ee450184f8c' - 'SKIP' - 'c5405139aa0a90a6f68f6a13e066a2bd0600c970f9f525cd3aa114b044a7f73b' - '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' - 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' - '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb' - '953053fcc3b0d2a7f7bdaadc28bdffe44a85cfa62c339b1826bef48d57d17fb0') +b2sums=('43270fe22aeaba6f8c4fc72423176d7eea993ec85b561695f624fbca9702dfabae0a3ee15cb3881d0c7a5b80f979f307e5a39a4ec0fcd28456ece2012bb30e0e' + 'SKIP' + '40a591ca0602bdbbcaaa0b84ee0675d801d21b87102be21d9fceebc88475d9016ab70d7609db7df6150931a225ac50f1760cb2d469e835479d4cce8a9b040e21' + 'SKIP' + '3696586612832416f5f1433eca3e0734467357e1771dfbd411a8b21976659e92633188b2c2d904c05cbd7123c19d06b2ce1d2063aa2e0a21647207ca5cf71f53' + '38b90c7e270501527979413bd280e0c129a23759b6d950f8631336fa636c8511d040bd0408badd63ffc9e2f9144ee35bc8360e63831e9412974bb7fdeba5a3f7' + 'e62bb44e4c097026e47b488c9022ffd1efd142c8c6600807c23caeab821d433d3e026a00886bf22472e66b027175a71efe0042bd6334d017d23756459fa7745b' + '4af9bd681816575959158ebcf36d92f0fedb9d0f5d5112c9aa0dcb84119dd904652bb0478dc6cb28660206ce6982558ac707e018d15b25c5957e9d3016132a63' + '818f30e6af0399e7357d02b8858bc8dc499f74face06a6465745f79db2f3a2b83ab477b0b1354c597b17fbbef3ddd131d077120fad87debb3d47984cdf3e5f39' + '852e1603247dc9e71e6aee2d3c2e21422d96cbce61ea3b65e660a6662cca75012d81e195bc4ef39276aaff0eba222745f956d94a9c215b6a9c57fe1014336e09' + '3e67757e7e88eb6d5badbfa904796397ad88681b40992798099604179852c7c10c0f401992ee6f24f2175a75afe11078182351588425da4e9bff812e0d16361a' + '286d054b866d50c908e4404a81420e05bd438c7f0a5107a9f701eb999281ad6cfeaeb372cf0f777e85d3f36d00e4d3570dffa4264384dc485ba3ff3ac282cda2' + 'd6ada06c39dce7cfd2799b4a6b8784bdebfb8faf3bb88efa55350d3c343bf8e5d3a2c30e7eb00ad85da05b9e68cea63a3a87c3cd9f320beeb9888000943da11b' + '1d3cfb6c115c37c1c844c8d82253dd0ea6314265630a453f63ccb88cbbebb6e3ff1caf9a50b626e7eefa5d0ffb9d574395c1328a308425f5fe2a4704cfb2b2df' + '2f0298d78228e73ed89763281ec7310ccaac0671007d325300c74085bce690c523dccaf335b4b1c3767bdfccc2749bbbfc270fb7f96007522dc210e1e8ce6d94' + 'a073d1a2baf8064146a08920eef4cd4c65730b1294ed07a641cce162c0f3aca6fef9c07b3ca3c02a9b216b67c67533598858afd6a016bba30bb4f415975f4999' + 'af7a16237c1e918e625c9ca6d9f6acdbba5d85abf5154bfbe9eb9609a88a5ea2e7e1c949a67e8e9e39450e0063dd1d3645e3f4525296da513bdd5456b40a0213' + '8320f06dc9d45d12e6bcfba9f81e3b9b6b87fd0f7f44520fc0c1b4a694514273dc30cb5f04b87e17fb49ffacd2cf5c154db6b00d0635812e3faf850880cd71d8' + 'SKIP' + '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e' + '0b11c09e01a7480466d5237a8792c941c9af3e8d6584ffd84285cd9569f5355c10879566ce5846ef9263535020c53e1aa6c58100a571b537ccb7f2431baf7996' + '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd' + 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' + '7a08279e1ab29cb4a2b2b3e5ff2743f5fb6fc5a2dbaf71a8adaefaf28b6df82f442e1ebc89532829ea304462efdcb7df3ffd26bb4e23ae6ccea559cb723d167a') export KBUILD_BUILD_HOST=$pkgbase export KBUILD_BUILD_USER=$pkgbase @@ -106,60 +104,59 @@ prepare() { # add upstream patch if [ "$_minver" != "0" ]; then - msg2 "Applying upstream patch" + echo "Applying upstream patch" patch -Np1 < ../patch-${_gnumajver}-${_gnupkgver} fi # Hotfixes - msg2 "Applying hotfixes" + echo "Applying hotfixes" patch -p1 -i ../0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch patch -p1 -i ../0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch patch -p1 -i ../0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch patch -p1 -i ../0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch patch -p1 -i ../0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch patch -p1 -i ../0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch - patch -p1 -i ../0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch - patch -p1 -i ../0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch - patch -p1 -i ../0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch - patch -p1 -i ../0011-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch - patch -p1 -i ../0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch - patch -p1 -i ../0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch - patch -p1 -i ../0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch - patch -p1 -i ../0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch + patch -p1 -i ../0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch + patch -p1 -i ../0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch + patch -p1 -i ../0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch + patch -p1 -i ../0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch + patch -p1 -i ../0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch + patch -p1 -i ../0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch + patch -p1 -i ../0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch # linux hardened patch - msg2 "Applying hardened patch" + echo "Applying hardened patch" patch -Np1 < ../linux-hardened-${pkgver}.patch # graysky gcc hotfixes - msg2 "Applying graysky gcc patch hotfixes" + echo "Applying graysky gcc patch hotfixes" patch -p1 -i ../graysky_bdver2-hotfix.patch "$srcdir/kernel_gcc_patch-${_gccpatchver}/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch" # graysky gcc patch - msg2 "Applying graysky cpu patch" + echo "Applying graysky cpu patch" patch -p1 -i ../kernel_gcc_patch-${_gccpatchver}/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch # Ignore ath9k eeprom patch - msg2 "Applying ath9k patch" + echo "Applying ath9k patch" patch -p1 -i ../ath9k-regdom-hack.patch # Set default raid6 algo patch - msg2 " Applying raid6 patch" + echo " Applying raid6 patch" patch -p1 -i ../raid6-default-algo.patch - msg2 "Setting version..." + echo "Setting version..." sed -e "/^EXTRAVERSION =/s/=.*/= .${_hardenedver}/" -i Makefile scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname - msg2 "Setting config..." + echo "Setting config..." # we are in src/linux-x.yy.zz, looking for a config next to the pkgbuild # if [ -f ${SRCDEST}/config.libre-hardened.previous ]; then # cp ${SRCDEST}/config.libre-hardened.previous .config @@ -189,10 +186,10 @@ prepare() { cat ../version.temp | tr -d "\n" > version # back up the config -# msg2 "Backing up config..." +# echo "Backing up config..." # cp .config ${SRCDEST}/config.libre-hardened.previous - msg2 "Prepared %s version %s" "$pkgbase" "$(<version)" + echo "Prepared %s version %s" "$pkgbase" "$(<version)" } build() { @@ -211,7 +208,7 @@ _package() { local kernver="$(<version)" local modulesdir="$pkgdir/usr/lib/modules/$kernver" - msg2 "Installing boot image..." + echo "Installing boot image..." # systemd expects to find the kernel here to allow hibernation # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz" @@ -219,13 +216,13 @@ _package() { # Used by mkinitcpio to name the kernel echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase" - msg2 "Installing modules..." + echo "Installing modules..." make INSTALL_MOD_PATH="$pkgdir/usr" modules_install # remove build and source links rm "$modulesdir"/{source,build} - msg2 "Fixing permissions..." + echo "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" } @@ -235,7 +232,7 @@ _package-headers() { cd $_srcname local builddir="$pkgdir/usr/lib/modules/$(<version)/build" - msg2 "Installing build files..." + echo "Installing build files..." install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \ localversion.* version vmlinux install -Dt "$builddir/kernel" -m644 kernel/Makefile @@ -250,7 +247,7 @@ _package-headers() { # add xfs and shmem for aufs building mkdir -p "$builddir"/{fs/xfs,mm} - msg2 "Installing headers..." + echo "Installing headers..." cp -t "$builddir" -a include cp -t "$builddir/arch/x86" -a arch/x86/include install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s @@ -266,10 +263,10 @@ _package-headers() { install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h - msg2 "Installing KConfig files..." + echo "Installing KConfig files..." find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \; - msg2 "Removing unneeded architectures..." + echo "Removing unneeded architectures..." local arch for arch in "$builddir"/arch/*/; do [[ $arch = */x86/ ]] && continue @@ -277,16 +274,16 @@ _package-headers() { rm -r "$arch" done - msg2 "Removing documentation..." + echo "Removing documentation..." rm -r "$builddir/Documentation" - msg2 "Removing broken symlinks..." + echo "Removing broken symlinks..." find -L "$builddir" -type l -printf 'Removing %P\n' -delete - msg2 "Removing loose objects..." + echo "Removing loose objects..." find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete - msg2 "Stripping build tools..." + echo "Stripping build tools..." local file while read -rd '' file; do case "$(file -bi "$file")" in @@ -301,11 +298,11 @@ _package-headers() { esac done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0) - msg2 "Adding symlink..." + echo "Adding symlink..." mkdir -p "$pkgdir/usr/src" ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" - msg2 "Fixing permissions..." + echo "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" } @@ -315,7 +312,7 @@ _package-docs() { cd $_srcname local builddir="$pkgdir/usr/lib/modules/$(<version)/build" - msg2 "Installing documentation..." + echo "Installing documentation..." local src dst while read -rd '' src; do dst="${src#Documentation/}" @@ -323,11 +320,11 @@ _package-docs() { install -Dm644 "$src" "$dst" done < <(find Documentation -name '.*' -prune -o ! -type d -print0) - msg2 "Adding symlink..." + echo "Adding symlink..." mkdir -p "$pkgdir/usr/share/doc" ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase" - msg2 "Fixing permissions..." + echo "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" } |