Update git packages for kernel 3.15.2-1

pull/26/head
Jesus Alvarez 11 years ago
parent b962a3b5f6
commit 21273ec569
  1. 2
      conf.sh
  2. 10
      spl-git/PKGBUILD
  3. 4
      spl-git/spl.install
  4. 2
      spl-utils-git/PKGBUILD
  5. 10
      zfs-git/PKGBUILD
  6. 4
      zfs-git/zfs.install
  7. 6
      zfs-utils-git/PKGBUILD
  8. 151
      zfs-utils-git/zfs-utils.initcpio.hook
  9. 2
      zfs-utils-git/zfs-utils.initcpio.install

@ -5,7 +5,7 @@ AZB_ZOL_VERSION="0.6.3"
AZB_GIT_SPL_COMMIT="31cb5383"
AZB_GIT_ZFS_COMMIT="07dabd23"
AZB_GIT_PKGREL="1"
AZB_GIT_KERNEL_VERSION="3.15.1"
AZB_GIT_KERNEL_VERSION="3.15.2"
AZB_GIT_KERNEL_X32_PKGREL="1"
AZB_GIT_KERNEL_X64_PKGREL="1"
AZB_GIT_KERNEL_X32_VERSION="${AZB_GIT_KERNEL_VERSION}-${AZB_GIT_KERNEL_X32_PKGREL}"

@ -8,17 +8,17 @@
# The build script generates and updates the pkgver and _kernel* variables.
#
pkgname="spl-git"
pkgver=0.6.3_r0_g31cb538_3.15.1_1
pkgver=0.6.3_r0_g31cb538_3.15.2_1
pkgrel=1
license=('GPL')
# Used incase the i686 and x86_64 linux packages get out of sync with the
# PKGREL. This occurred on January 31, 2014 where i686 was versioned at
# 3.12.9-1 and x86_64 was versioned at 3.12.9-2.
_kernel_version_x32="3.15.1-1"
_kernel_version_x32_full="3.15.1-1"
_kernel_version_x64="3.15.1-1"
_kernel_version_x64_full="3.15.1-1"
_kernel_version_x32="3.15.2-1"
_kernel_version_x32_full="3.15.2-1"
_kernel_version_x64="3.15.2-1"
_kernel_version_x64_full="3.15.2-1"
if [[ $CARCH == "i686" ]]; then
_kernel_version=${_kernel_version_x32}

@ -28,8 +28,8 @@ check_hostid() {
run_depmod() {
echo ">>> Updating module dependencies. Please wait ..."
_kernel_version_x32_full="3.15.1-1"
_kernel_version_x64_full="3.15.1-1"
_kernel_version_x32_full="3.15.2-1"
_kernel_version_x64_full="3.15.2-1"
[[ $CARCH == "i686" ]] && _kernel_version_full=${_kernel_version_x32_full} || _kernel_version_full=${_kernel_version_x64_full}

@ -8,7 +8,7 @@
# The build script generates and updates the pkgver and _kernel* variables.
#
pkgname="spl-utils-git"
pkgver=0.6.3_r0_g31cb538_3.15.1_1
pkgver=0.6.3_r0_g31cb538_3.15.2_1
pkgrel=1
license=('GPL')
pkgdesc="Solaris Porting Layer kernel module support files."

@ -8,17 +8,17 @@
# The build script generates and updates the pkgver and _kernel* variables.
#
pkgname="zfs-git"
pkgver=0.6.3_r0_g07dabd2_3.15.1_1
pkgver=0.6.3_r0_g07dabd2_3.15.2_1
pkgrel=1
license=('CDDL')
# Used incase the i686 and x86_64 linux packages get out of sync with the
# PKGREL. This occurred on January 31, 2014 where i686 was versioned at
# 3.12.9-1 and x86_64 was versioned at 3.12.9-2.
_kernel_version_x32="3.15.1-1"
_kernel_version_x32_full="3.15.1-1"
_kernel_version_x64="3.15.1-1"
_kernel_version_x64_full="3.15.1-1"
_kernel_version_x32="3.15.2-1"
_kernel_version_x32_full="3.15.2-1"
_kernel_version_x64="3.15.2-1"
_kernel_version_x64_full="3.15.2-1"
if [[ $CARCH == "i686" ]]; then
_kernel_version=${_kernel_version_x32}

@ -13,8 +13,8 @@ post_upgrade() {
check_initramfs() {
echo ">>> Updating module dependencies. Please wait ..."
_kernel_version_x32_full="3.15.1-1"
_kernel_version_x64_full="3.15.1-1"
_kernel_version_x32_full="3.15.2-1"
_kernel_version_x64_full="3.15.2-1"
[[ $CARCH == "i686" ]] && _kernel_version_full=${_kernel_version_x32_full} || _kernel_version_full=${_kernel_version_x64_full}

@ -8,7 +8,7 @@
# The build script generates and updates the pkgver and _kernel* variables.
#
pkgname="zfs-utils-git"
pkgver=0.6.3_r0_g07dabd2_3.15.1_1
pkgver=0.6.3_r0_g07dabd2_3.15.2_1
pkgrel=1
license=('CDDL')
pkgdesc="Kernel module support files for the Zettabyte File System."
@ -23,8 +23,8 @@ source=("git+https://github.com/zfsonlinux/zfs.git#commit=07dabd23"
groups=("archzfs-git")
md5sums=('SKIP'
'9ddb0c8a94861f929d0fa741fdc49950'
'd36549e6e04d817051d50c3636f21132'
'87edeffee32ee1154a373f1291e81b49')
'a812c07d44548d35c8d63f84e96fb6eb'
'cdae71622688bc0325023e561a4fca37')
replaces=("zfs-utils")
provides=("zfs-utils")
conflicts=("zfs-utils" "zfs-utils-lts")

@ -1,85 +1,36 @@
ZPOOL_FORCE=""
zfs_get_bootfs () {
for zfs_dataset in $(/usr/bin/zpool list -H -o bootfs); do
case ${zfs_dataset} in
"" | "-")
# skip this line/dataset
;;
"no pools available")
return 1
;;
*)
ZFS_DATASET=${zfs_dataset}
return 0
;;
esac
done
return 1
}
zfs_mount_handler () {
local node=$1
if [ "$ZFS_DATASET" = "bootfs" ] ; then
if ! zfs_get_bootfs ; then
# Lets import everything and try again
/usr/bin/zpool import -N -a $ZPOOL_FORCE
if ! zfs_get_bootfs ; then
echo "ZFS: Cannot find bootfs."
return 1
fi
fi
fi
local pool="${ZFS_DATASET%%/*}"
local zpool_import_flags=""
local rwopt_exp=${rwopt:-ro}
if ! "/usr/bin/zpool" list -H $pool 2>&1 > /dev/null ; then
if [ "$rwopt_exp" != "rw" ]; then
msg "ZFS: Importing pool $pool readonly."
zpool_import_flags="-o readonly=on"
else
msg "ZFS: Importing pool $pool."
fi
if ! "/usr/bin/zpool" import $zpool_import_flags -N $pool $ZPOOL_FORCE ; then
echo "ZFS: Unable to import pool $pool."
return 1
fi
fi
local mountpoint=$("/usr/bin/zfs" get -H -o value mountpoint $ZFS_DATASET)
if [ "$mountpoint" = "legacy" ] ; then
mount -t zfs -o ${rwopt_exp} "$ZFS_DATASET" "$node"
else
mount -o zfsutil,${rwopt_exp} -t zfs "$ZFS_DATASET" "$node"
fi
}
#
# Global Variables
#
ZPOOL_FORCE="" # Force import of zfs pools
ZFS_DATASET="" # The type of zfs pool to mount
#
# mkinitcpio hooks
#
run_hook() {
# Force import the pools, useful if the pool has not properly been exported
# using 'zpool export <pool>'
[[ $zfs_force == 1 ]] && ZPOOL_FORCE='-f'
if [ "$root" = 'zfs' ]; then
mount_handler='zfs_mount_handler'
fi
# zfs specified on the kernel command line contains the type of dataset to
# mount
case $zfs in
"")
# skip this line/dataset
# skip this dataset
;;
auto|bootfs)
ZFS_DATASET='bootfs'
mount_handler="zfs_mount_handler"
;;
*)
ZFS_DATASET=$zfs
mount_handler="zfs_mount_handler"
;;
esac
# Set the mount handler function in mkinitcpio
mount_handler="zfs_mount_handler"
# Check for the hostid. An improper hostid is one reason why pools would
# refuse to import.
if [ ! -f "/etc/hostid" ] ; then
echo "ZFS: No hostid found on kernel command line or /etc/hostid. ZFS pools may not import correctly."
fi
@ -94,6 +45,76 @@ run_hook() {
run_latehook () {
/usr/bin/zpool import -N -a $ZPOOL_FORCE
# Mount the remaining
local node=$1
/usr/bin/zfs list -H -o name -t filesystem -r $ZFS_DATASET | while read -r ZFS_CHILDREN_DATASET ; do
local mountpoint=$("/usr/bin/zfs" get -H -o value mountpoint $ZFS_CHILDREN_DATASET)
if [ "$mountpoint" = "legacy" ] ; then
echo "ZFS: mounting legacy don't work with this hack: $ZFS_CHILDREN_DATASET"
#mount -t zfs -o ${rwopt_exp} "$ZFS_CHILDREN_DATASET" "$node"
return 1
else
mount -o zfsutil,${rwopt_exp} -t zfs "$ZFS_CHILDREN_DATASET" "$node/$mountpoint"
fi
done
}
#
# Helper Functions
#
zfs_mount_handler () {
# Import the bootfs datasets if zfs=bootfs
if [ "$ZFS_DATASET" = "bootfs" ] ; then
if ! zfs_get_bootfs_datasets ; then
# Lets import everything and try again
/usr/bin/zpool import -N -a $ZPOOL_FORCE
if ! zfs_get_bootfs_datasets ; then
echo "ZFS: Cannot find any bootfs datasets!"
return 1
fi
fi
fi
local pool="${ZFS_DATASET%%/*}" # Get datasets without /
local zpool_import_flags=""
local rwopt_exp=${rwopt:-ro} # rw option on kernel cmd line, ro is default
echo "ZFS_DATASET: $ZFS_DATASET"
echo "pool: $pool"
echo "rwopt_exp: $rwopt_exp"
# Attempt to import pools automatically
if ! "/usr/bin/zpool" list -H $pool 2>&1 > /dev/null ; then
if [ "$rwopt_exp" != "rw" ]; then
msg "ZFS: Importing pool $pool readonly."
zpool_import_flags="-o readonly=on"
fi
msg "ZFS: Importing pool $pool."
if ! "/usr/bin/zpool" import $zpool_import_flags -N $pool $ZPOOL_FORCE ; then
echo "ZFS: Unable to import pool $pool."
return 1
fi
fi
# Remaining mounts are done in run_latehook()
}
zfs_get_bootfs_datasets () {
for zfs_dataset in $(/usr/bin/zpool list -H -o bootfs); do
case ${zfs_dataset} in
"" | "-")
# skip this dataset
;;
"no pools available")
return 1
;;
*)
ZFS_DATASET=${zfs_dataset}
return 0
;;
esac
done
return 1
}
# vim:set ts=4 sw=4 ft=sh et:

@ -59,7 +59,7 @@ Command Line Setup:
To use ZFS as your boot filesystem:
zfs=bootfs or zfs=auto or root=zfs
zfs=bootfs
To use a pool or dataset:

Loading…
Cancel
Save