Update lts packages for kernel 4.4.21-1

Also make sure initcpio.hook parses without errors in ash!

Issue #77
extramodules
Jesus Alvarez 9 years ago
parent 3efb00f4d4
commit 27bf7e595b
  1. 23
      TODO.rst
  2. 4
      conf.sh
  3. 2
      packages/linux-lts/spl-linux-lts
  4. 2
      packages/linux-lts/spl-utils-linux-lts
  5. 2
      packages/linux-lts/zfs-linux-lts
  6. 2
      packages/linux-lts/zfs-utils-linux-lts
  7. 4
      src/kernels/linux-lts.sh
  8. 38
      src/zfs-utils/zfs-utils.initcpio.hook
  9. 1
      src/zfs-utils/zfs-utils.initcpio.install
  10. 20
      testing/README.rst

@ -2,6 +2,8 @@
Things To Do
============
* Thu Sep 15 09:04 2016: test.sh mirrorlist should be regenerated after 24 hours
* Sun May 29 09:37 2016: auto increment numbers when building test packages
New version for kernel change
@ -12,3 +14,24 @@ Things To Do
Signing should be done in repo.sh when adding the packages to the archzfs repo
- Mon Sep 12 22:32 2016: git_calc_check should not be used in repo.sh
If commits are pushed after the git packages have been built, the version used in repo.sh will not be correct.
- Sun Apr 19 19:45 2015: Found more tests at https://github.com/behlendorf/xfstests
Requires additional pools
- Sun Apr 19 19:51 2015: ztest slides http://blog.delphix.com/csiden/files/2012/01/ZFS_Backward_Compatability_Testing.pdf
- Sun Apr 19 20:05 2015: What I am trying to do is described here: https://github.com/zfsonlinux/zfs/issues/1534
- Mon Sep 12 22:27 2016: add a test for zfs-archiso-linux packages to install in current archiso
- Sat Sep 17 00:41 2016: Document ghetto linting the ash initcpio.hook file
pacman -S dash
dash
. src/zfs-utils/zfs-utils.initcpio.hook
run_hook

@ -5,8 +5,8 @@ zol_version="0.6.5.8"
zfs_src_hash="d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84"
spl_src_hash="2d22117106782222d2b7da88cc657b7b9c44d281b1cc74d60761e52d33ab1155"
zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
zfs_initcpio_install_hash="dfafce18240722bee26b5864982b4db1cd6d682c4b93a8b1f4832c98686f50d2"
zfs_initcpio_hook_hash="5f749dbe3b853c5b569d5050b50226b53961cf1fa2cfc5cea0ecc3df75885d2f"
zfs_initcpio_install_hash="17114052aa20c528f022f7f1349971aa28810e2ed2c97871226b5679a91f7e77"
zfs_initcpio_hook_hash="90d50df503464e8d76770488dbd491cb633ee27984d4d3a31b03f1a4e7492038"
# Notification address
email="jeezusjr@gmail.com"

@ -1 +1 @@
Subproject commit 7cbb570c06b7819b7201379191c9dbb92c802b86
Subproject commit f6c58bf55753863ba4df813ad3c04e7058a5850b

@ -1 +1 @@
Subproject commit c27e32f9595155103b13e80ffe13dd78c83130e2
Subproject commit 144d25614330d062396e22c8b60c6286755efa2c

@ -1 +1 @@
Subproject commit a7f29c2b6b597c91ff12a746ba606fc1693f0393
Subproject commit 84b18694df6204049600b98ffd81599363345ea4

@ -1 +1 @@
Subproject commit 5e3316b6912208c89950649a3e47b4f9ff77e543
Subproject commit 45d36a94800d001c2c1a7fcd2305d027b08fe057

@ -3,8 +3,8 @@ mode_name="lts"
mode_desc="Select and use the packages for the linux-lts kernel"
# Kernel versions for LTS packages
pkgrel="3"
kernel_version="4.4.20-1"
pkgrel="2"
kernel_version="4.4.21-1"
header="\
# Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>

@ -1,3 +1,9 @@
#
# WARNING: This script is parsed by ash in busybox at boot time, not bash!
# http://linux.die.net/man/1/ash
# https://wiki.ubuntu.com/DashAsBinSh
# http://www.jpsdomain.org/public/2008-JP_bash_vs_dash.pdf
#
ZPOOL_FORCE=""
ZPOOL_IMPORT_FLAGS=""
@ -31,24 +37,24 @@ zfs_mount_handler () {
fi
local pool="${ZFS_DATASET%%/*}"
local rwopt_exp=${rwopt:-ro}
local rwopt_exp="${rwopt:-ro}"
if ! zpool list -H ${pool} 2>1 > /dev/null ; then
if [ "${rwopt_exp}" != "rw" ]; then
if ! zpool list -H "${pool}" 2>1 > /dev/null ; then
if [ ! "${rwopt_exp}" = "rw" ]; then
msg "ZFS: Importing pool ${pool} readonly."
ZPOOL_IMPORT_FLAGS="${ZPOOL_IMPORT_FLAGS} -o readonly=on"
else
msg "ZFS: Importing pool ${pool}."
fi
if ! zpool import ${ZPOOL_IMPORT_FLAGS} -N ${pool} ${ZPOOL_FORCE} ; then
if ! zpool import ${ZPOOL_IMPORT_FLAGS} -N "${pool}" ${ZPOOL_FORCE} ; then
die "ZFS: Unable to import pool ${pool}."
fi
fi
local node=$1
local tab_file="$node/etc/fstab"
local zfs_datasets=$(zfs list -H -o name -t filesystem -r "${ZFS_DATASET}")
local node="$1"
local tab_file="${node}/etc/fstab"
local zfs_datasets="$(zfs list -H -o name -t filesystem -r ${ZFS_DATASET})"
# Mount the root, and any child datasets
for dataset in ${zfs_datasets}; do
@ -75,35 +81,33 @@ zfs_mount_handler () {
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'
[ ! "${zfs_force}" = "" ] && ZPOOL_FORCE="-f"
# Add import directory to import command flags
[[ "${zfs_import_dir}" != "" ]] && ZPOOL_IMPORT_FLAGS="${ZPOOL_IMPORT_FLAGS} -d ${zfs_import_dir}"
[ ! "${zfs_import_dir}" = "" ] && ZPOOL_IMPORT_FLAGS="${ZPOOL_IMPORT_FLAGS} -d ${zfs_import_dir}"
# Wait 15 seconds for ZFS devices to show up
[[ "${zfs_wait}" == "" ]] && ZFS_WAIT="15" || ZFS_WAIT="${zfs_wait}"
[ "${zfs_wait}" = "" ] && ZFS_WAIT="15" || ZFS_WAIT="${zfs_wait}"
if [[ "${root}" == 'zfs' ]]; then
mount_handler='zfs_mount_handler'
fi
[ "${root}" = "zfs" ] && mount_handler="zfs_mount_handler"
case ${zfs} in
"")
# skip this line/dataset
;;
auto|bootfs)
ZFS_DATASET='bootfs'
ZFS_DATASET="bootfs"
mount_handler="zfs_mount_handler"
;;
*)
ZFS_DATASET=${zfs}
ZFS_DATASET="${zfs}"
mount_handler="zfs_mount_handler"
;;
esac
# Allow up to n seconds for zfs device to show up
for i in {1..${ZFS_WAIT}}; do
[[ -c "/dev/zfs" ]] && break
for i in $(seq 1 ${ZFS_WAIT}); do
[ -c "/dev/zfs" ] && break
sleep 1
done
}

@ -17,6 +17,7 @@ build() {
dbufstat.py \
fsck.zfs \
mount.zfs \
seq \
zdb \
zed \
zfs \

@ -1,25 +1,7 @@
=====================
archzfs testing guide
=====================
:Modified: Mon Sep 12 22:33 2016
-----
Notes
-----
- Mon Sep 12 22:32 2016: git_calc_check should not be used in repo.sh
If commits are pushed after the git packages have been built, the version used in repo.sh will not be correct.
- Sun Apr 19 19:45 2015: Found more tests at https://github.com/behlendorf/xfstests
Requires additional pools
- Sun Apr 19 19:51 2015: ztest slides http://blog.delphix.com/csiden/files/2012/01/ZFS_Backward_Compatability_Testing.pdf
- Sun Apr 19 20:05 2015: What I am trying to do is described here: https://github.com/zfsonlinux/zfs/issues/1534
- Mon Sep 12 22:27 2016: add a test for zfs-archiso-linux packages to install in current archiso
:Modified: Sat Sep 17 00:43 2016
--------
Overview

Loading…
Cancel
Save