diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2018-11-21 14:22:03 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2018-11-21 14:22:12 +0000 |
| commit | 29978a57c858ab99ec60a360ced1ca4e45bf5f8d (patch) | |
| tree | e404f0c5e92d6c2fa840904f312004f94d22aaba /main/linux-rpi | |
| parent | a5cc7ce5789fddc04372361e619eabe05ed9038a (diff) | |
| download | aports-29978a57c858ab99ec60a360ced1ca4e45bf5f8d.tar.bz2 aports-29978a57c858ab99ec60a360ced1ca4e45bf5f8d.tar.xz | |
main/linux-rpi: upgrade to 4.19.3
Diffstat (limited to 'main/linux-rpi')
| -rw-r--r-- | main/linux-rpi/APKBUILD | 46 | ||||
| -rw-r--r-- | main/linux-rpi/config-changes-rpi.armhf | 2 |
2 files changed, 33 insertions, 15 deletions
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD index 7c323443af..a303ed60a5 100644 --- a/main/linux-rpi/APKBUILD +++ b/main/linux-rpi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=linux-rpi -pkgver=4.14.81 +pkgver=4.19.3 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; @@ -11,13 +11,15 @@ pkgdesc="Linux kernel with Raspberry Pi patches" url=https://github.com/raspberrypi/linux depends="mkinitfs" _depends_dev="perl gmp-dev elfutils-dev bash" -makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware" +makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware + bison flex openssl-dev +" options="!strip !check" -# rpi patches are git diff against latest release tag from: -# linux-4.14.y https://github.com/raspberrypi/linux/tree/rpi-4.14.y +_rpi_repo="git://github.com/raspberrypi/linux.git" +_linux_repo="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git" source="https://kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz https://kernel.org/pub/linux/kernel/v4.x/patch-$pkgver.xz - https://dev.alpinelinux.org/archive/rpi-patches/rpi-4.14.79-alpine.patch + https://dev.alpinelinux.org/archive/rpi-patches/rpi-$pkgver.patch issue-4973.patch @@ -202,6 +204,24 @@ _package() { fi } +genpatch() { + local RPI_REPO_PATH="$HOME/repositories/linux-rpi" + msg "Checking out/pulling the Linux kernel git repository.." + mkdir -p "$RPI_REPO_PATH" && cd "$RPI_REPO_PATH" + git clone "$_linux_repo" "$RPI_REPO_PATH" 2>/dev/null || git pull + msg "Fetching raspberry git repository.." + git remote add rpi "$_rpi_repo" 2>/dev/null || true + git fetch rpi + msg "Generating rpi patch: rpi-$pkgver.patch" + mkdir -p "$srcdir" + git diff v$pkgver remotes/rpi/rpi-${pkgver%.*}.y > \ + "$srcdir"/rpi-$pkgver.patch + msg "Sending patch to dev.alpinelinux.org.." + scp "$srcdir"/rpi-$pkgver.patch \ + dev.alpinelinux.org:/archive/rpi-patches/rpi-$pkgver.patch + cd "$startdir" && abuild checksum +} + # main flavor installs in $pkgdir package() { depends="$depends linux-firmware-brcm" @@ -263,12 +283,12 @@ _dev() { "$subpkgdir"/lib/modules/${_abi_release}/build } -sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -9e3482223e44af13238011733a9ec1796dcf258d5d8f594cb3388da01a230a476c789c3b12379d71837f74236094f905dfddbe6cf36811cb9e8cd8bec04481a6 patch-4.14.81.xz -17d257f3890f4d09cfb19b4cf96d646d9d525b0cc2d69d68cc69b18b32e102d799cde9ca04ef52c5552344905f38710a641f86ba41ab2a0c8c0aac86f9fc2e82 rpi-4.14.79-alpine.patch +sha512sums="ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 linux-4.19.tar.xz +e82e997423581388fb3149fcae1e591e04eb3060416f9f8ef3dcfffd4833f2b2ca617fdd79a92c610c6a34440e63a1f5d92dee429fb14d963ec98542552db4fa patch-4.19.3.xz +baa61d73d78c351f8d0119130bf764e493c88d45a934fea1044eec62b775e8d8753efedcd3d604a91b37e270e4fbce7828f458291b527d72b1ce555af399aa5d rpi-4.19.3.patch 501c91bf2538a18102da59bbccc3097f9c3c90079acc0e946ff075074160c09b8a66934e5ce5470e170f0e4f93d114709a95230367426d0bb7ea02c4bdf4cc9b issue-4973.patch -2f6d7ba43ba13b10cf5ef8e139fa978bee4689cd22ecf356559657ff604317770ede717dc706ee1e8cb999f73a574f5c6332b4bfbe99177389b2f75d60a742c9 config-changes-rpi.armhf -2f6d7ba43ba13b10cf5ef8e139fa978bee4689cd22ecf356559657ff604317770ede717dc706ee1e8cb999f73a574f5c6332b4bfbe99177389b2f75d60a742c9 config-changes-rpi.aarch64 -2f6d7ba43ba13b10cf5ef8e139fa978bee4689cd22ecf356559657ff604317770ede717dc706ee1e8cb999f73a574f5c6332b4bfbe99177389b2f75d60a742c9 config-changes-rpi2.armhf -2f6d7ba43ba13b10cf5ef8e139fa978bee4689cd22ecf356559657ff604317770ede717dc706ee1e8cb999f73a574f5c6332b4bfbe99177389b2f75d60a742c9 config-changes-rpi.armv7 -2f6d7ba43ba13b10cf5ef8e139fa978bee4689cd22ecf356559657ff604317770ede717dc706ee1e8cb999f73a574f5c6332b4bfbe99177389b2f75d60a742c9 config-changes-rpi2.armv7" +6c1c1c61ceb323eecb0e81e226af6b5b8fef7c8c075b1eb836639f465de5ef5d23648716c953d295250f8c6567546782956afe644573b84920a4f6902a1a0454 config-changes-rpi.armhf +6c1c1c61ceb323eecb0e81e226af6b5b8fef7c8c075b1eb836639f465de5ef5d23648716c953d295250f8c6567546782956afe644573b84920a4f6902a1a0454 config-changes-rpi.aarch64 +6c1c1c61ceb323eecb0e81e226af6b5b8fef7c8c075b1eb836639f465de5ef5d23648716c953d295250f8c6567546782956afe644573b84920a4f6902a1a0454 config-changes-rpi2.armhf +6c1c1c61ceb323eecb0e81e226af6b5b8fef7c8c075b1eb836639f465de5ef5d23648716c953d295250f8c6567546782956afe644573b84920a4f6902a1a0454 config-changes-rpi.armv7 +6c1c1c61ceb323eecb0e81e226af6b5b8fef7c8c075b1eb836639f465de5ef5d23648716c953d295250f8c6567546782956afe644573b84920a4f6902a1a0454 config-changes-rpi2.armv7" diff --git a/main/linux-rpi/config-changes-rpi.armhf b/main/linux-rpi/config-changes-rpi.armhf index 574bed385d..96eb7d7b82 100644 --- a/main/linux-rpi/config-changes-rpi.armhf +++ b/main/linux-rpi/config-changes-rpi.armhf @@ -7,8 +7,6 @@ CONFIG_ATM=disable CONFIG_SLAB_FREELIST_RANDOM=enable CONFIG_CGROUP_PIDS=enable CONFIG_SLAB_FREELIST_HARDENED=enable -CONFIG_CC_STACKPROTECTOR=enable -CONFIG_CC_STACKPROTECTOR_STRONG=enable CONFIG_PACKET=module CONFIG_NF_CT_PROTO_DCCP=enable CONFIG_NF_CT_PROTO_SCTP=enable |