diff options
-rwxr-xr-x | .SRCINFO | 10 | ||||
-rwxr-xr-x | PKGBUILD | 99 | ||||
-rw-r--r-- | config | 7 |
3 files changed, 37 insertions, 79 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-bcachefs-510-zen pkgdesc = Linux - pkgver = v5.10.26.arch1.r969310.1110c37124f4 + pkgver = v5.10.26.arch1.r971595.17f9d1e225b9 pkgrel = 1 url = https://github.com/koverstreet/bcachefs arch = x86_64 @@ -16,14 +16,16 @@ pkgbase = linux-bcachefs-510-zen makedepends = xmlto makedepends = git options = !strip - source = linux-bcachefs::git+https://github.com/koverstreet/bcachefs.git#branch=master - source = git+https://github.com/zen-kernel/zen-kernel#branch=5.10/master + source = linux-bcachefs::git+https://github.com/koverstreet/bcachefs.git + source = linux-zen::git+https://github.com/zen-kernel/zen-kernel#branch=5.10/master + source = linux-stable::git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#branch=linux-5.10.y source = config validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E md5sums = SKIP md5sums = SKIP - md5sums = 23089df30f5b19a8d1f0ebe506eb3c83 + md5sums = SKIP + md5sums = SKIP pkgname = linux-bcachefs-510-zen pkgdesc = The Linux kernel and modules ~ featuring Kent Overstreet's bcachefs filesystem @@ -4,12 +4,15 @@ ################################################################################# # Because the package needs to download 2 linux gits to accelerate the progress -# do not let makepkg fetch them on its own. use (hint: uncomment the lines :) ): -# git clone https://github.com/koverstreet/bcachefs.git \ -# --reference PATHTOEXISTINGGIT linux-bcachefs # if you alread got a linux git +# do not let makepkg fetch them on its own. ( hint: uncomment the lines :) ) +# git clone https://github.com/koverstreet/bcachefs \ +# -b master --bare linux-bcachefs # use --reference if you already got a linux git in ../linux # and: -# git clone https://github.com/zen-kernel/zen-kernel -b 5.10/master \ -# --bare --reference linux-bcachefs zen-kernel +# git clone https://github.com/zen-kernel/zen-kernel \ +# -b 5.10/master --bare --reference linux-bcachefs linux-zen +# +# git clone https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git \ +# -b linux-5.10.y --bare --reference linux-zen linux-stable ################################################################################# ### BUILD OPTIONS @@ -18,47 +21,6 @@ # Tweak kernel options prior to a build via nconfig _makenconfig= -# Optionally select a sub architecture by number if building in a clean chroot -# Leaving this entry blank will require user interaction during the build -# which will cause a failure to build if using makechrootpkg. Note that the -# generic (default) option is 30. -# -# Note - the march=native option is unavailable by this method, use the nconfig -# and manually select it. -# -# 1. AMD Opteron/Athlon64/Hammer/K8 (MK8) -# 2. AMD Opteron/Athlon64/Hammer/K8 with SSE3 (MK8SSE3) -# 3. AMD 61xx/7x50/PhenomX3/X4/II/K10 (MK10) -# 4. AMD Barcelona (MBARCELONA) -# 5. AMD Bobcat (MBOBCAT) -# 6. AMD Jaguar (MJAGUAR) -# 7. AMD Bulldozer (MBULLDOZER) -# 8. AMD Piledriver (MPILEDRIVER) -# 9. AMD Steamroller (MSTEAMROLLER) -# 10. AMD Excavator (MEXCAVATOR) -# 11. AMD Zen (MZEN) -# 12. AMD Zen 2 (MZEN2) -# 13. Intel P4 / older Netburst based Xeon (MPSC) -# 14. Intel Atom (MATOM) -# 15. Intel Core 2 (MCORE2) -# 16. Intel Nehalem (MNEHALEM) -# 17. Intel Westmere (MWESTMERE) -# 18. Intel Silvermont (MSILVERMONT) -# 19. Intel Goldmont (MGOLDMONT) -# 20. Intel Goldmont Plus (MGOLDMONTPLUS) -# 21. Intel Sandy Bridge (MSANDYBRIDGE) -# 22. Intel Ivy Bridge (MIVYBRIDGE) -# 23. Intel Haswell (MHASWELL) -# 24. Intel Broadwell (MBROADWELL) -# 25. Intel Skylake (MSKYLAKE) -# 26. Intel Skylake X (MSKYLAKEX) -# 27. Intel Cannon Lake (MCANNONLAKE) -# 28. Intel Ice Lake (MICELAKE) -# 29. Intel Cascade Lake (MCASCADELAKE) -# 30. Generic-x86-64 (GENERIC_CPU) -# 31. Native optimizations autodetected by GCC (MNATIVE) -_subarch= - # Compile ONLY used modules to VASTLY reduce the number of modules built # and the build time. # @@ -67,10 +29,10 @@ _subarch= # This PKGBUILD read the database kept if it exists # # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db -_localmodcfg=1 +_localmodcfg= pkgbase=linux-bcachefs-510-zen -pkgver=v5.10.26.arch1.r971587.47ff0aad7ea6 +pkgver=v5.10.26.arch1.r971595.17f9d1e225b9 _srcver_tag=v5.10.26.arch1 pkgrel=1 pkgdesc="Linux" @@ -92,16 +54,13 @@ makedepends=( options=('!strip') _reponame="linux-bcachefs" -_repo_url="https://github.com/koverstreet/bcachefs" - -_reponame_gcc_patch="kernel_gcc_patch" -_repo_url_gcc_patch="https://github.com/graysky2/${_reponame_gcc_patch}" _pkgdesc_extra="~ featuring Kent Overstreet's bcachefs filesystem" source=( - "${_reponame}::git+${_repo_url}.git#branch=master" - 'git+https://github.com/zen-kernel/zen-kernel#branch=5.10/master' + "${_reponame}::git+https://github.com/koverstreet/bcachefs" + 'linux-zen::git+https://github.com/zen-kernel/zen-kernel#branch=5.10/master' + 'linux-stable::git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#branch=linux-5.10.y' config # kernel config file ) validpgpkeys=( @@ -110,7 +69,9 @@ validpgpkeys=( ) md5sums=('SKIP' 'SKIP' - '23089df30f5b19a8d1f0ebe506eb3c83') + 'SKIP' + 'SKIP' +) export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -119,32 +80,28 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP prepare() { cd "$srcdir/$_reponame" - git remote add zen ../zen-kernel || true + git remote add zen ../linux-zen || { + cd "$srcdir" + rm -rf linux-bcachefs + git clone ../linux-bcachefs linux-bcachefs + cd - + git remote add zen ../linux-zen + } + + git remote add stable ../linux-stable EDITOR=true git pull zen makepkg + EDITOR=true git pull stable makepkg || + git checkout --theirs Makefile msg2 "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname - #msg2 "Fetch and merge stable tag from Arch vanilla kernel repository..." - #git remote add arch_stable "https://git.archlinux.org/linux.git" || true - #git fetch arch_stable "${_srcver_tag_arch%.*}-${_srcver_tag_arch##*.}" - #git merge --no-edit --no-commit FETCH_HEAD - -# msg2 "Fetch and merge tag ${_srcver_tag//.arch*/} from Linux stable upstream repository..." -# git remote add upstream_stable "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git" || true -# git fetch upstream_stable ${_srcver_tag//.arch*/} -# git merge --no-edit --no-commit FETCH_HEAD - msg2 "Setting config..." cp ../config .config - if [ -n "$_subarch" ]; then - yes "$_subarch" | make oldconfig - else - make prepare - fi + make prepare ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.18-zen Kernel Configuration +# Linux/x86 5.10.27 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -267,6 +267,7 @@ CONFIG_BPF_PRELOAD=y CONFIG_BPF_PRELOAD_UMD=m CONFIG_USERFAULTFD=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -2125,7 +2126,6 @@ CONFIG_PCIEASPM_DEFAULT=y CONFIG_PCIE_PME=y CONFIG_PCIE_DPC=y CONFIG_PCIE_PTM=y -# CONFIG_PCIE_BW is not set CONFIG_PCIE_EDR=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -6669,7 +6669,6 @@ CONFIG_SND_SOC_SOF_INTEL_PCI=m CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m CONFIG_SND_SOC_SOF_INTEL_COMMON=m -# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y CONFIG_SND_SOC_SOF_MERRIFIELD=m CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y @@ -7810,7 +7809,7 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_XEN_BALLOON=y CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 +CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y |