From 254c2110a18823d277dc8d6264fc12491df6b2d1 Mon Sep 17 00:00:00 2001 From: Alexey Min Date: Sat, 5 Mar 2022 22:20:38 +0300 Subject: [PATCH] linux-postmarketos-qcom-sdm660: switch repo source (MR 2981) In preparation to removal of linux-postmarketos repo, switch source to different source mirror. I had to switch to gzip archive, because github doesn't serve bzip2. I did a kconfig edit -> change nothing -> exit saving to regenerate config. See also: postmarketos#47 [ci:skip-build] Already built fine on CI in MR --- .../linux-postmarketos-qcom-sdm660/APKBUILD | 11 +++++------ .../config-postmarketos-qcom-sdm660.aarch64 | 16 ++++++---------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD b/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD index 13e6441fc..a9e9a112f 100644 --- a/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-qcom-sdm660" pkgname=linux-$_flavor pkgver=5.10_rc6 -pkgrel=4 +pkgrel=5 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon 660 SoC" arch="aarch64" url="https://kernel.org/" @@ -15,17 +15,16 @@ options="!strip !check !tracedeps " makedepends="bison findutils flex installkernel openssl-dev perl" -_repo="linux-postmarketos" _commit="68c4e52cf35374e4b654f252b62accadad759ca5" source=" - $_repo-$_commit.tar.bz2::https://gitlab.com/postmarketOS/$_repo/-/archive/$_commit/$_repo-$_commit.tar.bz2 + linux-sdm660-mainline-$_commit.tar.gz::https://github.com/sdm660-mainline/linux/archive/$_commit.tar.gz config-$_flavor.aarch64 " _carch="arm64" -builddir="$srcdir/$_repo-$_commit" +builddir="$srcdir/linux-$_commit" prepare() { default_prepare @@ -54,6 +53,6 @@ package() { } sha512sums=" -3252b8fc1e17697f77c87176c681280461e886cb97af6f27f848c6022d0b3aff63996c251611a3ab863b2799ce3ae00e7522cc6d8ba3756db3a09a671426560b linux-postmarketos-68c4e52cf35374e4b654f252b62accadad759ca5.tar.bz2 -adec9da2f39fdbe97f79611fe45848426ba773b3f80252fc53d34ceaa4afb403af2d9a1429bbe60f0b810ff1976257a464d0674d0f9dba4fa36bbc7a1ec39b64 config-postmarketos-qcom-sdm660.aarch64 +70a8b39b6b38789e2f831301006a2d2a4607c1d9cd48b658110ef8f7bc7aa81d6183d6e3d4b5fe97378bd3d829772dae3338b6e12718e8348b07ffe232676a25 linux-sdm660-mainline-68c4e52cf35374e4b654f252b62accadad759ca5.tar.gz +953de399270a4947bd5be6ce5e257ee7eb64897fd974227d4462c081a7b4bc4f0a4701ff6d2597aa55b899226d36f6338067ed1414c5b2bddf4ad6c649bb20be config-postmarketos-qcom-sdm660.aarch64 " diff --git a/device/testing/linux-postmarketos-qcom-sdm660/config-postmarketos-qcom-sdm660.aarch64 b/device/testing/linux-postmarketos-qcom-sdm660/config-postmarketos-qcom-sdm660.aarch64 index f58a9c3e0..6bfc94b4a 100644 --- a/device/testing/linux-postmarketos-qcom-sdm660/config-postmarketos-qcom-sdm660.aarch64 +++ b/device/testing/linux-postmarketos-qcom-sdm660/config-postmarketos-qcom-sdm660.aarch64 @@ -2,12 +2,13 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 5.10.0-rc6 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625" +CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100301 -CONFIG_LD_VERSION=235020000 +CONFIG_GCC_VERSION=110201 +CONFIG_LD_VERSION=238000000 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -675,9 +676,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_GCC_PLUGINS=y -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -4980,10 +4978,6 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity" # Memory initialization # CONFIG_INIT_STACK_NONE=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set -# CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization @@ -5361,6 +5355,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_UBSAN is not set +CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments CONFIG_DEBUG_KERNEL=y @@ -5395,6 +5390,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set # end of Memory Debugging