Skip to content

Commit

Permalink
Remove ARCH packaging
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
behlendorf committed Mar 5, 2013
1 parent d1142fb commit 5f0a4b0
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 140 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ Makefile.in
/spl-modules.spec
/spl.release
/dkms.conf
/PKGBUILD-spl
/PKGBUILD-spl-modules
/stamp-h1
/aclocal.m4
/autom4te.cache
Expand Down
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -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
Expand Down
23 changes: 0 additions & 23 deletions PKGBUILD-spl-modules.in

This file was deleted.

23 changes: 0 additions & 23 deletions PKGBUILD-spl.in

This file was deleted.

44 changes: 0 additions & 44 deletions config/arch.am

This file was deleted.

46 changes: 1 addition & 45 deletions config/spl-build.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ;;
Expand All @@ -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], [
Expand Down
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ AC_CONFIG_FILES([
scripts/Makefile
spl.spec
spl-modules.spec
PKGBUILD-spl
PKGBUILD-spl-modules
spl.release
dkms.conf
])
Expand Down

0 comments on commit 5f0a4b0

Please sign in to comment.