diff options
author | Daniel Bermond | 2019-01-04 20:44:33 +0000 |
---|---|---|
committer | Daniel Bermond | 2019-01-04 20:44:33 +0000 |
commit | fc297c3950f1ce26367f6489f9b8b4e94ef92b67 (patch) | |
tree | b89ca2efb6116900847bc44fd8c5640e8ff64c2d | |
parent | 27f750ce57e5deb1ed0b484954254a29b37b93d4 (diff) | |
download | aur-fc297c3950f1ce26367f6489f9b8b4e94ef92b67.tar.gz |
Updated to version 4.19.8
-rw-r--r-- | .SRCINFO | 31 | ||||
-rw-r--r-- | PKGBUILD | 47 | ||||
-rw-r--r-- | kernel.its | 217 | ||||
-rw-r--r-- | kernel.keyblock | bin | 0 -> 1208 bytes | |||
-rw-r--r-- | kernel_data_key.vbprivk | bin | 0 -> 1199 bytes | |||
-rw-r--r-- | linux-chromebook.install | 25 |
6 files changed, 305 insertions, 15 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-libre - pkgver = 4.19.5_gnu + pkgver = 4.19.8_gnu pkgrel = 1 url = https://linux-libre.fsfla.org/ arch = i686 @@ -16,8 +16,8 @@ pkgbase = linux-libre options = !strip source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19-gnu/linux-libre-4.19-gnu.tar.xz source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19-gnu/linux-libre-4.19-gnu.tar.xz.sign - source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19.5-gnu/patch-4.19-gnu-4.19.5-gnu.xz - source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19.5-gnu/patch-4.19-gnu-4.19.5-gnu.xz.sign + source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19.8-gnu/patch-4.19-gnu-4.19.8-gnu.xz + source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19.8-gnu/patch-4.19-gnu-4.19.8-gnu.xz.sign source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm @@ -30,8 +30,11 @@ pkgbase = linux-libre source = 60-linux.hook source = 90-linux.hook source = linux.preset - source = https://repo.parabola.nu/other/rcn-libre/patches/4.19.5/rcn-libre-4.19.5-armv7-x9.patch - source = https://repo.parabola.nu/other/rcn-libre/patches/4.19.5/rcn-libre-4.19.5-armv7-x9.patch.sig + source = kernel.its + source = kernel.keyblock + source = kernel_data_key.vbprivk + source = https://repo.parabola.nu/other/rcn-libre/patches/4.19.8/rcn-libre-4.19.8-armv7-x11.patch + source = https://repo.parabola.nu/other/rcn-libre/patches/4.19.8/rcn-libre-4.19.8-armv7-x11.patch.sig source = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch source = 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch source = 0003-SMILE-Plug-device-tree-file.patch @@ -48,7 +51,7 @@ pkgbase = linux-libre validpgpkeys = 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 sha512sums = 5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293f1e38753ed681be289c51390e0e64b3e60ce0db0a3bfe1f94ee5c014579a3 sha512sums = SKIP - sha512sums = dbb9b21c9c89e199ea6e719287f3ef1b7c07dfbda55108216499dfd1f981d80777dde191132417502772a25615511e9ae58a3f7efcf2f023d6a41d734a3099a9 + sha512sums = d4de40e6fc7523e9314b89b29cd91af5d9cbbd57bece239e990c5f738ade9ceb53e7cedac30ecbf45009abfb0088a874b6570897dffd52c90e4f39743edd9b0f sha512sums = SKIP sha512sums = 13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3 sha512sums = SKIP @@ -62,7 +65,10 @@ pkgbase = linux-libre sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7 sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf - sha512sums = fa32060ea7a44b94ce8ddc0c204a2ef1ec58551dfa20f94cd0237218c605e23783ff5aa0d2f802c40e58cef1502f0a770e34ac3302c40b5fba46d71ea9f75529 + sha512sums = 167bc73c6c1c63931806238905dc44c7d87c5a5c0f6293159f2133dfe717fb44081018d810675716d1605ec7dff5e8333b87b19e09e2de21d0448e447437873b + sha512sums = bb6718984a7357c9b00c37e4788480e5b8b75018c172ecc1441bc3fc5d2d42444eb5d8c7f9d2e3a7d6fed6d03acb565e3c0559486e494c40a7fe6bd0570c9ede + sha512sums = 143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232 + sha512sums = 8e0485049f64c0532e933e864266b043a087b3c91e2eb564cc692ccd5c25f36f902fed4fae1c4b4b896cfab99b8e239e55965c914674dd360dd6ae847c94768a sha512sums = SKIP sha512sums = 60aa432465eb3ac10f565799d3dfecea21aaf08e83909c1161d9359e932626edbd1353e712d616c3d785c65a0f699e9c45df35bd9e86365c25399c6b2d45b9e4 sha512sums = 86809feb5ae2759b449ec0cb7a6b3fb457874ed82a72dfda00607e8819c804a0714b5d6a17cbbba44996a36872224af42d1b85f1b3932f43bccb419041d25dc7 @@ -76,6 +82,9 @@ pkgbase = linux-libre sha512sums = 02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af sha512sums = b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168 sha512sums = ba561ef861c56002de25ec6f63211e758f3d26eaa7ff0e4a16ffd096d5fe7019d9df343658adc0535684303888d022aa816fc0b282da27ac1ca29dfc0b0e2be0 + makedepends_armv7h = uboot-tools + makedepends_armv7h = vboot-utils + makedepends_armv7h = dtc pkgname = linux-libre pkgdesc = The Linux-libre kernel and modules @@ -85,21 +94,21 @@ pkgname = linux-libre depends = kmod depends = mkinitcpio optdepends = crda: to set the correct wireless channels of your country - provides = linux=4.19.5 - provides = LINUX-ABI_VERSION=4.19.5 + provides = linux=4.19.8 + provides = LINUX-ABI_VERSION=4.19.8 conflicts = linux replaces = linux backup = etc/mkinitcpio.d/linux-libre.preset pkgname = linux-libre-headers pkgdesc = Header files and scripts for building modules for Linux-libre kernel - provides = linux-headers=4.19.5 + provides = linux-headers=4.19.8 conflicts = linux-headers replaces = linux-headers pkgname = linux-libre-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel - provides = linux-docs=4.19.5 + provides = linux-docs=4.19.8 conflicts = linux-docs replaces = linux-docs @@ -13,7 +13,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _srcbasever=4.19-gnu -_srcver=4.19.5-gnu +_srcver=4.19.8-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -23,11 +23,12 @@ _srcname=linux-${_srcbasever%-*} _archpkgver=${_srcver%-*} pkgver=${_srcver//-/_} pkgrel=1 -rcnrel=armv7-x9 +rcnrel=armv7-x11 arch=(i686 x86_64 armv7h) url="https://linux-libre.fsfla.org/" license=(GPL2) makedepends=(xmlto kmod inetutils bc libelf python-sphinx graphviz) +makedepends_armv7h=(uboot-tools vboot-utils dtc) # for linux-libre-chromebook options=('!strip') source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_srcbasever/linux-libre-$_srcbasever.tar.xz"{,.sign} @@ -41,6 +42,8 @@ source=( '60-linux.hook' '90-linux.hook' # standard config files for mkinitcpio ramdisk 'linux.preset' + # files for signing Chromebooks kernels + 'kernel.its' 'kernel.keyblock' 'kernel_data_key.vbprivk' # armv7h patches "https://repo.parabola.nu/other/rcn-libre/patches/${_srcver%-*}/rcn-libre-${_srcver%-*}-$rcnrel.patch"{,.sig} '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' @@ -63,7 +66,7 @@ validpgpkeys=( ) sha512sums=('5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293f1e38753ed681be289c51390e0e64b3e60ce0db0a3bfe1f94ee5c014579a3' 'SKIP' - 'dbb9b21c9c89e199ea6e719287f3ef1b7c07dfbda55108216499dfd1f981d80777dde191132417502772a25615511e9ae58a3f7efcf2f023d6a41d734a3099a9' + 'd4de40e6fc7523e9314b89b29cd91af5d9cbbd57bece239e990c5f738ade9ceb53e7cedac30ecbf45009abfb0088a874b6570897dffd52c90e4f39743edd9b0f' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -77,7 +80,10 @@ sha512sums=('5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293 '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - 'fa32060ea7a44b94ce8ddc0c204a2ef1ec58551dfa20f94cd0237218c605e23783ff5aa0d2f802c40e58cef1502f0a770e34ac3302c40b5fba46d71ea9f75529' + '167bc73c6c1c63931806238905dc44c7d87c5a5c0f6293159f2133dfe717fb44081018d810675716d1605ec7dff5e8333b87b19e09e2de21d0448e447437873b' + 'bb6718984a7357c9b00c37e4788480e5b8b75018c172ecc1441bc3fc5d2d42444eb5d8c7f9d2e3a7d6fed6d03acb565e3c0559486e494c40a7fe6bd0570c9ede' + '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232' + '8e0485049f64c0532e933e864266b043a087b3c91e2eb564cc692ccd5c25f36f902fed4fae1c4b4b896cfab99b8e239e55965c914674dd360dd6ae847c94768a' 'SKIP' '60aa432465eb3ac10f565799d3dfecea21aaf08e83909c1161d9359e932626edbd1353e712d616c3d785c65a0f699e9c45df35bd9e86365c25399c6b2d45b9e4' '86809feb5ae2759b449ec0cb7a6b3fb457874ed82a72dfda00607e8819c804a0714b5d6a17cbbba44996a36872224af42d1b85f1b3932f43bccb419041d25dc7' @@ -377,7 +383,40 @@ _package-docs() { chmod -Rc u=rwX,go=rX "$pkgdir" } +_package-chromebook() { + pkgdesc="Kernel image sign for ${pkgbase^} - Chromebooks" + depends=('linux-libre') + provides=("${_replacesarchkernel[@]/%/-armv7-chromebook=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-armv7-chromebook}" "${_replacesoldkernels[@]/%/-armv7-chromebook}") + replaces=("${_replacesarchkernel[@]/%/-armv7-chromebook}" "${_replacesoldkernels[@]/%/-armv7-chromebook}") + install=linux-chromebook.install + + cd $_srcname + + msg2 "Setting options for device tree compiler..." + cp ../kernel.its . + mkimage -D "-I dts -O dtb -p 2048" -f kernel.its kernel.itb + dd if=/dev/zero of=bootloader.bin bs=512 count=1 + echo 'console=tty0 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd' > cmdline + + msg2 "Creating kernel sign..." + vbutil_kernel \ + --pack vmlinux.kpart \ + --version 1 \ + --vmlinuz kernel.itb \ + --arch arm \ + --keyblock ../kernel.keyblock \ + --signprivate ../kernel_data_key.vbprivk \ + --config cmdline \ + --bootloader bootloader.bin + + msg2 "Installing kernel sign..." + mkdir -p "$pkgdir/boot" + cp vmlinux.kpart "$pkgdir/boot" +} + pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs") +[[ $CARCH = armv7h ]] && pkgname+=("$pkgbase-chromebook") for _p in "${pkgname[@]}"; do eval "package_$_p() { $(declare -f "_package${_p#$pkgbase}") diff --git a/kernel.its b/kernel.its new file mode 100644 index 000000000000..66114a49ed1e --- /dev/null +++ b/kernel.its @@ -0,0 +1,217 @@ +/dts-v1/; + +/ { + description = "Chrome OS kernel image with one or more FDT blobs"; + #address-cells = <1>; + images { + kernel@1 { + description = "kernel"; + data = /incbin/("arch/arm/boot/zImage"); + type = "kernel_noload"; + arch = "arm"; + os = "linux"; + compression = "none"; + load = <0>; + entry = <0>; + }; + fdt@1 { + description = "exynos5250-snow.dtb"; + data = /incbin/("arch/arm/boot/dts/exynos5250-snow.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@2 { + description = "exynos5250-snow-rev5.dtb"; + data = /incbin/("arch/arm/boot/dts/exynos5250-snow-rev5.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@3 { + description = "exynos5250-spring.dtb"; + data = /incbin/("arch/arm/boot/dts/exynos5250-spring.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@4 { + description = "exynos5800-peach-pi.dtb"; + data = /incbin/("arch/arm/boot/dts/exynos5800-peach-pi.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1{ + algo = "sha1"; + }; + }; + fdt@5 { + description = "exynos5420-peach-pit.dtb"; + data = /incbin/("arch/arm/boot/dts/exynos5420-peach-pit.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@6 { + description = "rk3288-veyron-brain.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-veyron-brain.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@7 { + description = "rk3288-veyron-jaq.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-veyron-jaq.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@8 { + description = "rk3288-veyron-jerry.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-veyron-jerry.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@9 { + description = "rk3288-veyron-mickey.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-veyron-mickey.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@10 { + description = "rk3288-veyron-minnie.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-veyron-minnie.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@11 { + description = "rk3288-veyron-pinky.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-veyron-pinky.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1{ + algo = "sha1"; + }; + }; + fdt@12 { + description = "rk3288-veyron-speedy.dtb"; + data = /incbin/("arch/arm/boot/dts/rk3288-veyron-speedy.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@13 { + description = "tegra124-nyan-big.dtb"; + data = /incbin/("arch/arm/boot/dts/tegra124-nyan-big.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + fdt@14 { + description = "tegra124-nyan-blaze.dtb"; + data = /incbin/("arch/arm/boot/dts/tegra124-nyan-blaze.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash@1 { + algo = "sha1"; + }; + }; + }; + configurations { + default = "conf@1"; + conf@1 { + kernel = "kernel@1"; + fdt = "fdt@1"; + }; + conf@2 { + kernel = "kernel@1"; + fdt = "fdt@2"; + }; + conf@3 { + kernel = "kernel@1"; + fdt = "fdt@3"; + }; + conf@4 { + kernel = "kernel@1"; + fdt = "fdt@4"; + }; + conf@5 { + kernel = "kernel@1"; + fdt = "fdt@5"; + }; + conf@6 { + kernel = "kernel@1"; + fdt = "fdt@6"; + }; + conf@7 { + kernel = "kernel@1"; + fdt = "fdt@7"; + }; + conf@8 { + kernel = "kernel@1"; + fdt = "fdt@8"; + }; + conf@9 { + kernel = "kernel@1"; + fdt = "fdt@9"; + }; + conf@10 { + kernel = "kernel@1"; + fdt = "fdt@10"; + }; + conf@11 { + kernel = "kernel@1"; + fdt = "fdt@11"; + }; + conf@12 { + kernel = "kernel@1"; + fdt = "fdt@12"; + }; + conf@13 { + kernel = "kernel@1"; + fdt = "fdt@13"; + }; + conf@14 { + kernel = "kernel@1"; + fdt = "fdt@14"; + }; + }; +}; diff --git a/kernel.keyblock b/kernel.keyblock Binary files differnew file mode 100644 index 000000000000..9740be4e6007 --- /dev/null +++ b/kernel.keyblock diff --git a/kernel_data_key.vbprivk b/kernel_data_key.vbprivk Binary files differnew file mode 100644 index 000000000000..8d392fb294c1 --- /dev/null +++ b/kernel_data_key.vbprivk diff --git a/linux-chromebook.install b/linux-chromebook.install new file mode 100644 index 000000000000..02e08464d1b0 --- /dev/null +++ b/linux-chromebook.install @@ -0,0 +1,25 @@ +flash_kernel() { + major=$(mountpoint -d / | cut -f 1 -d ':') + minor=$(mountpoint -d / | cut -f 2 -d ':') + device=$(cat /proc/partitions | awk {'if ($1 == "'${major}'" && $2 == "'${minor}'") print $4 '}) + device="/dev/${device/%2/1}" + + echo "A new kernel version needs to be flashed onto ${device}." + echo "Do you want to do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + dd if=/boot/vmlinux.kpart of=${device} + sync + else + echo "You can do this later by running:" + echo "# dd if=/boot/vmlinux.kpart of=${device}" + fi +} + +post_install () { + flash_kernel +} + +post_upgrade() { + flash_kernel +} |