From bc941458ba8dae6c812650c3bacadc8a00c41ca6 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 27 Oct 2019 13:44:03 -0700 Subject: Redo PKGBUILD variables --- PKGBUILD | 20 ++++++++++++-------- config.x86_64 | 16 +++++++++++----- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 730e3cc..9a87bed 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,16 +13,17 @@ # Arch version uses git pkgbase=linux -_majver=5.3 +_supver=5 +_majver=3 _minver=7 if [ "$_minver" == "0" ]; then - pkgver=${_majver} + pkgver=${_supver}.${_majver} else - pkgver=${_majver}.${_minver} + pkgver=${_supver}.${_majver}.${_minver} fi -_gccpatchver='20190822' _srcname=linux-${pkgver} -pkgrel=1 +_gccpatchver='20190822' +pkgrel=2 url='https://kernel.org' arch=('x86_64') license=('GPL2') @@ -32,7 +33,7 @@ makedepends=( conflicts=('linux-libre') options=('!strip') source=( - https://www.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar.{xz,sign} + https://www.kernel.org/pub/linux/kernel/v${_supver}.x/linux-$pkgver.tar.{xz,sign} 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch 0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch graysky_bdver2-hotfix.patch @@ -52,7 +53,7 @@ sha256sums=('c6c9714e21531c825c306b107bc6f6c7bfa2d5270a14bad170f8de5a73d34802' '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb' - '583a76bcfdebda1f1edb13d7eb7fea3ad72e86569d6572e15a98398253a7008f' + '1360eec919d7249f79fe975064be7faa54dc792cace9c233d40780f075a2baeb' '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') @@ -62,6 +63,9 @@ validpgpkeys=( ) _kernelname=${pkgbase#linux} +#export KBUILD_BUILD_HOST=arc4linux +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH:-$(date +%s)}" prepare() { cd $_srcname @@ -69,7 +73,7 @@ prepare() { # add upstream patch # if [ "$_minver" != "0" ]; then # msg2 "Applying upstream patch" -# patch -Np1 < ../patch-${_majver}-${_pkgver} +# patch -Np1 < ../patch-${_supver}.${_majver}-${_pkgver} # fi diff --git a/config.x86_64 b/config.x86_64 index 5fba767..715d826 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,13 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.3.0 Kernel Configuration +# Linux/x86 5.3.7 Kernel Configuration # # -# Compiler: gcc (GCC) 9.1.0 +# Compiler: gcc (GCC) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90100 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y @@ -703,7 +703,14 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -# CONFIG_GOOGLE_FIRMWARE is not set +CONFIG_GOOGLE_FIRMWARE=y +CONFIG_GOOGLE_SMI=m +CONFIG_GOOGLE_COREBOOT_TABLE=m +CONFIG_GOOGLE_MEMCONSOLE=m +# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set +CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m +CONFIG_GOOGLE_MEMCONSOLE_COREBOOT=m +CONFIG_GOOGLE_VPD=m # # EFI (Extensible Firmware Interface) Support @@ -7492,7 +7499,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m CONFIG_USB_CYPRESS_CY7C63=m -- cgit v1.2.1