From: Brian Behlendorf Date: Sat, 16 Feb 2013 23:32:08 +0000 (-0800) Subject: Remove ARCH packaging X-Git-Tag: spl-0.6.1~10^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f0a4b0847ae19a5e647734cb3ca1c5af8bd9cf9;p=spl 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 --- diff --git a/.gitignore b/.gitignore index 9430818..97887eb 100644 --- a/.gitignore +++ b/.gitignore @@ -44,8 +44,6 @@ Makefile.in /spl-modules.spec /spl.release /dkms.conf -/PKGBUILD-spl -/PKGBUILD-spl-modules /stamp-h1 /aclocal.m4 /autom4te.cache diff --git a/Makefile.am b/Makefile.am index 3a6b614..4d8ab0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/PKGBUILD-spl-modules.in b/PKGBUILD-spl-modules.in deleted file mode 100644 index a04bd4f..0000000 --- a/PKGBUILD-spl-modules.in +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer: Prakash Surya -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 -} diff --git a/PKGBUILD-spl.in b/PKGBUILD-spl.in deleted file mode 100644 index bc27f46..0000000 --- a/PKGBUILD-spl.in +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer: Prakash Surya -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 -} diff --git a/config/arch.am b/config/arch.am deleted file mode 100644 index da43fe7..0000000 --- a/config/arch.am +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# Written by Prakash Surya -############################################################################### -# 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; diff --git a/config/spl-build.m4 b/config/spl-build.m4 index 4cb7e1d..3dcc05e 100644 --- a/config/spl-build.m4 +++ b/config/spl-build.m4 @@ -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], [ diff --git a/configure.ac b/configure.ac index f739a58..7a4a729 100644 --- a/configure.ac +++ b/configure.ac @@ -66,8 +66,6 @@ AC_CONFIG_FILES([ scripts/Makefile spl.spec spl-modules.spec - PKGBUILD-spl - PKGBUILD-spl-modules spl.release dkms.conf ])