From 9660d13ea283cc42671552b9a9262efa7ee27729 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Wed, 21 Feb 2018 20:19:37 +0100 Subject: [PATCH] Kernel updates (#1240) * linux-postmarketos-mainline 4.16-rc2 * linux-postmarketos-stable 4.15.4 * linux-postmarketos-lts 4.14.20 --- main/linux-postmarketos-lts/APKBUILD | 8 ++--- ...kefile-don-t-assume-sync-check.sh-is.patch | 33 ------------------- main/linux-postmarketos-mainline/APKBUILD | 14 ++++---- main/linux-postmarketos-stable/APKBUILD | 10 +++--- 4 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 main/linux-postmarketos-mainline/0002-tools-objtool-Makefile-don-t-assume-sync-check.sh-is.patch diff --git a/main/linux-postmarketos-lts/APKBUILD b/main/linux-postmarketos-lts/APKBUILD index a39dcbbe8..6d20f164b 100644 --- a/main/linux-postmarketos-lts/APKBUILD +++ b/main/linux-postmarketos-lts/APKBUILD @@ -3,12 +3,12 @@ _config="config-${_flavor}.${CARCH}" pkgname=linux-${_flavor} -pkgver=4.9.65 +pkgver=4.14.20 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=3 +pkgrel=0 arch="x86_64 armhf aarch64" pkgdesc="Linux for pmOS supported chipsets (LTS)" @@ -191,8 +191,8 @@ dev() { fi } -sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a linux-4.9.tar.xz +sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz 7de482169eb64cca001c298091471d803421dfef5835fa9a693840bd96083bdc42bc12a5217ececb5780ac285cf23674f2bd008183e651b81a7fc2882b819f01 config-postmarketos-lts.armhf f7dcf05c3c3042c6105748bcbe60ff8c02fac91c7de260a51b568c983df7f2a69c2bde6ebc3ddc4b7283e4aba7e1a8b0e9e4baff6ab863553dc3767679f54f62 config-postmarketos-lts.aarch64 d1e6ca8faee80641a2e882b3b9b0009b05a73adee8e939ace17be7879f8a87f4f2e7cb7bbbb9590e9b6c1491ed076505dbef599c0dc9e71fe71a8d451a7b635e config-postmarketos-lts.x86_64 -f22ec263901248adb0b660e5ea6f9c550f28f53dcd27d4a5148a932bce3b92f91cd921ff1d62096ac78c235e7abbeafa7ae33fc4f042e7d876e1fd58945554ce patch-4.9.65.xz" +1ddddb3a8eeed75bf650b749fa04712d0db67615e4cc6195dc43046797970f3b459299b71366b9a254fa6c6c3896339c3cef65d93b4097ab90a5cfbb6aa1c445 patch-4.14.20.xz" diff --git a/main/linux-postmarketos-mainline/0002-tools-objtool-Makefile-don-t-assume-sync-check.sh-is.patch b/main/linux-postmarketos-mainline/0002-tools-objtool-Makefile-don-t-assume-sync-check.sh-is.patch deleted file mode 100644 index 2515f1f5d..000000000 --- a/main/linux-postmarketos-mainline/0002-tools-objtool-Makefile-don-t-assume-sync-check.sh-is.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c8c7e01bd7c7cb5a0811efef88dfe6b40e009348 Mon Sep 17 00:00:00 2001 -From: Andrew Morton -Date: Fri, 15 Dec 2017 11:22:35 +1100 -Subject: [PATCH] tools/objtool/Makefile: don't assume sync-check.sh is - executable - -patch(1) loses the x bit. Kernel build breaks. - -Fixes: 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script") -Cc: Ingo Molnar -Cc: Josh Poimboeuf -Signed-off-by: Andrew Morton -Signed-off-by: Stephen Rothwell ---- - tools/objtool/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile -index ae0272f9a091..e6acc281dd37 100644 ---- a/tools/objtool/Makefile -+++ b/tools/objtool/Makefile -@@ -46,7 +46,7 @@ $(OBJTOOL_IN): fixdep FORCE - @$(MAKE) $(build)=objtool - - $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) -- @./sync-check.sh -+ @$(CONFIG_SHELL) ./sync-check.sh - $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@ - - --- -2.15.1 - diff --git a/main/linux-postmarketos-mainline/APKBUILD b/main/linux-postmarketos-mainline/APKBUILD index ac8150e0e..7eff553e3 100644 --- a/main/linux-postmarketos-mainline/APKBUILD +++ b/main/linux-postmarketos-mainline/APKBUILD @@ -3,19 +3,19 @@ _config="config-${_flavor}.${CARCH}" pkgname=linux-${_flavor} -pkgver=4.15_rc6 +pkgver=4.16_rc2 _pkgver=${pkgver/_/-} _kernver=${pkgver%_rc*} _mainver=${_kernver%.*} _patchlevel=${_kernver/$_mainver./} _basever=${_mainver}.$((_patchlevel-1)) -pkgrel=4 +pkgrel=0 arch="x86_64 armhf aarch64" pkgdesc="Linux for pmOS supported chipsets (mainline, more bleeding-edge than stable)" url="https://kernel.org/" depends="" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev libressl-dev file" +makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev libressl-dev file bison flex" options="!strip !check !tracedeps" install= source=" @@ -25,7 +25,6 @@ source=" config-${_flavor}.aarch64 config-${_flavor}.x86_64 0001-sony-amami-dts.patch - 0002-tools-objtool-Makefile-don-t-assume-sync-check.sh-is.patch " subpackages="$pkgname-dev" @@ -186,10 +185,9 @@ dev() { done fi } -sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -5d05754adc696f180405acda79e2678075f99d12252fc1f7e6af46f5ab39076de926db6de900c28b2e05dd3753df60d3515bb805b71d3bff991a5ed040b91167 linux-v4.14-v4.15-rc6.patch +sha512sums="c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea linux-4.15.tar.xz +36af7d64f4ab716b8ab1d21e77e0f4d78d2fb06d3792dac62d998b3889c9d25231182919142be2309fca96963631a815da748ff24e21faf706c37429a2acb7a4 linux-v4.15-v4.16-rc2.patch a75225750193cf31c8b6c15e7748699f842ecadc9ed573f0b10f42bb5343b4e092bcb65b359d170a42a102a4ddfe09d63c1d67550f4b99c29295fa22e1d7b995 config-postmarketos-mainline.armhf 6310035a0a4c028cc98cab92919cca54be9b79ee9fe63211e7a05876d7befdbd8506a2f80548e228e014e99b0f91f63946352789d8d2f2134c66914163f66ab3 config-postmarketos-mainline.aarch64 3d42c60061d12a436d19ffdf00623ea71ca31f16f690ae82ebf872d35177c283b4038cd5e270f4e610d6cf6861cef73ac63c995f1f4cfe9d6f2a4a8648ba28fb config-postmarketos-mainline.x86_64 -e0fb34032fe70d9a4713ed521b8a5e29cf7f76cb7c56ceb24ed7206a8445ba743226e4873fa2069077952e21f99fb36eabf7c4daa779f565961f0dded4591887 0001-sony-amami-dts.patch -04863696e5ed64a8fe41b3ac49c4f7e3028a945c3abf74467e0b0b39d57748f1f89269776f4e0301e2f996738f29a1e1932b3c121d6530a889eb3c1fd91a7af4 0002-tools-objtool-Makefile-don-t-assume-sync-check.sh-is.patch" +e0fb34032fe70d9a4713ed521b8a5e29cf7f76cb7c56ceb24ed7206a8445ba743226e4873fa2069077952e21f99fb36eabf7c4daa779f565961f0dded4591887 0001-sony-amami-dts.patch" diff --git a/main/linux-postmarketos-stable/APKBUILD b/main/linux-postmarketos-stable/APKBUILD index 365903ea4..62926fe34 100644 --- a/main/linux-postmarketos-stable/APKBUILD +++ b/main/linux-postmarketos-stable/APKBUILD @@ -4,18 +4,18 @@ _config="config-${_flavor}.${CARCH}" pkgname=linux-${_flavor} -pkgver=4.14.9 +pkgver=4.15.4 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=4 +pkgrel=0 arch="x86_64 armhf aarch64" pkgdesc="Linux for pmOS supported chipsets (stable)" url="https://kernel.org/" depends="" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev file" +makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev libressl-dev file" options="!strip !check !tracedeps" install= source=" @@ -192,8 +192,8 @@ dev() { fi } -sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz +sha512sums="c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea linux-4.15.tar.xz 7e4485a97ca37db7d071ebafa29450c2f307b51d48dac5c9f947d2f33c3194b1263f265031bbb502ac1d94039f0779d9528ef24491fa83260b9b78fcfe3c6c46 config-postmarketos-stable.armhf 5e3c7d569b6a246ed5873afb088dbcd533cb1074f13a030292af41214a704ea08d9c5505b113429ded57849271c121bfef1b7771cb3051d2ac46808da13afa45 config-postmarketos-stable.aarch64 9b7ae9e35731675db311aea9fe45b0e1ecc97cc40edc1ed7b179945e49d5656f26706c7fbf76a5308b0f480831adcfcff2777cb024c214c2e7a53b5ef0a15cd0 config-postmarketos-stable.x86_64 -8085944e5b8d49b07075776a1604a25ba87efe8b5a8a1a276a75dc47a87de4e487e72d9ace605166be977340b81a10a3cbc25c84b857509da8bba6d9184513fa patch-4.14.9.xz" +e903b02631f5fa261db44ea2da69b6edc3afbbbbb4da5eca6abf2972b9f5aeb032d6b4b22c1313eef7763bc91987ec793b05c00c04a0ec592f61cb5a82cea296 patch-4.15.4.xz"