diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-02-23 18:08:56 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-02 16:47:32 +0100 |
| commit | e3d1986a4484d0676a0c150549440bc2b6388de1 (patch) | |
| tree | 95434d6f6061d86b25dbe6f6f62200bf9b985e18 | |
| parent | 0eadfe2aa1e52a99681eb23da67a065b694cd2a6 (diff) | |
| download | aports-e3d1986a4484d0676a0c150549440bc2b6388de1.tar.bz2 aports-e3d1986a4484d0676a0c150549440bc2b6388de1.tar.xz | |
main/linux-rpi: upgrade to 4.1.18, and ship -rpi2-dev
fixes #5164
(cherry picked from commit bd65e126faa05089bd18b7f19c5d63392d709118)
| -rw-r--r-- | main/linux-rpi/APKBUILD | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD index 291ebfbfc0..17203ea146 100644 --- a/main/linux-rpi/APKBUILD +++ b/main/linux-rpi/APKBUILD @@ -1,8 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> -_mainflavor=rpi -pkgname=linux-$_mainflavor -pkgver=4.1.17 +pkgname=linux-rpi +pkgver=4.1.18 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; @@ -26,7 +25,7 @@ source="http://ftp.kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz config-rpi2.armhf markdt " -subpackages="$pkgname-dev" +subpackages="" _flavors= for _i in $source; do case $_i in @@ -34,9 +33,8 @@ for _i in $source; do _f=${_i%.$CARCH} _f=${_f#config-} _flavors="$_flavors ${_f}" - if [ "linux-$_f" != "$pkgname" ]; then - subpackages="$subpackages linux-${_f}" - fi + [ "linux-$_f" != "$pkgname" ] && subpackages="$subpackages linux-${_f}" + subpackages="$subpackages linux-${_f}-dev:_${_f}_dev" ;; esac done @@ -144,14 +142,8 @@ package() { _package rpi "$pkgdir" } -# subflavors install in $subpkgdir -rpi2() { - _package rpi2 "$subpkgdir" -} - -# we only provide -dev for main flavor for now -dev() { - local _abi_release=${pkgver}-${pkgrel}-$_mainflavor +_dev() { + local _abi_release=${pkgver}-${pkgrel}-$1 # copy the only the parts that we really need for build 3rd party # kernel modules and install those as /usr/src/linux-headers, # simlar to what ubuntu does @@ -159,14 +151,14 @@ dev() { # this way you dont need to install the 300-400 kernel sources to # build a tiny kernel module # - pkgdesc="Headers and script for third party modules for grsec kernel" + pkgdesc="Headers and script for third party modules for $1 grsec kernel" depends="gmp-dev bash" local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release} # first we import config, run prepare to set up for building # external modules, and create the scripts mkdir -p "$dir" - cp "$srcdir"/config-$_mainflavor.${CARCH} "$dir"/.config + cp "$srcdir"/config-$1.${CARCH} "$dir"/.config make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \ silentoldconfig prepare modules_prepare scripts @@ -190,7 +182,7 @@ dev() { find $(find arch -name include -type d -print) -type f \ | cpio -pdm "$dir" - install -Dm644 "$srcdir"/build-$_mainflavor/Module.symvers \ + install -Dm644 "$srcdir"/build-$1/Module.symvers \ "$dir"/Module.symvers mkdir -p "$subpkgdir"/lib/modules/${_abi_release} @@ -198,8 +190,13 @@ dev() { "$subpkgdir"/lib/modules/${_abi_release}/build } +for _f in $_flavors; do + [ "linux-$_f" != "$pkgname" ] && eval "${_f}() { _package "$_f" "$subpkgdir"; }" + eval "_${_f}_dev() { _dev $_f; }" +done + md5sums="fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz -49c68f18968fa809e20a7b20423fd1d2 patch-4.1.17.xz +cf5048c86823ee6182f0856ac5a3fa7d patch-4.1.18.xz b21c5bee698bb499a4fc4cdaf26a7150 linux-4.1.y-rpi-20160209.patch d4b70738cf06dbd70534d5e873442951 rpi-cirrus-4.1.y-20151218.patch b66e8aa4991ca5c2ccd61559ed7e6491 gpio-mcp23s08-pullups.patch @@ -209,7 +206,7 @@ b66e8aa4991ca5c2ccd61559ed7e6491 gpio-mcp23s08-pullups.patch 1c21e249ea27b70dd5e0a7b69820fdee config-rpi2.armhf e587cae1dca2f5992555d9bcf53deecf markdt" sha256sums="caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f linux-4.1.tar.xz -60e5c4fb93705a1e7d075d528975661303d3a87c522f731b69da2e00f3170b10 patch-4.1.17.xz +c69cbff479740d6bbd452d2264ba0afefa99ae51bb7ae52bfbde348ea8d8b20c patch-4.1.18.xz 64c0d751f8ebc54dbb02aa05c80127f5affc6a64336a9d4e29b1cd8481a7bdcd linux-4.1.y-rpi-20160209.patch 5aa17a1554598c3b364b7e8aea84bacfc13e8aca9b9101e58d89c211674a3d5a rpi-cirrus-4.1.y-20151218.patch b389a556bbd98053881b43deef1adf20640f980557c5f37cfd7ece2daeecbda9 gpio-mcp23s08-pullups.patch @@ -219,7 +216,7 @@ aaa1da7d9cac68206a8ddf1e1b8c08bc62696f789468ebfd6894c891d8700533 rotary-encoder 10318f14c68a7fafe3b1a8f3208c8586dabce5c01598a4bf7a2da76166b273b4 config-rpi2.armhf 0f6681fc5c3590e1dbe13a2bde796403bd1529cf0fe19720899eaa0db79bcb49 markdt" sha512sums="168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 linux-4.1.tar.xz -fa8675bac395ad7255693728ee601cd84a02aeee660ee5f2bf5684a6af053c9cf07afb0abb3324b1eb149305701a0bb9252053e840edc2aebb6499139dc12edd patch-4.1.17.xz +b95b82452206c2ef19e9fb1b01dcd6880c74f1b1fb9d8e1f209add734ba342d7c65401f3a4a2101eaa6b20b653b265ebc863052de71e01fa886ff7d7b1c1ad17 patch-4.1.18.xz 522089ff412f64eb9c8dd802592c639178385b818d19f66098351a9afa540f7fe02f7b363e953d67a7e59517c270423adfc8d3958c129fb1ac8552293e6f50b0 linux-4.1.y-rpi-20160209.patch 843afc1f2a72fa9618935dd67d4ac33a22ee78f20114af349f8d93e54864375b3ef192c8d8fde814d6685d5fe675c2a850743834ef89640eedce9f4db5ffdb67 rpi-cirrus-4.1.y-20151218.patch 36724ba56cb8fdf3a3d347cffb67ae1cc3d7b1052d526b6b5134ebf6baae9f9724b586c97833453dc7697ab24699426f0749af78b6a80be36967a80033a0cf40 gpio-mcp23s08-pullups.patch |