diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-11-27 14:30:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-11-28 14:11:06 +0000 |
| commit | f1f60a7a547253b9672db69007ba1ed3485ce1f6 (patch) | |
| tree | 1446b1456e281bfc3ce7b2a23828785020480c0d | |
| parent | 09443c3d0224ae169dffb03729b4513a6f77a1df (diff) | |
| download | aports-f1f60a7a547253b9672db69007ba1ed3485ce1f6.tar.bz2 aports-f1f60a7a547253b9672db69007ba1ed3485ce1f6.tar.xz | |
testing/linux-lts: workaround Module.symvers issue on s390x
apparently `make modules_install` messes up the Module.symvers on
s390x. We work around that by backingn it up and restore it.
Also disable CONFIG_MODULE_SRCVERSION_ALL since we have this disabled on
all other arches.
| -rw-r--r-- | testing/linux-lts/APKBUILD | 12 | ||||
| -rw-r--r-- | testing/linux-lts/config-lts.s390x | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/testing/linux-lts/APKBUILD b/testing/linux-lts/APKBUILD index a6346ecdf9..533ee6cc1e 100644 --- a/testing/linux-lts/APKBUILD +++ b/testing/linux-lts/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=2 +pkgrel=3 pkgdesc="Linux lts kernel" url="http://kernel.org" depends="mkinitfs" @@ -128,6 +128,9 @@ _package() { export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" cd "$srcdir"/build-$_buildflavor.$CARCH + # modules_install seems to regenerate a defect Modules.symvers on s390x. Work + # around it by backing it up and restore it after modules_install + cp Module.symvers Module.symvers.backup mkdir -p "$_outdir"/boot "$_outdir"/lib/modules @@ -150,8 +153,9 @@ _package() { make -j1 modules_install $_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$_outdir" \ - INSTALL_PATH="$_outdir"/boot \ - || return 1 + INSTALL_PATH="$_outdir"/boot + + cp Module.symvers.backup Module.symvers rm -f "$_outdir"/lib/modules/${_abi_release}/build \ "$_outdir"/lib/modules/${_abi_release}/source @@ -232,7 +236,7 @@ sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb b643fb1ed83bb23b8cff4fbdb66a1963e0a2e6195e9ce931cebd2774cda095a17442fa06c0d3d944cdf9e09573dc343bbdd327e6b6c900b0c58a6c6fde84cba4 config-lts.x86 0f53d5fea0044150354f3e323f2d0374c2d8bd6784bd134e049a80d268284a326ab0357e51b9bdce407fefa9194f97370967db78a8a680dc71d1fe57007cec8e config-lts.x86_64 8fd22417cbe68667f247580f9f08dcb1f483d8403f033731d507f1690a53b725f4a82ab32facb5e8ee49ef6066bf7f0ae8c88685322d34971de4ef05bf5150e5 config-lts.ppc64le -0952a44abe41099a198625bc8be824ebb00f88a27d1744c1ee7480de97bf804772338e1d51219384e96bc89453b955c41e12ca16d922c40c2a79b32fbb782678 config-lts.s390x +59780f94050f1175c0d7d0dbd8f48aa3d977cb6954d53041f8f5c9ed1a991e1d19d9a9a3408a70645c9cb4903d68a3ab3a01ef44ed1203d756571bd308bade31 config-lts.s390x a5babb745568a5ff1c8d93ae711b162e3620c23b0b0b9b9e94438cabd4a8de891916c774636815efd95f4d4d887ad12a21c4ac47d4c5b66b4afc31bbdea10260 config-virt.aarch64 1f397e4abb5504d5a271abe0bc9364acd0182388f9a6c02280ca9db686de7f715aa3e61b0d8a0f488e1bb56267a899166c1deba969488a4b61cc8b50455f3c26 config-virt.x86 9d2527e571f415ad3f92879825d6bfb5ceed2cb6cc9bd1c5693a0e9f2103f4980dad458607465b50c4c916746c44d529753821d2dbf0c0bc4a5d547d8ae60348 config-virt.x86_64" diff --git a/testing/linux-lts/config-lts.s390x b/testing/linux-lts/config-lts.s390x index 99aaf2c5f3..eaa99d5b8d 100644 --- a/testing/linux-lts/config-lts.s390x +++ b/testing/linux-lts/config-lts.s390x @@ -494,7 +494,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_ASM_MODVERSIONS=y CONFIG_MODULE_REL_CRCS=y -CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set |