aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2013-02-17 11:11:41 -0800
committerBrian Behlendorf <[email protected]>2013-03-06 15:46:41 -0800
commit0da31cd6ca0dedbf0ceb7118d2cede2e97e73c14 (patch)
tree0f750a02b097f60388c17e18cdf3210281bf5e60 /config
parentffb21118add1a2e6cec2ce401c333b4a4e76d9a3 (diff)
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 <[email protected]>
Diffstat (limited to 'config')
-rw-r--r--config/arch.am44
-rw-r--r--config/zfs-build.m454
2 files changed, 3 insertions, 95 deletions
diff --git a/config/arch.am b/config/arch.am
deleted file mode 100644
index da43fe738..000000000
--- a/config/arch.am
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# Written by Prakash Surya <[email protected]>
-###############################################################################
-# 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/zfs-build.m4 b/config/zfs-build.m4
index 8e6b13b24..f05a4dcd0 100644
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -206,48 +206,6 @@ AC_DEFUN([ZFS_AC_ALIEN], [
])
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([ZFS_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 # Using the VENDOR tag from config.guess set the default
dnl # package type for 'make pkg': (rpm | deb | tgz)
dnl #
@@ -285,7 +243,7 @@ AC_DEFUN([ZFS_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 ;;
@@ -297,12 +255,8 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
AC_MSG_RESULT([$DEFAULT_PACKAGE])
AC_SUBST(DEFAULT_PACKAGE)
+ DEFAULT_INIT_DIR=$sysconfdir/init.d
AC_MSG_CHECKING([default init directory])
- case "$VENDOR" in
- arch) DEFAULT_INIT_DIR=$sysconfdir/rc.d ;;
- *) DEFAULT_INIT_DIR=$sysconfdir/init.d ;;
- esac
-
AC_MSG_RESULT([$DEFAULT_INIT_DIR])
AC_SUBST(DEFAULT_INIT_DIR)
@@ -312,7 +266,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
redhat) DEFAULT_INIT_SCRIPT=redhat ;;
fedora) DEFAULT_INIT_SCRIPT=fedora ;;
gentoo) DEFAULT_INIT_SCRIPT=gentoo ;;
- arch) DEFAULT_INIT_SCRIPT=arch ;;
+ arch) DEFAULT_INIT_SCRIPT=lsb ;;
sles) DEFAULT_INIT_SCRIPT=lsb ;;
slackware) DEFAULT_INIT_SCRIPT=lsb ;;
lunar) DEFAULT_INIT_SCRIPT=lunar ;;
@@ -333,6 +287,4 @@ AC_DEFUN([ZFS_AC_PACKAGE], [
ZFS_AC_RPM
ZFS_AC_DPKG
ZFS_AC_ALIEN
-
- AS_IF([test "$VENDOR" = "arch"], [ZFS_AC_PACMAN])
])