Update ZFS to 0.6.0_rc13-1 with kernel 3.6.10

pull/7/head
Jesus Alvarez 12 years ago
parent 431f46b71c
commit 9ee5fc61a1
  1. 2
      backup
  2. 113
      build_archzfs.sh
  3. 14
      devsrc/spl-utils/PKGBUILD
  4. 14
      devsrc/spl/PKGBUILD
  5. 2
      devsrc/spl/spl.install
  6. 24
      devsrc/zfs-utils/PKGBUILD
  7. 16
      devsrc/zfs/PKGBUILD
  8. 218
      devsrc/zfs/PKGBUILD.py
  9. 207
      devsrc/zfs/PKGBUILD.yaml
  10. 2
      devsrc/zfs/zfs.install
  11. 40
      web_archzfs.rst
  12. BIN
      x86_64/archzfs.db.tar.xz
  13. BIN
      x86_64/archzfs.db.tar.xz.sig

@ -1 +1 @@
Subproject commit 899b62c414b15158600099aa4dedf162fe386c65
Subproject commit 0354821b7d60526aee00dc92d819a4e57606ca97

@ -1,32 +1,109 @@
#!/bin/sh
cd devsrc/spl-utils
unset ALL_OFF BOLD BLUE GREEN RED YELLOW
if [[ -t 2 && ! $USE_COLOR = "n" ]]; then
# prefer terminal safe colored and bold text when tput is supported
if tput setaf 0 &>/dev/null; then
ALL_OFF="$(tput sgr0)"
BOLD="$(tput bold)"
BLUE="${BOLD}$(tput setaf 4)"
GREEN="${BOLD}$(tput setaf 2)"
RED="${BOLD}$(tput setaf 1)"
YELLOW="${BOLD}$(tput setaf 3)"
else
ALL_OFF="\e[1;0m"
BOLD="\e[1;1m"
BLUE="${BOLD}\e[1;34m"
GREEN="${BOLD}\e[1;32m"
RED="${BOLD}\e[1;31m"
YELLOW="${BOLD}\e[1;33m"
fi
fi
readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
makepkg -sfic --noconfirm
makepkg -Sfc
plain() {
local mesg=$1; shift
printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
}
cd ../spl
msg() {
local mesg=$1; shift
printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
}
makepkg -sfic --noconfirm
makepkg -Sfc
msg2() {
local mesg=$1; shift
printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
}
cd ../zfs-utils
warning() {
local mesg=$1; shift
printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
}
makepkg -sfic --noconfirm
makepkg -Sfc
error() {
local mesg=$1; shift
printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
}
cd ../zfs
chroot_build() {
awk -v newsums="$(makepkg -g)" '
BEGIN {
if (!newsums) exit 1
}
makepkg -sfic --noconfirm
makepkg -Sfc
/^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*$/ {
if (!i) print newsums; i++
next
}
cd ../../backup/latest
1
' PKGBUILD > PKGBUILD.new && mv PKGBUILD{.new,}
sudo makechrootpkg -r /opt/chroot/extra-x86_64 -l zfs64 -- -i
if [[ $? != "0" ]]; then
error "Failed building \"${1}\""
exit 1;
fi
gpg --detach-sign -u 0EE7A126 --use-agent ${1}-*.pkg.tar.xz
if [[ $? != "0" ]]; then
warning "Failed signing \"${1}\""
return 2;
fi
makepkg -Sfc
if [[ $? != "0" ]]; then
warning "Failed creating package sources for \"${1}\""
return 3;
fi
}
find . -iname '*.src.tar*' -exec mv {} ../sources/ \;
find . -iname '*.pkg.tar*' -exec mv {} ../packages/ \;
mkdir -p backup/new/{x86_64,i686,sources}
cd ../../devsrc
packages="spl-utils spl zfs-utils zfs"
find . -iname '*.src.tar*' -exec mv {} ../backup/latest \;
find . -iname '*.pkg.tar*' -exec mv {} ../backup/latest \;
for pkg in $packages; do
cd "devsrc/${pkg}"
msg "Building ${pkg}"
chroot_build "${pkg}"
cd ../../
done
msg "Moving sources to backup/new/sources"
find devsrc/ -type f -iname '*.src.tar*' -exec mv {} backup/new/sources/ \;
msg "Moving x86_64 packages to backup/new/x86_64"
find devsrc/ -type f -iname '*x86_64.pkg.tar*' -exec mv {} backup/new/x86_64/ \;
msg "Rotating backup archives"
mv backup/latest/sources/* backup/sources/
mv backup/new/sources/* backup/latest/sources/
mv backup/latest/x86_64/* backup/packages/x86_64/
mv backup/new/x86_64/* backup/latest/x86_64/
rm -rf backup/new
msg "Copying packages to the repository directories"
cp backup/latest/x86_64/* x86_64/
msg "Adding packages to the repository"
NPKGS=$(find backup/latest/x86_64/ -type f -iname '*.pkg.tar.xz' -printf "%f ")
cd x86_64/
repo-add -s -v -d archzfs.db.tar.xz $NPKGS

@ -2,20 +2,22 @@
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=('spl-utils')
pkgver=0.6.0_rc12
pkgrel=8
pkgver=0.6.0_rc13_3.6.10
pkgrel=1
pkgdesc='Solaris Porting Layer kernel module support files.'
depends=('linux=3.6.10')
makedepends=('linux-headers=3.6.10')
arch=('x86_64')
url='http://zfsonlinux.org/'
source=(http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz spl-utils.hostid)
source=(http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz
spl-utils.hostid)
groups=('archzfs')
md5sums=('97222567144e2987bb18cd1f83fd6173' 'a54f0041a9e15b050f25c463f1db7449')
md5sums=('257c3373f40e190743e78fdf65368d2a'
'a54f0041a9e15b050f25c463f1db7449')
license=('GPL')
build() {
cd ${srcdir}/spl-0.6.0-rc12
cd ${srcdir}/spl-0.6.0-rc13
./autogen.sh
./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \
--with-config=user
@ -23,7 +25,7 @@ build() {
}
package() {
cd ${srcdir}/spl-0.6.0-rc12
cd ${srcdir}/spl-0.6.0-rc13
make DESTDIR=${pkgdir} install
install -D -m644 ${srcdir}/spl-utils.hostid ${pkgdir}/etc/hostid

@ -2,21 +2,21 @@
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=('spl')
pkgver=0.6.0_rc12
pkgrel=8
pkgver=0.6.0_rc13_3.6.10
pkgrel=1
pkgdesc='Solaris Porting Layer kernel modules.'
depends=('spl-utils=0.6.0_rc12' 'linux=3.6.10')
depends=('spl-utils=0.6.0_rc13_3.6.10' 'linux=3.6.10')
makedepends=('linux-headers=3.6.10')
arch=('x86_64')
url='http://zfsonlinux.org/'
source=(http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz)
source=(http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz)
groups=('archzfs')
md5sums=('97222567144e2987bb18cd1f83fd6173')
md5sums=('257c3373f40e190743e78fdf65368d2a')
license=('GPL')
install=spl.install
build() {
cd ${srcdir}/spl-0.6.0-rc12
cd ${srcdir}/spl-0.6.0-rc13
./autogen.sh
./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \
--with-config=kernel
@ -24,7 +24,7 @@ build() {
}
package() {
cd ${srcdir}/spl-0.6.0-rc12
cd ${srcdir}/spl-0.6.0-rc13
make DESTDIR=${pkgdir} install
# move module tree /lib -> /usr/lib

@ -1,4 +1,4 @@
KERNEL_VERSION=3.6.10-1-ARCH
KERNEL_VERSION=3.6.11-1-ARCH
post_install() {
check_hostid

@ -2,20 +2,28 @@
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=('zfs-utils')
pkgver=0.6.0_rc12
pkgrel=8
pkgver=0.6.0_rc13_3.6.10
pkgrel=1
pkgdesc="Kernel module support files for the Zettabyte File System."
depends=('spl=0.6.0_rc12' 'linux=3.6.10')
depends=('spl=0.6.0_rc13_3.6.10' 'linux=3.6.10')
makedepends=('linux-headers=3.6.10')
arch=('x86_64')
url='http://zfsonlinux.org/'
source=(http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz zfs-utils.bash-completion zfs-utils.initcpio.install zfs-utils.initcpio.hook zfs-utils.service)
source=(http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz
zfs-utils.bash-completion
zfs-utils.initcpio.install
zfs-utils.initcpio.hook
zfs-utils.service)
groups=('archzfs')
md5sums=('6524f2c20fe9ad33a97879981e5c9a45' '3e1c4a29c4f7d590e6a3041f2c61d6ff' 'b5c75ddf052d6c167459674013811885' '105fe46115c6fc6a335399c74bd58289' '161e6a5f5f314c9308b4a4565c01fe45')
md5sums=('0d166fe162d1c5d0ca49e16d89f05c81'
'3e1c4a29c4f7d590e6a3041f2c61d6ff'
'b5c75ddf052d6c167459674013811885'
'105fe46115c6fc6a335399c74bd58289'
'161e6a5f5f314c9308b4a4565c01fe45')
license=('CDDL')
build() {
cd ${srcdir}/zfs-0.6.0-rc12
cd ${srcdir}/zfs-0.6.0-rc13
./autogen.sh
./configure --prefix=/usr \
--sysconfdir=/etc \
@ -24,13 +32,13 @@ build() {
--datadir=/usr/share \
--includedir=/usr/include \
--with-udevdir=/lib/udev \
--libexecdir=/usr/lib/zfs-0.6.0-rc12 \
--libexecdir=/usr/lib/zfs-0.6.0-rc13 \
--with-config=user
make
}
package() {
cd ${srcdir}/zfs-0.6.0-rc12
cd ${srcdir}/zfs-0.6.0-rc13
make DESTDIR=${pkgdir} install
# move module tree /lib -> /usr/lib

@ -2,21 +2,21 @@
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=('zfs')
pkgver=0.6.0_rc12
pkgrel=8
pkgver=0.6.0_rc13_3.6.10
pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System."
depends=('spl=0.6.0_rc12' 'zfs-utils=0.6.0_rc12' 'linux=3.6.10')
depends=('spl=0.6.0_rc13_3.6.10' 'zfs-utils=0.6.0_rc13_3.6.10' 'linux=3.6.10')
makedepends=('linux-headers=3.6.10')
arch=('x86_64')
url='http://zfsonlinux.org/'
source=(http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz)
source=(http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz)
groups=('archzfs')
md5sums=('6524f2c20fe9ad33a97879981e5c9a45')
md5sums=('0d166fe162d1c5d0ca49e16d89f05c81')
license=('CDDL')
install=zfs.install
build() {
cd ${srcdir}/zfs-0.6.0-rc12
cd ${srcdir}/zfs-0.6.0-rc13
./autogen.sh
./configure --prefix=/usr \
--sysconfdir=/etc \
@ -25,13 +25,13 @@ build() {
--datadir=/usr/share \
--includedir=/usr/include \
--with-udevdir=/lib/udev \
--libexecdir=/usr/lib/zfs-0.6.0-rc12 \
--libexecdir=/usr/lib/zfs-0.6.0-rc13 \
--with-config=kernel
make
}
package() {
cd ${srcdir}/zfs-0.6.0-rc12
cd ${srcdir}/zfs-0.6.0-rc13
make DESTDIR=${pkgdir} install
# move module tree /lib -> /usr/lib

@ -1,218 +0,0 @@
# PKGBUILD.py for Arch ZFS
# Maintainer: Jesus Alvarez <jeezusjr@gmail.com>
# Created: Fri Oct 26 12:56:02 PDT 2012
# Modified: Tue Dec 04 23:31:02 PST 2012
#
# This is the PKGBUILD input file for the arch-zfs packaging project.
# For more information on how to use this file, please read the "hacking.rst"
# developer documentation.
#
# This file is meant to be used with build.py
#
# Varibles provide by build.py:
#
# $PKGNAMES:
# $SOURCE_FILES:
# $BUILD_CONF:
# $SOURCE_NAME:
import subprocess
LOG_MESSAGE = 'Starting the Arch ZFS Build System...'
HELP_MESSAGE = 'Arch ZFS Package Building System'
# AUR should be the separate packages of SPLIT
AUR = ('spl-utils', 'spl', 'zfs-utils', 'zfs')
SPLIT = ('spl-split', 'zfs-split')
# GROUPS are all the possible package configurations that could be built.
GROUPS = {'aur': {'packages': AUR,
'sources': True,
'build': False,
'repackage': False,
'repo': False, },
'split': {'packages': SPLIT,
'sources': True,
'build': True,
'repackage': False,
'repo': False, },
}
# SOURCE_VER is the version of the software we are building. This string will
# be used when referring to the build directory in the PKGBUILDs. This number
# is usually the upstream version number contained within the name of the
# downloaded sources. PACKAGE_VER is used in the PKGBUILD as the package
# version number.
SOURCE_VER = '0.6.0-rc12'
PACKAGE_VER = SOURCE_VER.replace('-', '_')
# PACKAGE_REL will be used as pkgrel in the PKGBUILD.
PACKAGE_REL = 6
# The file names to the upstream sources. build.py will match the length of the
# following keys to package names. So if the package is 'spl-utils' then it
# will match 'spl' in the key below and that will be the source used in the
# PKGBUILD. The files are downloaded and saved to the sources directory in the
# same directory as PKGBUILD.py.
SOURCE_URLS = {
'spl': 'http://github.com/downloads/zfsonlinux/spl/spl-' + SOURCE_VER + '.tar.gz',
'zfs': 'http://github.com/downloads/zfsonlinux/zfs/zfs-' + SOURCE_VER + '.tar.gz'
}
# Specify extra dependencies here
_linux_ver = '3.6.9'
SPL_DEPENDS = "'linux={}'".format(_linux_ver)
SPL_MAKEDEPENDS = "'linux-headers={}'".format(_linux_ver)
ZFS_DEPENDS = SPL_DEPENDS
ZFS_MAKEDEPENDS = SPL_MAKEDEPENDS
# The last few constants are the sections of a PKGBUILD. By default, these
# constants, when combined together, take the shape of a split package. Each
# package defined in GROUPS above must have an accompanying constant. Use
# underscores ('_') instead of hyphens ('-') when defining the package
# constants. Finally, these constants must also be defined as raw strings
# beginning with 'r'.
BODY = r"""
# Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=($PKGNAMES)
pkgver=$PACKAGE_VER
pkgrel=$PACKAGE_REL
arch=('x86_64')
url='http://zfsonlinux.org/'
source=($SOURCE_FILES)
groups=('archzfs')
md5sums=('97222567144e2987bb18cd1f83fd6173' spl-0.6.0-rc12.tar.gz
'a54f0041a9e15b050f25c463f1db7449' spl-utils.hostid
'99697389f4107ec073edfdf0efd14249' spl.install
'85435c100d9c1dadad7b961c3cb965f6' zfs-0.6.0-rc11.tar.gz
'6524f2c20fe9ad33a97879981e5c9a45' zfs-0.6.0-rc12.tar.gz
'3e1c4a29c4f7d590e6a3041f2c61d6ff' zfs-utils.bash-completion
'105fe46115c6fc6a335399c74bd58289' zfs-utils.initcpio.hook
'b5c75ddf052d6c167459674013811885' zfs-utils.initcpio.install
'161e6a5f5f314c9308b4a4565c01fe45' zfs-utils.service
'7ac100ebe01cc26da63a06effb2c0405' zfs.install
)
spl-all:: license=('GPL')
zfs-all:: license=('CDDL')
spl:: install=spl.install
zfs:: install=zfs.install"""
BUILD = r"""
build() {
git:: cd "$$srcdir"
git:: msg "Connecting to GIT server...."
git:: if [[ -d "$GITNAME" ]]; then
git:: cd "$GITNAME" && git pull origin
git:: msg "The local files are updated."
git:: else
git:: git clone "$GITROOT" "$GITNAME"
git:: fi
git:: msg "GIT checkout done or server timeout"
git:: msg "Starting build..."
git:: rm -rf "$$srcdir/$GITNAME-build"
git:: git clone "$$srcdir/$GITNAME" "$$srcdir/$GITNAME-build"
git:: cd "$$srcdir/$GITNAME-build"
cd $${srcdir}/$SOURCE_NAME
./autogen.sh
spl-all:: ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \
zfs-all:: ./configure --prefix=/usr \
zfs-all:: --sysconfdir=/etc \
zfs-all:: --sbindir=/usr/sbin \
zfs-all:: --libdir=/usr/lib \
zfs-all:: --datadir=/usr/share \
zfs-all:: --includedir=/usr/include \
zfs-all:: --with-udevdir=/lib/udev \
zfs-all:: --libexecdir=/usr/lib/$SOURCE_NAME \
--with-config=$BUILD_CONF
make
}"""
SPL_UTILS = r"""
package_spl-utils() {
pkgdesc='Solaris Porting Layer kernel module support files.'
cd $${srcdir}/$SOURCE_NAME
make DESTDIR=$${pkgdir} install
split:: # Remove uneeded files
split:: rm -r $${pkgdir}/{lib,usr/src}
install -D -m644 $${srcdir}/spl-utils.hostid $${pkgdir}/etc/hostid
}"""
SPL = r"""
package_spl() {
pkgdesc='Solaris Porting Layer kernel modules.'
depends=('spl-utils=$PACKAGE_VER' $SPL_DEPENDS)
makedepends=($SPL_MAKEDEPENDS)
cd $${srcdir}/$SOURCE_NAME
make DESTDIR=$${pkgdir} install
# move module tree /lib -> /usr/lib
cp -r $${pkgdir}/{lib,usr}
rm -r $${pkgdir}/lib
split:: # Remove uneeded files
split:: rm -r $${pkgdir}/usr/sbin
}"""
ZFS_UTILS = r"""
package_zfs-utils() {
pkgdesc="Kernel module support files for the Zettabyte File System."
depends=('spl=$PACKAGE_VER' $ZFS_DEPENDS)
makedepends=($ZFS_MAKEDEPENDS)
cd $${srcdir}/$SOURCE_NAME
make DESTDIR=$${pkgdir} install
# move module tree /lib -> /usr/lib
cp -r $${pkgdir}/{lib,usr}
rm -r $${pkgdir}/lib
split:: # Remove the stuff that was included with the zfs package
split:: rm -r $${pkgdir}/usr/{lib/modules,src}
install -D -m644 $${srcdir}/zfs-utils.initcpio.hook $${pkgdir}/usr/lib/initcpio/hooks/zfs
install -D -m644 $${srcdir}/zfs-utils.initcpio.install $${pkgdir}/usr/lib/initcpio/install/zfs
install -D -m644 $${srcdir}/zfs-utils.service $${pkgdir}/usr/lib/systemd/system/zfs.service
install -D -m644 $${srcdir}/zfs-utils.bash-completion $${pkgdir}/usr/share/bash-completion/completions/zfs
}"""
ZFS = r"""
package_zfs() {
pkgdesc="Kernel modules for the Zettabyte File System."
depends=('spl=$PACKAGE_VER' 'zfs-utils=$PACKAGE_VER' $ZFS_DEPENDS)
makedepends=($ZFS_MAKEDEPENDS)
cd $${srcdir}/$SOURCE_NAME
make DESTDIR=$${pkgdir} install
split:: # Remove stuff that will be included with zfs-utils
split:: rm -r $${pkgdir}/{lib/udev,etc,sbin}
split:: rm -r $${pkgdir}/usr/{bin,include,lib,sbin,share}
# move module tree /lib -> /usr/lib
cp -r $${pkgdir}/{lib,usr}
rm -r $${pkgdir}/lib
}"""
# Constants and callbacks for repository handling
REPO_NAME = 'archzfs'
REPO_PATH = 'archzfs/x86_64'
REPO_GROUP = 'split'
def repo_post_cb():
"""Called after the repository has been updated."""
pass
# subprocess.call(['./copy_sources.sh'])
# flake8: noqa

@ -1,207 +0,0 @@
# PKGBUILD.yaml for Arch ZFS
# Maintainer: Jesus Alvarez <jeezusjr@gmail.com>
# Created: Mon Dec 10 12:31:30 PST 2012
# Modified: Tue Dec 11 17:33:19 PST 2012
#
# This file is meant to be used with pbldr.
#
# upstream_version is the version of the software we are building. This string
# will be used when referring to the build directory in the PKGBUILDs. This
# number is usually the upstream version number contained within the name of
# the downloaded sources.
upstream_version: 0.6.0-rc12
# package_rel will be used as pkgrel in the PKGBUILD.
package_rel: 6
# Specify extra dependencies here
kernel_ver: 3.6.9
# URLs to upstream source code
spl: http://github.com/downloads/zfsonlinux/spl/spl-{}.tar.gz
zfs: http://github.com/downloads/zfsonlinux/zfs/zfs-{}.tar.gz
aur_packages:
spl-utils: spl
spl: spl
zfs-utils: zfs
zfs: zfs
split_packages:
spl-split: spl
zfs-split: zfs
package_groups:
# The aur package group contains the zfs packages split up into four
# separate packages. This is done because AUR does not support split
# packages. When building from AUR, the process takes twice as long as
# split packages because each module is built twice.
aur:
packages: aur_packages
# The following action attributes are used when runing the pbldr tool
# without specifying packages to use.
sources: True # Include building sources for this group
build: False # This group should not be compiled and built
repo: False # Do not create a repository with this group
# The split group allows zfs and zfs-utils to be built at the same time,
# reducing the amount of time to compile and build the packages by half as
# compared to the AUR packages. This package group is what is used to
# create the archzfs repository.
split:
packages: split_packages
sources: True # The split sources will contain the "split" in the file
# name.
build: True
repo: True
# Additional package dependencies
spl_depends: "linux={kernel_ver}"
spl_makedepends: "linux-headers={kernel_ver}"
zfs_depends: spl_depends
zfs_makedepends: spl_makedepends
# The last few constants are the sections of a PKGBUILD. By default, these
# constants, when combined together, take the shape of a split package. Each
# package defined in GROUPS above must have an accompanying constant. Use
# underscores ('_') instead of hyphens ('-') when defining the package
# constants. Finally, these constants must also be defined as raw strings
# beginning with 'r'.
body: |
# Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=($PKGNAMES)
pkgver=$PACKAGE_VER
pkgrel=$PACKAGE_REL
arch=('x86_64')
url='http://zfsonlinux.org/'
source=($SOURCE_FILES)
groups=('archzfs')
md5sums=($MD5SUMS)
spl-all:: license=('GPL')
zfs-all:: license=('CDDL')
spl:: install=spl.install
zfs:: install=zfs.install"""
build: |
build() {
git:: cd "$$srcdir"
git:: msg "Connecting to GIT server...."
git:: if [[ -d "$GITNAME" ]]; then
git:: cd "$GITNAME" && git pull origin
git:: msg "The local files are updated."
git:: else
git:: git clone "$GITROOT" "$GITNAME"
git:: fi
git:: msg "GIT checkout done or server timeout"
git:: msg "Starting build..."
git:: rm -rf "$$srcdir/$GITNAME-build"
git:: git clone "$$srcdir/$GITNAME" "$$srcdir/$GITNAME-build"
git:: cd "$$srcdir/$GITNAME-build"
cd $${srcdir}/$SOURCE_NAME
./autogen.sh
spl-all:: ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \
zfs-all:: ./configure --prefix=/usr \
zfs-all:: --sysconfdir=/etc \
zfs-all:: --sbindir=/usr/sbin \
zfs-all:: --libdir=/usr/lib \
zfs-all:: --datadir=/usr/share \
zfs-all:: --includedir=/usr/include \
zfs-all:: --with-udevdir=/lib/udev \
zfs-all:: --libexecdir=/usr/lib/$SOURCE_NAME \
--with-config=$BUILD_CONF
make
}
spl_utils: |
package_spl-utils() {
pkgdesc='Solaris Porting Layer kernel module support files.'
READD KERNEL DEPENDS
cd $${srcdir}/$SOURCE_NAME
make DESTDIR=$${pkgdir} install
split:: # Remove uneeded files
split:: rm -r $${pkgdir}/{lib,usr/src}
install -D -m644 $${srcdir}/spl-utils.hostid $${pkgdir}/etc/hostid
}
spl: |
package_spl() {
pkgdesc='Solaris Porting Layer kernel modules.'
depends=('spl-utils=$PACKAGE_VER' $SPL_DEPENDS)
makedepends=($SPL_MAKEDEPENDS)
cd $${srcdir}/$SOURCE_NAME
make DESTDIR=$${pkgdir} install
# move module tree /lib -> /usr/lib
cp -r $${pkgdir}/{lib,usr}
rm -r $${pkgdir}/lib
split:: # Remove uneeded files
split:: rm -r $${pkgdir}/usr/sbin
}
zfs_utils: |
package_zfs-utils() {
pkgdesc="Kernel module support files for the Zettabyte File System."
depends=('spl=$PACKAGE_VER' $ZFS_DEPENDS)
makedepends=($ZFS_MAKEDEPENDS)
cd $${srcdir}/$SOURCE_NAME
make DESTDIR=$${pkgdir} install
# move module tree /lib -> /usr/lib
cp -r $${pkgdir}/{lib,usr}
rm -r $${pkgdir}/lib
split:: # Remove the stuff that was included with the zfs package
split:: rm -r $${pkgdir}/usr/{lib/modules,src}
install -D -m644 $${srcdir}/zfs-utils.initcpio.hook $${pkgdir}/usr/lib/initcpio/hooks/zfs
install -D -m644 $${srcdir}/zfs-utils.initcpio.install $${pkgdir}/usr/lib/initcpio/install/zfs
install -D -m644 $${srcdir}/zfs-utils.service $${pkgdir}/usr/lib/systemd/system/zfs.service
install -D -m644 $${srcdir}/zfs-utils.bash-completion $${pkgdir}/usr/share/bash-completion/completions/zfs
}
zfs: |
package_zfs() {
pkgdesc="Kernel modules for the Zettabyte File System."
depends=('spl=$PACKAGE_VER' 'zfs-utils=$PACKAGE_VER' $ZFS_DEPENDS)
makedepends=($ZFS_MAKEDEPENDS)
cd $${srcdir}/$SOURCE_NAME
make DESTDIR=$${pkgdir} install
split:: # Remove stuff that will be included with zfs-utils
split:: rm -r $${pkgdir}/{lib/udev,etc,sbin}
split:: rm -r $${pkgdir}/usr/{bin,include,lib,sbin,share}
# move module tree /lib -> /usr/lib
cp -r $${pkgdir}/{lib,usr}
rm -r $${pkgdir}/lib
}
md5sums: |
'97222567144e2987bb18cd1f83fd6173' spl-0.6.0-rc12.tar.gz
'a54f0041a9e15b050f25c463f1db7449' spl-utils.hostid
'99697389f4107ec073edfdf0efd14249' spl.install
'85435c100d9c1dadad7b961c3cb965f6' zfs-0.6.0-rc11.tar.gz
'6524f2c20fe9ad33a97879981e5c9a45' zfs-0.6.0-rc12.tar.gz
'3e1c4a29c4f7d590e6a3041f2c61d6ff' zfs-utils.bash-completion
'105fe46115c6fc6a335399c74bd58289' zfs-utils.initcpio.hook
'b5c75ddf052d6c167459674013811885' zfs-utils.initcpio.install
'161e6a5f5f314c9308b4a4565c01fe45' zfs-utils.service
'7ac100ebe01cc26da63a06effb2c0405' zfs.install

@ -1,4 +1,4 @@
KERNEL_VERSION=3.6.10-1-ARCH
KERNEL_VERSION=3.6.11-1-ARCH
post_install() {
check_initramfs

@ -1,7 +1,7 @@
======================================
Arch ZFS - ZFS On Linux Kernel Modules
======================================
:Modified: Thu Dec 13 20:24:33 PST 2012
:Modified: Fri Dec 21 01:58:37 PST 2012
:status: hidden
:slug: archzfs
@ -98,7 +98,7 @@ current maintainer is Jesus Alvarez and his key can be verified at
demizerone.com_ This key is not trusted by any of the Arch Linux Master Keys.
0EE7A126_
~~~~~~~~~
=========
The short version::
@ -150,13 +150,11 @@ ZFS Cheatsheet: http://lildude.co.uk/zfs-cheatsheet
#. Use cgdisk and create a GPT partition table
=============================
Part Size Type
==== ===== =============
1 512M EFI (ef00)
2 512M Ext4 (8200)
2 117G Solaris Root (bf00)
=============================
Note the EFI partion will contain the kernel images
@ -499,12 +497,19 @@ Perform pacman update and restart
Create a new branch in git
==========================
(optional)
The new git branch should be name for the current version of the ZFS on Linux
project and the Linux Kernel version it will target.
.. code-block:: console
$ git checkout -b zfs-0.6.0-rc12_linux-3.7
$ git checkout -b zfs-0.6.0-rc12-linux-3.7.X
This branch has 'X' as the last revision number because when a minor point
release kernel is released, such as 3.7, it can take a while for it to move
into the [core] repository. The 3.7 kernel can remain in testing for multiple
revisions.
Update the ZFS PKGBUILDs
========================
@ -526,33 +531,22 @@ makepkg to build the packages:
.. code-block:: console
$ makepkg -sfi
$ makepkg -sfic
.. note:: If either SPL or ZFS do not build due to kernel incompatibilities,
patches will be needed to allow building to continue. See `Patching
ZFS`_.
Load the ZFS kernel modules
---------------------------
.. code-block:: console
# modprobe zfs
Start the ZFS service
---------------------
Import and mount your ZFS pools
-------------------------------
This step is not necessary if you are using ZFS as root.
.. code-block:: console
# systemctl daemon-reload
# zpool import -a
# zfs mount -a
Inspect package files
---------------------
.. code-block:: console
$ pacman -Qnp <package>
# systemctl start zfs
Add packages to repository
--------------------------
@ -562,7 +556,7 @@ found `here <https://github.com/demizer/binfiles>`_.
.. code-block:: console
$ repo_add.py -r archzfs -d
$ repo_add.py -r archzfs -v rc12-9
Testing
-------

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save