Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Remove ARCH packaging 

The kernel modules are now available in the Arch User Repository
(AUR) via zfs.  Since their packaging is maintained and superior
to ours it is being removed from the tree.

  https://wiki.archlinux.org/index.php/ZFS

Now that various distributions are picking up the packages we
should eventually be able to remove most of this infrastructure.
Packaging belongs with the distributions not upstream.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2013-02-16 15:32:08 -08:00
parent d1142fbffe
commit 5f0a4b0847
7 changed files with 1 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -44,8 +44,6 @@ Makefile.in
/spl-modules.spec
/spl.release
/dkms.conf
/PKGBUILD-spl
/PKGBUILD-spl-modules
/stamp-h1
/aclocal.m4
/autom4te.cache

1
Makefile.am
View File

@ -1,7 +1,6 @@
include $(top_srcdir)/config/rpm.am
include $(top_srcdir)/config/deb.am
include $(top_srcdir)/config/tgz.am
include $(top_srcdir)/config/arch.am
SUBDIRS = include
if CONFIG_USER

23
PKGBUILD-spl-modules.in
View File

@ -1,23 +0,0 @@
# Maintainer: Prakash Surya <surya1@llnl.gov>
pkgname=@SPL_META_NAME@-modules
pkgver=@SPL_META_VERSION@
pkgrel=@SPL_META_RELEASE@
pkgdesc="Contains kernel modules for emulating Solaris style primatives in the linux kernel."
arch=(x86_64)
url="git://github.com/zfsonlinux/spl.git"
license=(@LICENSE@)
source=(@SPL_META_NAME@-@SPL_META_VERSION@.tar.gz)
build() {
cd $srcdir/@SPL_META_NAME@-@SPL_META_VERSION@
./configure --with-config=kernel \
--prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib
make
}
package() {
cd $srcdir/@SPL_META_NAME@-@SPL_META_VERSION@
make DESTDIR=$pkgdir install
}

23
PKGBUILD-spl.in
View File

@ -1,23 +0,0 @@
# Maintainer: Prakash Surya <surya1@llnl.gov>
pkgname=@SPL_META_NAME@
pkgver=@SPL_META_VERSION@
pkgrel=@SPL_META_RELEASE@
pkgdesc="Contains the support utilities for the spl."
arch=(x86_64)
url="git://github.com/zfsonlinux/spl.git"
license=(@LICENSE@)
source=(@SPL_META_NAME@-@SPL_META_VERSION@.tar.gz)
build() {
cd $srcdir/@SPL_META_NAME@-@SPL_META_VERSION@
./configure --with-config=user \
--prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib
make
}
package() {
cd $srcdir/@SPL_META_NAME@-@SPL_META_VERSION@
make DESTDIR=$pkgdir install
}

44
config/arch.am
View File

@ -1,44 +0,0 @@
###############################################################################
# Written by Prakash Surya <surya1@llnl.gov>
###############################################################################
# Build targets for RPM packages.
###############################################################################
sarch-modules:
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" sarch-common
sarch-utils:
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" sarch-common
sarch: sarch-modules sarch-utils
arch-modules:
if CONFIG_KERNEL
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" arch-common
endif
arch-utils:
if CONFIG_USER
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" arch-common
endif
arch: arch-modules arch-utils
arch-local:
@(if test "${HAVE_MAKEPKG}" = "no"; then \
echo -e "\n" \
"*** Required util ${MAKEPKG} missing. Please install the\n" \
"*** package for your distribution which provides ${MAKEPKG},\n" \
"*** re-run configure, and try again.\n"; \
exit 1; \
fi;)
sarch-common: dist
pkgbuild=PKGBUILD-$(pkg); \
$(MAKE) $(AM_MAKEFLAGS) arch-local || exit 1; \
$(MAKEPKG) --allsource --skipinteg --nodeps -p $$pkgbuild || exit 1;
arch-common: dist
pkgbuild=PKGBUILD-$(pkg); \
$(MAKE) $(AM_MAKEFLAGS) arch-local || exit 1; \
$(MAKEPKG) --skipinteg -p $$pkgbuild || exit 1;

46
config/spl-build.m4
View File

@ -302,48 +302,6 @@ AC_DEFUN([SPL_AC_DPKG], [
AC_SUBST(DPKGBUILD_VERSION)
])
dnl #
dnl # Check for pacman+makepkg to build Arch Linux packages. If these
dnl # tools are missing it is non-fatal but you will not be able to
dnl # build Arch Linux packages and will be warned if you try too.
dnl #
AC_DEFUN([SPL_AC_PACMAN], [
PACMAN=pacman
MAKEPKG=makepkg
AC_MSG_CHECKING([whether $PACMAN is available])
tmp=$($PACMAN --version 2>/dev/null)
AS_IF([test -n "$tmp"], [
PACMAN_VERSION=$(echo $tmp |
$AWK '/Pacman/ { print $[3] }' |
$SED 's/^v//')
HAVE_PACMAN=yes
AC_MSG_RESULT([$HAVE_PACMAN ($PACMAN_VERSION)])
],[
HAVE_PACMAN=no
AC_MSG_RESULT([$HAVE_PACMAN])
])
AC_MSG_CHECKING([whether $MAKEPKG is available])
tmp=$($MAKEPKG --version 2>/dev/null)
AS_IF([test -n "$tmp"], [
MAKEPKG_VERSION=$(echo $tmp | $AWK '/makepkg/ { print $[3] }')
HAVE_MAKEPKG=yes
AC_MSG_RESULT([$HAVE_MAKEPKG ($MAKEPKG_VERSION)])
],[
HAVE_MAKEPKG=no
AC_MSG_RESULT([$HAVE_MAKEPKG])
])
AC_SUBST(HAVE_PACMAN)
AC_SUBST(PACMAN)
AC_SUBST(PACMAN_VERSION)
AC_SUBST(HAVE_MAKEPKG)
AC_SUBST(MAKEPKG)
AC_SUBST(MAKEPKG_VERSION)
])
dnl #
dnl # Until native packaging for various different packing systems
dnl # can be added the least we can do is attempt to use alien to
@ -406,7 +364,7 @@ AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [
redhat) DEFAULT_PACKAGE=rpm ;;
fedora) DEFAULT_PACKAGE=rpm ;;
gentoo) DEFAULT_PACKAGE=tgz ;;
arch) DEFAULT_PACKAGE=arch ;;
arch) DEFAULT_PACKAGE=tgz ;;
sles) DEFAULT_PACKAGE=rpm ;;
slackware) DEFAULT_PACKAGE=tgz ;;
lunar) DEFAULT_PACKAGE=tgz ;;
@ -427,8 +385,6 @@ AC_DEFUN([SPL_AC_PACKAGE], [
SPL_AC_RPM
SPL_AC_DPKG
SPL_AC_ALIEN
AS_IF([test "$VENDOR" = "arch"], [SPL_AC_PACMAN])
])
AC_DEFUN([SPL_AC_LICENSE], [

2
configure.ac
View File

@ -66,8 +66,6 @@ AC_CONFIG_FILES([
scripts/Makefile
spl.spec
spl-modules.spec
PKGBUILD-spl
PKGBUILD-spl-modules
spl.release
dkms.conf
])