wok-next rev 20892
linux: up (4.17.7)
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Jul 20 01:20:51 2018 +0300 (2018-07-20) |
parents | 1e6b0a53445a |
children | 751dc2b613cd |
files | aufs/receipt linux/receipt linux/stuff/tools/aufs-patches linux/stuff/tools/install_module_headers.sh |
line diff
1.1 --- a/aufs/receipt Thu Jul 19 18:27:17 2018 +0300 1.2 +++ b/aufs/receipt Fri Jul 20 01:20:51 2018 +0300 1.3 @@ -1,25 +1,27 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="aufs" 1.7 -VERSION="a9aa303" # AUFS_VERSION 4.14-20171216 1.8 +VERSION="4.17-20180716" 1.9 +COMMIT="076999e" 1.10 EXTRAVERSION="_$kvers" 1.11 CATEGORY="base-system" 1.12 -SHORT_DESC="The Linux Kernel 4.14 aufs module" 1.13 +SHORT_DESC="The Linux Kernel ${VERSION%-*} aufs module" 1.14 MAINTAINER="godane@slitaz.org" 1.15 LICENSE="GPL2" 1.16 WEB_SITE="http://aufs.sourceforge.net/" 1.17 HOST_ARCH="i486 x86_64" 1.18 1.19 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.20 -WGET_URL="https://github.com/sfjro/aufs4-standalone/archive/$VERSION.tar.gz" 1.21 +WGET_URL="https://github.com/sfjro/aufs4-standalone/archive/$COMMIT.tar.gz" 1.22 1.23 BUILD_DEPENDS="linux-module-headers xz" 1.24 SIBLINGS="linux64-aufs" 1.25 1.26 # How to update: 1.27 # 1. Go to https://github.com/sfjro/aufs4-standalone/ 1.28 -# 2. Select "aufs4.14" for the Linux Kernel-4.14.x in the "Branch:" dropdown 1.29 -# 3. Copy 7 hex digits after the "Latest commit": it's $VERSION 1.30 +# 2. Select "aufs4.17" for the Linux Kernel-4.17.x in the "Branch:" dropdown 1.31 +# 3. Copy 7 hex digits after the "Latest commit": it's $COMMIT 1.32 +# 4. Copy AUFS_VERSION value from the updated file include/uapi/linux/aufs_type.h 1.33 1.34 compile_rules() { 1.35 sed -i.orig \ 1.36 @@ -46,10 +48,9 @@ 1.37 make -j 1 KDIR=/usr/src/linux || return 1 1.38 xz -f fs/aufs/aufs.ko 1.39 1.40 - mkdir -p $install/lib/modules/${kvers}-slitaz/kernel/fs/aufs 1.41 - install -o root -m 0644 $src/fs/aufs/aufs.ko.xz \ 1.42 + install -Dm0644 fs/aufs/aufs.ko.xz \ 1.43 $install/lib/modules/${kvers}-slitaz/kernel/fs/aufs/aufs.ko.xz 1.44 - install -D -o root -m 0644 $src/include/uapi/linux/aufs_type.h \ 1.45 + install -Dm0644 include/uapi/linux/aufs_type.h \ 1.46 $install/usr/include/uapi/linux/aufs_type.h 1.47 } 1.48
2.1 --- a/linux/receipt Thu Jul 19 18:27:17 2018 +0300 2.2 +++ b/linux/receipt Fri Jul 20 01:20:51 2018 +0300 2.3 @@ -1,8 +1,8 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="linux" 2.7 -VERSION="4.14.16" 2.8 -KBASEVER="4.14" 2.9 +VERSION="4.17.7" 2.10 +KBASEVER="$(echo $VERSION | cut -d. -f1,2)" 2.11 CATEGORY="base-system" 2.12 SHORT_DESC="The Linux Kernel" 2.13 MAINTAINER="devel@slitaz.org" 2.14 @@ -14,8 +14,8 @@ 2.15 WGET_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$TARBALL" 2.16 2.17 BUILD_DEPENDS_arm="xz" 2.18 -BUILD_DEPENDS_x86_64="perl xz patch kmod bc elfutils-dev" 2.19 -BUILD_DEPENDS="perl xz lzma patch kmod bc elfutils-dev" # git 2.20 +BUILD_DEPENDS_x86_64="perl xz patch kmod bc elfutils-dev openssl-dev" 2.21 +BUILD_DEPENDS="perl xz lzma patch kmod bc elfutils-dev openssl-dev" # git 2.22 # Removed: lguest, linux-firmware, linux-logfs, linux-toshiba 2.23 SPLIT="\ 2.24 linux-acpi linux-agp linux-aoe \ 2.25 @@ -43,6 +43,7 @@ 2.26 linux-usbip linux-uwb linux-video \ 2.27 linux-wan linux-watchdog linux-wimax \ 2.28 linux-wireless linux-without-modules linux-zram" 2.29 +COOKOPTS="skip-log-errors" 2.30 2.31 if [ "$KBASEVER" != "${VERSION%.0}" ]; then 2.32 PATCH="$(dirname $WGET_URL)/patch-$VERSION.xz"
3.1 --- a/linux/stuff/tools/aufs-patches Thu Jul 19 18:27:17 2018 +0300 3.2 +++ b/linux/stuff/tools/aufs-patches Fri Jul 20 01:20:51 2018 +0300 3.3 @@ -20,6 +20,7 @@ 3.4 # Apply patches 3.5 echo "Applying aufs patches..." 3.6 while read patch_file; do 3.7 + [ ${patch_file:0:1} == '#' ] && continue 3.8 if [ -f done.$patch_file ]; then 3.9 echo "Skipping $patch_file"; continue 3.10 fi 3.11 @@ -30,5 +31,5 @@ 3.12 aufs4-base.patch 3.13 aufs4-mmap.patch 3.14 aufs4-standalone.patch 3.15 -aufs4-loopback.patch 3.16 +# aufs4-loopback.patch 3.17 EOT
4.1 --- a/linux/stuff/tools/install_module_headers.sh Thu Jul 19 18:27:17 2018 +0300 4.2 +++ b/linux/stuff/tools/install_module_headers.sh Fri Jul 20 01:20:51 2018 +0300 4.3 @@ -57,8 +57,8 @@ 4.4 4.5 # add dvb headers for external modules 4.6 # in reference to http://bugs.archlinux.org/task/9912 4.7 -mkdir -p $1/$path/drivers/media/dvb-core/ 4.8 -cp $src/drivers/media/dvb-core/*.h $1/$path/drivers/media/dvb-core/ 4.9 +# mkdir -p $1/$path/drivers/media/dvb-core/ 4.10 +# cp $src/drivers/media/dvb-core/*.h $1/$path/drivers/media/dvb-core/ 4.11 # and http://bugs.archlinux.org/task/11194 4.12 if [ -d $src/include/config/dvb/ ]; then 4.13 mkdir -p $1/$path/include/config/dvb/