From c7712430ac365434d100ad028cbe51b8e2c18f9e Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Thu, 23 Aug 2018 22:25:01 +0200 Subject: [PATCH] 4.18.4-2 (clr 4.18.4-625) drop -docs split package --- .SRCINFO | 10 ++-------- PKGBUILD | 44 ++++++-------------------------------------- 2 files changed, 8 insertions(+), 46 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6454d65..5c73356 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +1,21 @@ pkgbase = linux-clear pkgver = 4.18.4 - pkgrel = 1 + pkgrel = 2 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 license = GPL2 makedepends = bc makedepends = git - makedepends = graphviz makedepends = inetutils makedepends = kmod makedepends = libelf makedepends = linux-firmware - makedepends = python-sphinx makedepends = xmlto options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.tar.sign source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.18.4.xz - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.18.4-624 + source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.18.4-625 source = https://downloadmirror.intel.com/28039/eng/microcode-20180807.tgz source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz source = 60-linux.hook @@ -52,7 +50,3 @@ pkgname = linux-clear-headers pkgdesc = Header files and scripts for building modules for linux-clear depends = linux-clear -pkgname = linux-clear-docs - pkgdesc = Kernel hackers manual - HTML documentation that comes with the linux-clear - depends = linux-clear - diff --git a/PKGBUILD b/PKGBUILD index feac052..1620950 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -68,12 +68,12 @@ _major=4.18 _minor=4 pkgver=${_major}.${_minor} _srcname=linux-${_major} -pkgrel=1 -_clr=624 +pkgrel=2 +_clr=625 arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" license=('GPL2') -makedepends=('bc' 'git' 'graphviz' 'inetutils' 'kmod' 'libelf' 'linux-firmware' 'python-sphinx' 'xmlto') +makedepends=('bc' 'git' 'inetutils' 'kmod' 'libelf' 'linux-firmware' 'xmlto') options=('!strip') _gcc_more_v='20180509' source=( @@ -106,7 +106,7 @@ prepare() { echo "$_kernelname" > localversion.20-pkgname ### Add Clearlinux patches - for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0500' | sed -n 's/.*: //p'); do + for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0107|^Patch0500' | sed -n 's/.*: //p'); do msg2 "Applying patch ${i}..." patch -Np1 -i "$srcdir/clearlinux/${i}" done @@ -178,7 +178,7 @@ prepare() { build() { cd ${_srcname} - make bzImage modules htmldocs + make bzImage modules } _package() { @@ -319,39 +319,7 @@ _package-headers() { chmod -Rc u=rwX,go=rX "$pkgdir" } -_package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the linux-clear" - depends=('linux-clear') - - local builddir="$pkgdir/usr/lib/modules/$(