diff options
author | Timo Teräs <timo.teras@iki.fi> | 2014-11-25 13:13:14 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2014-11-25 13:14:49 +0000 |
commit | ff81339eef8a08803d35f228eaaa1323f31fa8df (patch) | |
tree | bae0f716b717d6e9d82f65b0e97fdee554634c53 | |
parent | 5de64b51193cdcff7b3731f7d3fe5e3758f0d1b9 (diff) | |
download | alpine_aports-ff81339eef8a08803d35f228eaaa1323f31fa8df.tar.bz2 alpine_aports-ff81339eef8a08803d35f228eaaa1323f31fa8df.tar.xz alpine_aports-ff81339eef8a08803d35f228eaaa1323f31fa8df.zip |
main/linux-rpi: upgrade to 3.14.25, 'rpi' flavor
properly use 'rpi' flavor, and update APKBUILD to mostly
match grsec kernel APKBUILD.
-rw-r--r-- | main/linux-rpi/APKBUILD | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD index b795d55d6d..9e1b8e647d 100644 --- a/main/linux-rpi/APKBUILD +++ b/main/linux-rpi/APKBUILD | |||
@@ -2,38 +2,35 @@ | |||
2 | 2 | ||
3 | _flavor=rpi | 3 | _flavor=rpi |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=3.14.24 | 5 | pkgver=3.14.25 |
6 | case $pkgver in | 6 | case $pkgver in |
7 | *.*.*) _kernver=${pkgver%.*};; | 7 | *.*.*) _kernver=${pkgver%.*};; |
8 | *.*) _kernver=$pkgver;; | 8 | *.*) _kernver=${pkgver};; |
9 | esac | 9 | esac |
10 | pkgrel=1 | 10 | pkgrel=1 |
11 | pkgdesc="Linux kernel with Raspberry Pi patches" | 11 | pkgdesc="Linux kernel with Raspberry Pi patches" |
12 | url=https://github.com/raspberrypi/linux | 12 | url=https://github.com/raspberrypi/linux |
13 | depends="mkinitfs linux-firmware" | 13 | depends="mkinitfs linux-firmware" |
14 | makedepends="perl installkernel bash ncurses-dev gmp-dev bc" | 14 | makedepends="perl installkernel bash gmp-dev bc" |
15 | options="!strip" | 15 | options="!strip" |
16 | _config=${config:-kernelconfig.${CARCH}} | 16 | _config=${config:-kernelconfig.${CARCH}} |
17 | install= | 17 | install= |
18 | source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz | 18 | source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz |
19 | http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz | ||
19 | http://dev.alpinelinux.org/~tteras/linux-3.14.y-rpi-20140923.patch | 20 | http://dev.alpinelinux.org/~tteras/linux-3.14.y-rpi-20140923.patch |
20 | aslr-pie.patch | 21 | aslr-pie.patch |
21 | kernelconfig.armhf | 22 | kernelconfig.armhf |
22 | " | 23 | " |
23 | if [ "${pkgver%.0}" = "$pkgver" ]; then | ||
24 | source="$source | ||
25 | http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz" | ||
26 | fi | ||
27 | subpackages="$pkgname-dev" | 24 | subpackages="$pkgname-dev" |
28 | arch="armhf" | 25 | arch="armhf" |
29 | license="GPL-2" | 26 | license="GPL-2" |
30 | 27 | ||
31 | _abi_release=${pkgver} | 28 | _abi_release=${pkgver}-${pkgrel}-${_flavor} |
32 | 29 | ||
33 | prepare() { | 30 | prepare() { |
34 | local _patch_failed= | 31 | local _patch_failed= |
35 | cd "$srcdir"/linux-$_kernver | 32 | cd "$srcdir"/linux-$_kernver |
36 | if [ "$_kernver" != "$pkgver" ]; then | 33 | if [ "${pkgver%.0}" = "$pkgver" ]; then |
37 | msg "Applying patch-$pkgver.xz" | 34 | msg "Applying patch-$pkgver.xz" |
38 | unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N || return 1 | 35 | unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N || return 1 |
39 | fi | 36 | fi |
@@ -57,6 +54,9 @@ prepare() { | |||
57 | return 1 | 54 | return 1 |
58 | fi | 55 | fi |
59 | 56 | ||
57 | rm -f localversion* | ||
58 | echo "-$pkgrel-$_flavor" > localversion-alpine | ||
59 | |||
60 | mkdir -p "$srcdir"/build | 60 | mkdir -p "$srcdir"/build |
61 | cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 | 61 | cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 |
62 | make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \ | 62 | make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \ |
@@ -71,8 +71,6 @@ menuconfig() { | |||
71 | } | 71 | } |
72 | 72 | ||
73 | build() { | 73 | build() { |
74 | unset CPPFLAGS CFLAGS CXXFLAGS | ||
75 | |||
76 | cd "$srcdir"/build | 74 | cd "$srcdir"/build |
77 | export GCC_SPECS=hardenednopie.specs | 75 | export GCC_SPECS=hardenednopie.specs |
78 | make CC="${CC:-gcc}" \ | 76 | make CC="${CC:-gcc}" \ |
@@ -81,9 +79,8 @@ build() { | |||
81 | } | 79 | } |
82 | 80 | ||
83 | package() { | 81 | package() { |
84 | unset CPPFLAGS CFLAGS CXXFLAGS | ||
85 | |||
86 | cd "$srcdir"/build | 82 | cd "$srcdir"/build |
83 | |||
87 | mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules | 84 | mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules |
88 | make -j1 modules_install firmware_install zinstall \ | 85 | make -j1 modules_install firmware_install zinstall \ |
89 | INSTALL_MOD_PATH="$pkgdir" \ | 86 | INSTALL_MOD_PATH="$pkgdir" \ |
@@ -107,7 +104,7 @@ dev() { | |||
107 | # build a tiny kernel module | 104 | # build a tiny kernel module |
108 | # | 105 | # |
109 | pkgdesc="Headers and script for third party modules for grsec kernel" | 106 | pkgdesc="Headers and script for third party modules for grsec kernel" |
110 | depends="gmp-dev" | 107 | depends="gmp-dev bash" |
111 | local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release} | 108 | local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release} |
112 | 109 | ||
113 | # first we import config, run prepare to set up for building | 110 | # first we import config, run prepare to set up for building |
@@ -115,7 +112,7 @@ dev() { | |||
115 | mkdir -p "$dir" | 112 | mkdir -p "$dir" |
116 | cp "$srcdir"/$_config "$dir"/.config | 113 | cp "$srcdir"/$_config "$dir"/.config |
117 | make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \ | 114 | make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \ |
118 | silentoldconfig prepare modules_prepare scripts | 115 | silentoldconfig prepare modules_prepare scripts |
119 | 116 | ||
120 | # remove the stuff that poits to real sources. we want 3rd party | 117 | # remove the stuff that poits to real sources. we want 3rd party |
121 | # modules to believe this is the soruces | 118 | # modules to believe this is the soruces |
@@ -146,17 +143,17 @@ dev() { | |||
146 | } | 143 | } |
147 | 144 | ||
148 | md5sums="b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz | 145 | md5sums="b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz |
146 | fffe78a513fa84a15c15a243cac35ca3 patch-3.14.25.xz | ||
149 | e0ba3d497c3476973e9702af8974145a linux-3.14.y-rpi-20140923.patch | 147 | e0ba3d497c3476973e9702af8974145a linux-3.14.y-rpi-20140923.patch |
150 | f901100a661ec62aac12000872d0276c aslr-pie.patch | 148 | f901100a661ec62aac12000872d0276c aslr-pie.patch |
151 | f4a7b1481ae53c5da4d071be1c880cea kernelconfig.armhf | 149 | f4a7b1481ae53c5da4d071be1c880cea kernelconfig.armhf" |
152 | 651a92fc1d45c02fa02358bb07e80697 patch-3.14.24.xz" | ||
153 | sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa linux-3.14.tar.xz | 150 | sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa linux-3.14.tar.xz |
151 | c1a13dbaaabc0fe1330c7e0f0f6e10fbf7d384ccf7f1d15061fec4602233b142 patch-3.14.25.xz | ||
154 | 20af8de40d5d59f0ba8e4c0ecd69070854e3fc2c42dce52aa4b9897d2f79b86d linux-3.14.y-rpi-20140923.patch | 152 | 20af8de40d5d59f0ba8e4c0ecd69070854e3fc2c42dce52aa4b9897d2f79b86d linux-3.14.y-rpi-20140923.patch |
155 | 07e9b089c0d5d57e91256ff6e8fe373519c8bd4ae4cba4eb4a2edad3e2cc9a8e aslr-pie.patch | 153 | 07e9b089c0d5d57e91256ff6e8fe373519c8bd4ae4cba4eb4a2edad3e2cc9a8e aslr-pie.patch |
156 | 28ead5cbc2475e5ba76c841fdc24ad5258665ff1e5a98dfee8e147c6b7303659 kernelconfig.armhf | 154 | 28ead5cbc2475e5ba76c841fdc24ad5258665ff1e5a98dfee8e147c6b7303659 kernelconfig.armhf" |
157 | 80013321b6891216fcff6d0746cb977bd7e8438b02ca13ff261659f3dfa76d51 patch-3.14.24.xz" | ||
158 | sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e linux-3.14.tar.xz | 155 | sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e linux-3.14.tar.xz |
156 | 0ba7ac8b4bc56115d2d88258573f334cb6d1dd7d302f24ae12c1ed693fc3a568801ffa75719ac7622dedf6673e6db6827bf31066b8afde97bc36d8c897e8cfa8 patch-3.14.25.xz | ||
159 | effa64ce5592f62d3cff5b13936fb8997ae320dd7bb975919d72db725a744f9c760197e405883be09b3aa2251ef10b67e5869294692cf8518a6aa3393fb42634 linux-3.14.y-rpi-20140923.patch | 157 | effa64ce5592f62d3cff5b13936fb8997ae320dd7bb975919d72db725a744f9c760197e405883be09b3aa2251ef10b67e5869294692cf8518a6aa3393fb42634 linux-3.14.y-rpi-20140923.patch |
160 | 35055eea7fce660a200cf6f56490a88f1601b4ea95d2364191ad0d890633e8811f2753b5816dad9640384a764b147a4a80b95f39e3bd7a66a15fd5b3ec0c794a aslr-pie.patch | 158 | 35055eea7fce660a200cf6f56490a88f1601b4ea95d2364191ad0d890633e8811f2753b5816dad9640384a764b147a4a80b95f39e3bd7a66a15fd5b3ec0c794a aslr-pie.patch |
161 | 847b0daeba852e3d280ad4deb51b95cef375f04ab1033a1bc9a95febba7bf3a893f8752cf7b9286d37030ee8bf0baf3852343a428739934024a9b48505e2c4a0 kernelconfig.armhf | 159 | 847b0daeba852e3d280ad4deb51b95cef375f04ab1033a1bc9a95febba7bf3a893f8752cf7b9286d37030ee8bf0baf3852343a428739934024a9b48505e2c4a0 kernelconfig.armhf" |
162 | 7f45dfd7340a41c360c7521b573adbb8569825aa078f7ef067a27f19be5c749e42965badde7cdf9c413374953e776e4cce43cd1856f9e08870793a50ba6ad0fb patch-3.14.24.xz" | ||