diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-03-04 11:19:30 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-03-04 16:35:43 +0100 |
| commit | 1cf47d70e798197613f8da5d4de0847b5b6e19ee (patch) | |
| tree | 616fb67d446870bf1b1171b0c9ccc4a7b51ab600 | |
| parent | 86a6fa9285e245081c29d77c9d3a9291866d99e2 (diff) | |
| download | aports-1cf47d70e798197613f8da5d4de0847b5b6e19ee.tar.bz2 aports-1cf47d70e798197613f8da5d4de0847b5b6e19ee.tar.xz | |
main/linux-vanilla: upgrade to 4.9.161
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index 2613a71637..9807261bd5 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -2,7 +2,7 @@ _flavor=vanilla pkgname=linux-${_flavor} -pkgver=4.9.65 +pkgver=4.9.161 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -16,7 +16,6 @@ options="!strip" _config=${config:-config-vanilla.${CARCH}} install= source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz - 0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch config-vanilla.aarch64 config-vanilla.armhf config-vanilla.x86 @@ -72,22 +71,25 @@ prepare() { cat failed return 1 fi + oldconfig +} - mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 - make -C "$srcdir"/linux-$_kernver O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ +oldconfig() { + mkdir -p "$srcdir"/build.$CARCH + cp "$srcdir"/$_config "$srcdir"/build.$CARCH/.config || return 1 + make -C "$srcdir"/linux-$_kernver O="$srcdir"/build.$CARCH ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build.$CARCH || return 1 make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } build() { - cd "$srcdir"/build + cd "$srcdir"/build.$CARCH unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ @@ -95,7 +97,7 @@ build() { } package() { - cd "$srcdir"/build + cd "$srcdir"/build.$CARCH mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules @@ -164,7 +166,7 @@ dev() { find $(find arch -name include -type d -print) -type f \ | cpio -pdm "$dir" - install -Dm644 "$srcdir"/build/Module.symvers \ + install -Dm644 "$srcdir"/build.$CARCH/Module.symvers \ "$dir"/Module.symvers mkdir -p "$subpkgdir"/lib/modules/${_abi_release} @@ -173,12 +175,11 @@ dev() { } sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a linux-4.9.tar.xz -5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782 0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch -d552c5ab3b128cb1b4185aaa3ed27cd92070c2ba5f414747730c1915da432d1f930f81543737b902771967b02da8b41374d8b39518e5443aeaadeaa28153ae36 config-vanilla.aarch64 -8db3d9029dffc972d881ffdccbb6afcc02cdb5ccf6a571634e1c1b72552617903ee3e1c87b8971ef1c7143c0ddfcb8e1f21b45c68afeef88d5ff36bb768c8c96 config-vanilla.armhf -6e1d79ebd2113e02881aec39eb4d243761d78be9c736b0ce5ddf1721e65d411a17c866c9f5f9a253e46017d6e7c0b93b7220233780e46e18e29de705f2e543f7 config-vanilla.x86 -30a1ec682dd8df025151a7e76e83917d7ead6d2e730e85b0e87941f82dcb45f69afe928472e595997f373460f6c958b802c54663dab7ee9241ecaaf7cd13c769 config-vanilla.x86_64 +bb38d1334ab1933aa822c961e1286ae076e3f63620b5075a42e445246599448323bad974107ec5d4ada7ea58052ae797ae9ef7e1715b40cba19022e9fbb45123 config-vanilla.aarch64 +d5eb99a2f8fc3908e35a80473361aac7d8700471a35453949d46010d3dc827d229aee7563c53b6654829a0333f1881ba9bfe1ee2dad51441b5208cb72cea974a config-vanilla.armhf +f086ebe7d9ff9d5f29194986836d95b04445adcbaec5130169437b16375e069250b2b2a4324070e11c8508cd53eefa9501ca02944a45be4f8cb49743980fbdeb config-vanilla.x86 +40fe2f296404b829efefb0187c504ae7def71436162cf578303965d5802db5fa17392c02d3d91abecbb9b49085214b770e0d8bc9ddea583df64ce40e228187eb config-vanilla.x86_64 ee565e219530bcfaf5cade2622432cfb83743bdbbfc388781901461f19ca553b7fdee3c81ce6b34225ef78a209eb60088630284fcbb0430947aad77a5d8a0865 config-vanilla.ppc -faf5216f916946025041c5b8ffacce2586c88c7d796c17fb9762a8a58986dce7e923a7eb7a413cbd830afef022b18c40b25f4dcd4c9c81253c9aa3e98001b2b0 config-vanilla.ppc64le -26969c1ed93cb88a8b12330a2984954d6c20ef973ef619cf92c0543ab075f4e3342c7d6275ccecd475c5b6129ccfdd6054b41f504bd82e14eb9cefbd74aa1b90 config-vanilla.s390x -f22ec263901248adb0b660e5ea6f9c550f28f53dcd27d4a5148a932bce3b92f91cd921ff1d62096ac78c235e7abbeafa7ae33fc4f042e7d876e1fd58945554ce patch-4.9.65.xz" +aa46333ffd38e701d4819ee95c7c33eaabfe6da12b10451d0439200a261ff274586880f8383f3d3a61f764bad5531489719beae7758adc17d1df6ce52b6d5be6 config-vanilla.ppc64le +50a1f5c3ff3d133aa81e3c9353772f97b4f73aac200546410350dc016ef2ef8c82cc58e056b547b702de7cf5f50fb173eeb40e079953cb7f5e400f87cfafdede config-vanilla.s390x +bd67ec8cbfb5975fb057984ded67c7866f94d8f9a72262be99cc32668e219c15b41c22802d0dca680ea07fbeaf4f13966184c2faa48ebfeecace207c32a6ddcb patch-4.9.161.xz" |