4.18.4-2 (clr 4.18.4-625) drop -docs split package

This commit is contained in:
Josip Ponjavic 2018-08-23 22:25:01 +02:00
parent 4d3361c3c9
commit c7712430ac
2 changed files with 8 additions and 46 deletions

View file

@ -1,23 +1,21 @@
pkgbase = linux-clear pkgbase = linux-clear
pkgver = 4.18.4 pkgver = 4.18.4
pkgrel = 1 pkgrel = 2
url = https://github.com/clearlinux-pkgs/linux url = https://github.com/clearlinux-pkgs/linux
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
makedepends = bc makedepends = bc
makedepends = git makedepends = git
makedepends = graphviz
makedepends = inetutils makedepends = inetutils
makedepends = kmod makedepends = kmod
makedepends = libelf makedepends = libelf
makedepends = linux-firmware makedepends = linux-firmware
makedepends = python-sphinx
makedepends = xmlto makedepends = xmlto
options = !strip 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.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/linux-4.18.tar.sign
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.18.4.xz 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 = 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 = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz
source = 60-linux.hook source = 60-linux.hook
@ -52,7 +50,3 @@ pkgname = linux-clear-headers
pkgdesc = Header files and scripts for building modules for linux-clear pkgdesc = Header files and scripts for building modules for linux-clear
depends = linux-clear depends = linux-clear
pkgname = linux-clear-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the linux-clear
depends = linux-clear

View file

@ -68,12 +68,12 @@ _major=4.18
_minor=4 _minor=4
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
_srcname=linux-${_major} _srcname=linux-${_major}
pkgrel=1 pkgrel=2
_clr=624 _clr=625
arch=('x86_64') arch=('x86_64')
url="https://github.com/clearlinux-pkgs/linux" url="https://github.com/clearlinux-pkgs/linux"
license=('GPL2') 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') options=('!strip')
_gcc_more_v='20180509' _gcc_more_v='20180509'
source=( source=(
@ -106,7 +106,7 @@ prepare() {
echo "$_kernelname" > localversion.20-pkgname echo "$_kernelname" > localversion.20-pkgname
### Add Clearlinux patches ### 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}..." msg2 "Applying patch ${i}..."
patch -Np1 -i "$srcdir/clearlinux/${i}" patch -Np1 -i "$srcdir/clearlinux/${i}"
done done
@ -178,7 +178,7 @@ prepare() {
build() { build() {
cd ${_srcname} cd ${_srcname}
make bzImage modules htmldocs make bzImage modules
} }
_package() { _package() {
@ -319,39 +319,7 @@ _package-headers() {
chmod -Rc u=rwX,go=rX "$pkgdir" chmod -Rc u=rwX,go=rX "$pkgdir"
} }
_package-docs() { pkgname=("$pkgbase" "$pkgbase-headers")
pkgdesc="Kernel hackers manual - HTML documentation that comes with the linux-clear"
depends=('linux-clear')
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
cd ${_srcname}
msg2 "Installing documentation..."
mkdir -p "$builddir"
cp -t "$builddir" -a Documentation
msg2 "Removing doctrees..."
rm -r "$builddir/Documentation/output/.doctrees"
msg2 "Moving HTML docs..."
local src dst
while read -rd '' src; do
dst="$builddir/Documentation/${src#$builddir/Documentation/output/}"
mkdir -p "${dst%/*}"
mv "$src" "$dst"
rmdir -p --ignore-fail-on-non-empty "${src%/*}"
done < <(find "$builddir/Documentation/output" -type f -print0)
msg2 "Adding symlink..."
mkdir -p "$pkgdir/usr/share/doc"
ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
msg2 "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir"
}
pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
for _p in "${pkgname[@]}"; do for _p in "${pkgname[@]}"; do
eval "package_$_p() { eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}") $(declare -f "_package${_p#$pkgbase}")