4.18.4-1 (clr 4.18.4-624) sync with arch

This commit is contained in:
Josip Ponjavic 2018-08-22 23:29:36 +02:00
parent bbbd811607
commit 4d3361c3c9
2 changed files with 31 additions and 9 deletions

View file

@ -1,21 +1,23 @@
pkgbase = linux-clear pkgbase = linux-clear
pkgver = 4.18.3 pkgver = 4.18.4
pkgrel = 1 pkgrel = 1
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.3.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.3-623 source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.18.4-624
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
@ -26,7 +28,7 @@ pkgbase = linux-clear
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1 sha256sums = 19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1
sha256sums = SKIP sha256sums = SKIP
sha256sums = 760c723f1fd48f849464f2e07a5252035423e39101c812ea20690cb416b982cd sha256sums = cc22261cd9651dc2a05ad817a5b5fd3c63076ca86abfade7097915e7ba0b3bd6
sha256sums = SKIP sha256sums = SKIP
sha256sums = 29f9e8dc27e6c9b6488cecd7fe2394030307799e511db2d197d9e6553a7f9e40 sha256sums = 29f9e8dc27e6c9b6488cecd7fe2394030307799e511db2d197d9e6553a7f9e40
sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d

View file

@ -65,15 +65,15 @@ _rev_override="n"
pkgbase=linux-clear pkgbase=linux-clear
_major=4.18 _major=4.18
_minor=3 _minor=4
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
_srcname=linux-${_major} _srcname=linux-${_major}
pkgrel=1 pkgrel=1
_clr=623 _clr=624
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' 'inetutils' 'kmod' 'libelf' 'linux-firmware' 'xmlto') makedepends=('bc' 'git' 'graphviz' 'inetutils' 'kmod' 'libelf' 'linux-firmware' 'python-sphinx' 'xmlto')
options=('!strip') options=('!strip')
_gcc_more_v='20180509' _gcc_more_v='20180509'
source=( source=(
@ -178,7 +178,7 @@ prepare() {
build() { build() {
cd ${_srcname} cd ${_srcname}
make bzImage modules make bzImage modules htmldocs
} }
_package() { _package() {
@ -311,6 +311,10 @@ _package-headers() {
esac esac
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0) done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
msg2 "Adding symlink..."
mkdir -p "$pkgdir/usr/src"
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver"
msg2 "Fixing permissions..." msg2 "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir" chmod -Rc u=rwX,go=rX "$pkgdir"
} }
@ -327,6 +331,22 @@ _package-docs() {
mkdir -p "$builddir" mkdir -p "$builddir"
cp -t "$builddir" -a Documentation 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..." msg2 "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir" chmod -Rc u=rwX,go=rX "$pkgdir"
} }
@ -341,7 +361,7 @@ done
sha256sums=('19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1' sha256sums=('19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1'
'SKIP' 'SKIP'
'760c723f1fd48f849464f2e07a5252035423e39101c812ea20690cb416b982cd' 'cc22261cd9651dc2a05ad817a5b5fd3c63076ca86abfade7097915e7ba0b3bd6'
'SKIP' 'SKIP'
'29f9e8dc27e6c9b6488cecd7fe2394030307799e511db2d197d9e6553a7f9e40' '29f9e8dc27e6c9b6488cecd7fe2394030307799e511db2d197d9e6553a7f9e40'
'226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'