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

fix conflicts

Browse Source
pull/129/head
Jan Houben 8 years ago
parent a495e1c012
commit da70746dbc
No known key found for this signature in database
GPG Key ID: B7C6B271DEB42D74
6 changed files with 23 additions and 11 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. 8
      src/kernels/common.sh
  2. 4
      src/kernels/linux-hardened.sh
  3. 4
      src/kernels/linux-lts.sh
  4. 8
      src/kernels/linux.sh
  5. 6
      src/spl/PKGBUILD.sh
  6. 4
      src/zfs/PKGBUILD.sh

8
src/kernels/common.sh
Unescape View File

@ -28,8 +28,8 @@ update_common_pkgbuilds() {
zfs_pkgver=${zol_version}
spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel}
spl_utils_conflicts="'spl-utils-common-git'"
zfs_utils_conflicts="'zfs-utils-common-git'"
spl_utils_conflicts="'spl-utils-common-git' 'spl-utils-linux-git' 'spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git'"
zfs_utils_conflicts="'zfs-utils-common-git' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git'"
spl_utils_pkgname="spl-utils-common"
zfs_utils_pkgname="zfs-utils-common"
# Paths are relative to build.sh
@ -50,8 +50,8 @@ update_common_git_pkgbuilds() {
zfs_pkgver="" # Set later by call to git_calc_pkgver
spl_pkgrel=${pkgrel_git}
zfs_pkgrel=${pkgrel_git}
spl_utils_conflicts="'spl-utils-common'"
zfs_utils_conflicts="'zfs-utils-common'"
spl_utils_conflicts="'spl-utils-common' 'spl-utils-linux-git' 'spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git'"
zfs_utils_conflicts="'zfs-utils-common' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git'"
spl_utils_pkgname="spl-utils-common-git"
zfs_utils_pkgname="zfs-utils-common-git"
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"

4
src/kernels/linux-hardened.sh
Unescape View File

@ -46,6 +46,8 @@ update_linux_hardened_pkgbuilds() {
spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel}
spl_conflicts="'spl-linux-hardened-git'"
spl_headers_conflicts="'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_headers_conflicts="'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'"
zfs_conflicts="'zfs-linux-hardened-git'"
spl_utils_pkgname="spl-utils-common"
spl_pkgname="spl-linux-hardened"
@ -75,6 +77,8 @@ update_linux_hardened_pkgbuilds() {
# spl_pkgrel=${pkgrel_git}
# zfs_pkgrel=${pkgrel_git}
# spl_conflicts="'spl-linux-hardened'"
# spl_headers_conflicts="'spl-linux-hardened-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
# zfs_headers_conflicts="'zfs-linux-hardened-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'"
# zfs_conflicts="'zfs-linux-hardened'"
# spl_utils_pkgname="spl-utils-common-git"
# spl_pkgname="spl-linux-hardened-git"

4
src/kernels/linux-lts.sh
Unescape View File

@ -45,6 +45,8 @@ update_linux_lts_pkgbuilds() {
spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel}
spl_conflicts="'spl-linux-lts-git'"
spl_headers_conflicts="'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_headers_conflicts="'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
zfs_conflicts="'zfs-linux-lts-git'"
spl_utils_pkgname="spl-utils-common"
spl_pkgname="spl-linux-lts"
@ -74,6 +76,8 @@ update_linux_lts_git_pkgbuilds() {
spl_pkgrel=${pkgrel_git}
zfs_pkgrel=${pkgrel_git}
spl_conflicts="'spl-linux-lts'"
spl_headers_conflicts="'spl-linux-lts-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_headers_conflicts="'zfs-linux-lts-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
zfs_conflicts="'zfs-linux-lts'"
spl_utils_pkgname="spl-utils-common-git"
spl_pkgname="spl-linux-lts-git"

8
src/kernels/linux.sh
Unescape View File

@ -43,8 +43,10 @@ update_linux_pkgbuilds() {
zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel}
spl_conflicts="'spl-linux-lts-git'"
zfs_conflicts="'zfs-linux-lts-git'"
spl_conflicts="'spl-linux-git'"
spl_headers_conflicts="'spl-linux-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_headers_conflicts="'zfs-linux-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
zfs_conflicts="'zfs-linux-git'"
spl_pkgname="spl-linux"
spl_utils_pkgname="spl-utils-common"
zfs_pkgname="zfs-linux"
@ -76,6 +78,8 @@ update_linux_git_pkgbuilds() {
spl_pkgrel=${pkgrel_git}
zfs_pkgrel=${pkgrel_git}
spl_conflicts="'spl-linux'"
spl_headers_conflicts="'spl-linux-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_headers_conflicts="'zfs-linux-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
zfs_conflicts="'zfs-linux'"
spl_pkgname="spl-linux-git"
spl_utils_pkgname="spl-utils-common-git"

6
src/spl/PKGBUILD.sh
Unescape View File

@ -11,7 +11,6 @@ arch=("x86_64")
url="http://zfsonlinux.org/"
source=("${spl_src_target}")
sha256sums=("${spl_src_hash}")
groups=("${archzfs_package_group}")
license=("GPL")
build() {
@ -29,9 +28,10 @@ package_${spl_pkgname}() {
depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
install=spl.install
provides=("spl")
groups=("${archzfs_package_group}")
conflicts=(${spl_conflicts})
${spl_replaces}
cd "${spl_workdir}"
make DESTDIR="\${pkgdir}" install
mv "\${pkgdir}/lib" "\${pkgdir}/usr/"
@ -42,7 +42,7 @@ package_${spl_pkgname}() {
package_${spl_pkgname}-headers() {
pkgdesc="Solaris Porting Layer kernel headers."
conflicts=(${spl_conflicts})
conflicts=(${spl_headers_conflicts})
cd "${spl_workdir}"
make DESTDIR="\${pkgdir}" install

4
src/zfs/PKGBUILD.sh
Unescape View File

@ -11,7 +11,6 @@ arch=("x86_64")
url="http://zfsonlinux.org/"
source=("${zfs_src_target}")
sha256sums=("${zfs_src_hash}")
groups=("${archzfs_package_group}")
license=("CDDL")
build() {
@ -30,6 +29,7 @@ package_${zfs_pkgname}() {
depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
install=zfs.install
provides=("zfs")
groups=("${archzfs_package_group}")
conflicts=(${zfs_conflicts})
${zfs_replaces}
@ -44,7 +44,7 @@ package_${zfs_pkgname}() {
package_${zfs_pkgname}-headers() {
pkgdesc="Kernel headers for the Zettabyte File System."
conflicts=(${zfs_conflicts})
conflicts=(${zfs_headers_conflicts})
cd "${zfs_workdir}"
make DESTDIR="\${pkgdir}" install

Write Preview
Loading…
Cancel
Save