mirror
/
archzfs
mirror of https://github.com/archzfs/archzfs
2
0
Fork 0
Code Issues Releases Wiki Activity

Remove support for i686 arch

Browse Source 
Not supported by ZFSonLinux, so extra support here is a waste of time
and resources.
pull/57/merge
Jesus Alvarez 9 years ago
parent 4c9b68c8cb
commit 5d66b39950
7 changed files with 27 additions and 63 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      build.sh
  2. 42
      conf.sh
  3. 16
      lib.sh
  4. 8
      src/spl-utils/PKGBUILD.sh
  5. 8
      src/spl/PKGBUILD.sh
  6. 2
      src/zfs-utils/PKGBUILD.sh
  7. 2
      src/zfs/PKGBUILD.sh

12
build.sh
Unescape View File

@ -195,12 +195,12 @@ check_git_repo() {
update_def_pkgbuilds() {
# Calculate what the new pkgver would be for the git packages
full_kernel_version ${AZB_DEF_KERNEL_VERSION} ${AZB_DEF_KERNEL_PKGREL_X32} ${AZB_DEF_KERNEL_PKGREL_X64}
AZB_PKGVER=${AZB_ZOL_VERSION}_${AZB_KERNEL_VERSION_CLEAN_X64}
debug "AZB_PKGVER: $AZB_PKGVER"
# Replace the git commit id
# $AZB_GIT_ZFS_COMMIT
# $AZB_GIT_SPL_COMMIT
# local fkv=$(full_kernel_version ${AZB_DEF_KERNEL_VERSION} ${AZB_DEF_KERNEL_PKGREL_X32} ${AZB_DEF_KERNEL_PKGREL_X64})
AZB_KERNEL_VERSION_FULL=${AZB_DEF_KERNEL_VERSION}
AZB_PKGVER=${AZB_ZOL_VERSION}_$(full_kernel_version_no_hyphen ${AZB_DEF_KERNEL_VERSION})
debug "AZB_PKGVER: ${AZB_PKGVER}"
debug "AZB_ZOL_VERSION: ${AZB_ZOL_VERSION}"
debug "AZB_KERNEL_VERSION_FULL: ${AZB_KERNEL_VERSION_FULL}"
}

42
conf.sh
Unescape View File

@ -3,56 +3,24 @@ AZB_ZOL_VERSION="0.6.5.6"
# Kernel versions for default ZFS packages
AZB_DEF_PKGREL="1"
AZB_DEF_KERNEL_VERSION="4.5"
AZB_DEF_KERNEL_PKGREL_X32="1"
AZB_DEF_KERNEL_PKGREL_X64="1"
AZB_DEF_KERNEL_VERSION_X32="${AZB_DEF_KERNEL_VERSION}-${AZB_DEF_KERNEL_PKGREL_X32}"
AZB_DEF_KERNEL_VERSION_X64="${AZB_DEF_KERNEL_VERSION}-${AZB_DEF_KERNEL_PKGREL_X64}"
AZB_DEF_KERNEL_VERSION="4.5-1"
# Kernel version for GIT packages
AZB_DEF_GIT_SPL_COMMIT="5079f5b3"
AZB_DEF_GIT_ZFS_COMMIT="21f21fe8"
AZB_DEF_GIT_PKGREL="1"
AZB_DEF_GIT_KERNEL_VERSION="4.5"
AZB_DEF_GIT_KERNEL_PKGREL_X32="1"
AZB_DEF_GIT_KERNEL_PKGREL_X64="1"
AZB_DEF_GIT_KERNEL_VERSION_X32="${AZB_DEF_GIT_KERNEL_VERSION}-${AZB_DEF_GIT_KERNEL_PKGREL_X32}"
AZB_DEF_GIT_KERNEL_VERSION_X64="${AZB_DEF_GIT_KERNEL_VERSION}-${AZB_DEF_GIT_KERNEL_PKGREL_X64}"
AZB_DEF_GIT_KERNEL_VERSION="4.5-1"
# Kernel versions for LTS packages
AZB_LTS_PKGREL="1"
AZB_LTS_KERNEL_VERSION="4.4.7"
AZB_LTS_KERNEL_PKGREL_X32="1"
AZB_LTS_KERNEL_PKGREL_X64="1"
AZB_LTS_KERNEL_VERSION_X32="${AZB_LTS_KERNEL_VERSION}-${AZB_LTS_KERNEL_PKGREL_X32}"
AZB_LTS_KERNEL_VERSION_X64="${AZB_LTS_KERNEL_VERSION}-${AZB_LTS_KERNEL_PKGREL_X64}"
# Kernel versions for GIT LTS packages
AZB_DEF_LTS_SPL_COMMIT="5079f5b3"
AZB_DEF_LTS_ZFS_COMMIT="21f21fe8"
AZB_DEF_LTS_PKGREL="1"
AZB_DEF_LTS_KERNEL_VERSION="4.5"
AZB_DEF_LTS_KERNEL_PKGREL_X32="1"
AZB_DEF_LTS_KERNEL_PKGREL_X64="1"
AZB_DEF_LTS_KERNEL_VERSION_X32="${AZB_DEF_LTS_KERNEL_VERSION}-${AZB_DEF_LTS_KERNEL_PKGREL_X32}"
AZB_DEF_LTS_KERNEL_VERSION_X64="${AZB_DEF_LTS_KERNEL_VERSION}-${AZB_DEF_LTS_KERNEL_PKGREL_X64}"
AZB_LTS_KERNEL_VERSION="4.4.7-1"
# Archiso Configuration
AZB_ARCHISO_PKGREL="1"
AZB_KERNEL_ARCHISO_VERSION="4.4.5"
AZB_KERNEL_ARCHISO_X32_PKGREL="1"
AZB_KERNEL_ARCHISO_X64_PKGREL="1"
AZB_KERNEL_ARCHISO_X32_VERSION="${AZB_KERNEL_ARCHISO_VERSION}-${AZB_KERNEL_ARCHISO_X32_PKGREL}"
AZB_KERNEL_ARCHISO_X64_VERSION="${AZB_KERNEL_ARCHISO_VERSION}-${AZB_KERNEL_ARCHISO_X64_PKGREL}"
AZB_KERNEL_ARCHISO_VERSION="4.4.5-1"
# Testing repo Linux version dependencies
# AZB_KERNEL_TEST_VERSION="3.13.8"
# AZB_KERNEL_TEST_X32_PKGREL="1"
# AZB_KERNEL_TEST_X64_PKGREL="1"
# AZB_KERNEL_TEST_X32_VERSION="${AZB_KERNEL_TEST_VERSION}-${AZB_KERNEL_TEST_X32_PKGREL}"
# AZB_KERNEL_TEST_X64_VERSION="${AZB_KERNEL_TEST_VERSION}-${AZB_KERNEL_TEST_X64_PKGREL}"
# AZB_KERNEL_TEST_PKG_VERSION="${AZB_ZOL_VERSION}_${AZB_KERNEL_TEST_VERSION}"
# AZB_KERNEL_TEST_FULL_VERSION="${AZB_KERNEL_TEST_PKG_VERSION}-${AZB_GIT_PKGREL}"
# AZB_KERNEL_TEST_VERSION="3.13.8-1"
# Notification address
AZB_EMAIL="jeezusjr@gmail.com"

16
lib.sh
Unescape View File

@ -162,7 +162,8 @@ norun() {
local mesg=$1; shift
printf "${MAGENTA}XXXX NORUN: ${ALL_OFF}${BOLD}${mesg}${ALL_OFF}\n\n" "$mesg"
if [[ $# -gt 0 ]]; then
printf "%s\n\n" "$@"
printf '%s ' $@
printf '\n\n'
fi
}
@ -206,7 +207,7 @@ run_cmd_show_and_capture_output() {
RUN_CMD_OUTPUT=$(echo -e "$@" | source /dev/stdin | tee >(cat - >&6); exit ${PIPESTATUS[1]})
exec 1>&6 6>&- # Restore stdout and close file descriptor #6.
RUN_CMD_RETURN=$?
echo -e "\n"
echo
plain_one_line "Command returned:" "${RUN_CMD_RETURN}"
fi
}
@ -270,16 +271,19 @@ kernel_version_has_minor_version() {
}
# Returns the full kernel version. If $1 is "3.14-1" then full_kernel_version returns "3.14.0-1".
full_kernel_version() {
# $1: the kernel version
# $2: the Arch Linux PKGREL
# Determine if the kernel version has the format 3.14 or 3.14.1
local arg=$1
if ! kernel_version_has_minor_version $1; then
debug "full_kernel_version: Have kernel without minor version!"
# Kernel version has the format 3.14, so add a 0.
AZB_KERNEL_MINOR_VERSION=".0"
local arg=$(echo ${arg} | cut -f1 -d-)
local rev=$(echo ${1} | cut -f2 -d-)
printf "${arg}.0-${rev}"
return 0
fi
printf "${1}${AZB_KERNEL_MINOR_VERSION}-${2}"
printf ${arg}
}

8
src/spl-utils/PKGBUILD.sh
Unescape View File

@ -7,7 +7,7 @@ pkgname="${AZB_SPL_UTILS_PKGNAME}"
pkgver=${AZB_PKGVER}
pkgrel=${AZB_PKGREL}
pkgdesc="Solaris Porting Layer kernel module support files."
arch=("i686" "x86_64")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-${AZB_ZOL_VERSION}.tar.gz"
"spl-utils.hostid")
@ -21,14 +21,10 @@ build() {
cd "\${srcdir}/spl-${AZB_ZOL_VERSION}"
./autogen.sh
_at_enable=""
[ "\${CARCH}" == "i686" ] && _at_enable="--enable-atomic-spinlocks"
./configure --prefix=/usr \\
--libdir=/usr/lib \\
--sbindir=/usr/bin \\
--with-config=user \\
\${_at_enable}
--with-config=user
make
}

8
src/spl/PKGBUILD.sh
Unescape View File

@ -8,7 +8,7 @@ pkgver=${AZB_PKGVER}
pkgrel=${AZB_PKGREL}
pkgdesc="Solaris Porting Layer kernel modules."
depends=("${AZB_SPL_UTILS_PKGNAME}")
arch=("i686" "x86_64")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-${AZB_ZOL_VERSION}.tar.gz")
sha256sums=('${AZB_ZFS_SRC_HASH}}')
@ -21,15 +21,11 @@ build() {
cd "\${srcdir}/spl-${AZB_ZOL_VERSION}"
./autogen.sh
_at_enable=""
[ "\${CARCH}" == "i686" ] && _at_enable="--enable-atomic-spinlocks"
./configure --prefix=/usr \\
--libdir=/usr/lib \\
--sbindir=/usr/bin \\
--with-linux=/usr/lib/modules/${AZB_KERNEL_VERSION_FULL}/build \\
--with-config=kernel \\
\${_at_enable}
--with-config=kernel
make
}

2
src/zfs-utils/PKGBUILD.sh
Unescape View File

@ -8,7 +8,7 @@ pkgver=${AZB_PKGVER}
pkgrel=${AZB_PKGREL}
pkgdesc="Kernel module support files for the Zettabyte File System."
depends=("${AZB_SPL_PKGNAME}")
arch=("i686" "x86_64")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-${AZB_ZOL_VERSION}.tar.gz"
"zfs-utils.bash-completion-r1"

2
src/zfs/PKGBUILD.sh
Unescape View File

@ -8,7 +8,7 @@ pkgver=${AZB_PKGVER}
pkgrel=${AZB_PKGREL}
pkgdesc="Kernel modules for the Zettabyte File System."
depends=("${AZB_SPL_PKGNAME}" "${AZB_ZFS_UTILS_PKGNAME}")
arch=("i686" "x86_64")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-${AZB_ZOL_VERSION}.tar.gz")
sha256sums=('${AZB_ZFS_SRC_HASH}')

Write Preview
Loading…
Cancel
Save