diff options
| -rw-r--r-- | PKGBUILD | 28 | ||||
| -rw-r--r-- | config | 42 | ||||
| -rw-r--r-- | kernel.its | 34 | ||||
| -rw-r--r-- | kernel.keyblock | bin | 1208 -> 0 bytes | |||
| -rw-r--r-- | kernel_data_key.vbprivk | bin | 1199 -> 0 bytes | |||
| -rw-r--r-- | linux-pinebook.install | 2 |
6 files changed, 35 insertions, 71 deletions
@@ -2,10 +2,10 @@ # Maintainer: Jaron Kent-Dobias <jaron@kent-dobias.com> # Contributor: Vasily Khoruzhick <anarsoul@gmail.com> -buildarch=8 +#buildarch=8 pkgbase=linux-pinebook -pkgver=5.10.12.pinebook1 +pkgver=5.10.17.pinebook1 pkgrel=1 _desc="AArch64 multi-platform with Pinebook support." _srctag=v${pkgver%.*}-${pkgver##*.} @@ -13,15 +13,12 @@ url="https://git.kent-dobias.com/system/linux/log/?h=$_srctag" _kernelname=${pkgbase#linux} arch=('aarch64') license=('GPL2') -makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'dtc') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'dtc' 'clang' 'llvm' 'lld') options=('!strip') _srcname=pinebook-linux source=( "$_srcname::git+https://git.kent-dobias.com/system/linux?signed#tag=$_srctag" 'config' - 'kernel.its' - 'kernel.keyblock' - 'kernel_data_key.vbprivk' 'linux.preset' '99-linux.hook' ) @@ -32,13 +29,14 @@ validpgpkeys=( 'D214744D04A2CC409C37D331534FC3B63E48F730' # Jaron Kent-Dobias ) md5sums=('SKIP' - '479a4ad517b00cb74df8d47ee55e6931' - '11a4f35c50f0bde59c30182aa7b797b7' - '61c5ff73c136ed07a7aadbf58db3d96a' - '584777ae88bce2c5659960151b64c7d8' + '9e6362ffdfd93148cf8e1157d0a94d72' '1bcc6c5d103b31523c5077b7c89f2b79' '1d4477026533efaa0358a40855d50a83') +export KBUILD_BUILD_HOST=archlinux +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + prepare() { cd "${srcdir}/${_srcname}" @@ -55,7 +53,7 @@ build() { cd "${srcdir}/${_srcname}" # get kernel version - make prepare + ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make LLVM=1 prepare # load configuration # Configure the kernel. Replace the line below with one of your choice. @@ -79,7 +77,7 @@ build() { # build! unset LDFLAGS - make -j9 ${MAKEFLAGS} Image Image.gz modules dtbs + ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make -j9 LLVM=1 ${MAKEFLAGS} Image Image.gz modules dtbs } _package() { @@ -97,13 +95,13 @@ _package() { KARCH=arm64 # get kernel version - _kernver="$(make kernelrelease)" + _kernver="$(ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make LLVM=1 kernelrelease)" _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} mkdir -p "${pkgdir}"/{lib/modules,lib/firmware} - make INSTALL_MOD_PATH="${pkgdir}" modules_install - make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install + ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make LLVM=1 INSTALL_MOD_PATH="${pkgdir}" modules_install + ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make LLVM=1 INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install cp arch/$KARCH/boot/Image{,.gz} "${pkgdir}/boot" # set correct depmod command for install @@ -1,16 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.10-1 Kernel Configuration -# -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 -CONFIG_LD_VERSION=235000000 -CONFIG_CLANG_VERSION=0 -CONFIG_LLD_VERSION=0 -CONFIG_CC_CAN_LINK=y -CONFIG_CC_CAN_LINK_STATIC=y +# Linux/arm64 5.10.17-1 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="clang version 11.1.0" +CONFIG_GCC_VERSION=0 +CONFIG_LD_VERSION=0 +CONFIG_CC_IS_CLANG=y +CONFIG_LD_IS_LLD=y +CONFIG_CLANG_VERSION=110100 +CONFIG_LLD_VERSION=110100 CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -402,6 +403,7 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_CC_HAVE_SHADOW_CALL_STACK=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_KEXEC is not set @@ -474,8 +476,6 @@ CONFIG_ARM64_MODULE_PLTS=y # CONFIG_ARM64_PSEUDO_NMI is not set CONFIG_RELOCATABLE=y # CONFIG_RANDOMIZE_BASE is not set -CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y -CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # @@ -763,6 +763,8 @@ CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y +# CONFIG_SHADOW_CALL_STACK is not set CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -792,6 +794,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y +CONFIG_RELR=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y # @@ -802,10 +805,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_CYC_COMPLEXITY is not set -# 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 @@ -1454,7 +1453,6 @@ CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m CONFIG_BPFILTER=y -CONFIG_BPFILTER_UMH=m CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -9388,11 +9386,11 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor" # # Memory initialization # +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y 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_STACK_ALL_PATTERN is not set +# CONFIG_INIT_STACK_ALL_ZERO 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 @@ -9860,6 +9858,7 @@ CONFIG_KGDB_TESTS=y # CONFIG_KGDB_KDB 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 @@ -9898,6 +9897,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=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 diff --git a/kernel.its b/kernel.its deleted file mode 100644 index 84c4b83..0000000 --- a/kernel.its +++ /dev/null @@ -1,34 +0,0 @@ -/dts-v1/; - -/ { - description = "Chrome OS kernel image with one or more FDT blobs"; - images { - kernel@1{ - description = "kernel"; - data = /incbin/("arch/arm64/boot/Image"); - type = "kernel_noload"; - arch = "arm64"; - os = "linux"; - compression = "none"; - load = <0>; - entry = <0>; - }; - fdt@1{ - description = "rk3399-gru-kevin.dtb"; - data = /incbin/("arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb"); - type = "flat_dt"; - arch = "arm64"; - compression = "none"; - hash@1{ - algo = "sha1"; - }; - }; - }; - configurations { - default = "conf@1"; - conf@1{ - kernel = "kernel@1"; - fdt = "fdt@1"; - }; - }; -}; diff --git a/kernel.keyblock b/kernel.keyblock Binary files differdeleted file mode 100644 index 9740be4..0000000 --- a/kernel.keyblock +++ /dev/null diff --git a/kernel_data_key.vbprivk b/kernel_data_key.vbprivk Binary files differdeleted file mode 100644 index 8d392fb..0000000 --- a/kernel_data_key.vbprivk +++ /dev/null diff --git a/linux-pinebook.install b/linux-pinebook.install index e883595..3fe8c1c 100644 --- a/linux-pinebook.install +++ b/linux-pinebook.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pinebook -KERNEL_VERSION=5.7.0-rc1-1-ARCH+ +KERNEL_VERSION=5.10.17-1-ARCH+ post_install () { # updating module dependencies |