c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove ARCH packaging

Browse Source 
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-17 11:11:41 -08:00
parent ffb21118ad
commit 0da31cd6ca
9 changed files with 4 additions and 211 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
/zfs-modules.spec
/zfs.release
/dkms.conf
/PKGBUILD-zfs
/PKGBUILD-zfs-modules
/stamp-h1
/.script-config
/zfs-script-config.sh

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

21
PKGBUILD-zfs-modules.in
View File

@ -1,21 +0,0 @@
# Maintainer: Prakash Surya <surya1@llnl.gov>
pkgname=@ZFS_META_NAME@-modules
pkgver=@ZFS_META_VERSION@
pkgrel=@ZFS_META_RELEASE@
pkgdesc="Contains kernel modules and support utilities for the zfs file system."
arch=(x86_64)
url="git://github.com/zfsonlinux/zfs.git"
license=(@ZFS_META_LICENSE@)
depends=('spl-modules')
source=(@ZFS_META_NAME@-@ZFS_META_VERSION@.tar.gz)
build() {
cd $srcdir/@ZFS_META_NAME@-@ZFS_META_VERSION@
./configure --with-config=kernel
make
}
package() {
cd $srcdir/@ZFS_META_NAME@-@ZFS_META_VERSION@
make DESTDIR=$pkgdir install
}

26
PKGBUILD-zfs.in
View File

@ -1,26 +0,0 @@
# Maintainer: Prakash Surya <surya1@llnl.gov>
pkgname=@ZFS_META_NAME@
pkgver=@ZFS_META_VERSION@
pkgrel=@ZFS_META_RELEASE@
pkgdesc="Contains the libzfs library and support utilities for the zfs file system."
arch=(x86_64)
url="git://github.com/zfsonlinux/zfs.git"
license=(@ZFS_META_LICENSE@)
depends=('spl' 'zlib' 'e2fsprogs')
source=(@ZFS_META_NAME@-@ZFS_META_VERSION@.tar.gz)
build() {
cd $srcdir/@ZFS_META_NAME@-@ZFS_META_VERSION@
./configure --with-config=user \
--prefix=/ \
--sysconfdir=/etc \
--datadir=/usr/share \
--includedir=/usr/include \
--with-udevdir=/lib/udev
make
}
package() {
cd $srcdir/@ZFS_META_NAME@-@ZFS_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;

54
config/zfs-build.m4
View File

@ -205,48 +205,6 @@ AC_DEFUN([ZFS_AC_ALIEN], [
AC_SUBST(ALIEN_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([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)
@ -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])
])

2
configure.ac
View File

@ -120,8 +120,6 @@ AC_CONFIG_FILES([
scripts/common.sh
zfs.spec
zfs-modules.spec
PKGBUILD-zfs
PKGBUILD-zfs-modules
zfs-script-config.sh
zfs.release
dkms.conf

3
etc/init.d/Makefile.am
View File

@ -6,8 +6,7 @@ EXTRA_DIST = \
$(top_srcdir)/etc/init.d/zfs.gentoo.in \
$(top_srcdir)/etc/init.d/zfs.lsb.in \
$(top_srcdir)/etc/init.d/zfs.lunar.in \
$(top_srcdir)/etc/init.d/zfs.redhat.in \
$(top_srcdir)/etc/init.d/zfs.arch.in
$(top_srcdir)/etc/init.d/zfs.redhat.in
$(init_SCRIPTS):
-$(SED) -e 's,@bindir\@,$(bindir),g' \

62
etc/init.d/zfs.arch.in
View File

@ -1,62 +0,0 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
case "$1" in
start)
stat_busy "Starting zfs"
if [ ! -c /dev/zfs ]; then
modprobe zfs
if [ $? -ne 0 ]; then
stat_fail
exit 1
fi
fi
# Import ZFS pools (via cache file)
if [ -f $ZPOOL_CACHE ]; then
$ZPOOL import -c $ZPOOL_CACHE -aN 2>/dev/null
if [ $? -ne 0 ]; then
stat_fail
exit 1
fi
fi
# Mount ZFS filesystems
$ZFS mount -a
if [ $? -ne 0 ]; then
stat_fail
exit 1
fi
# Export ZFS flesystems
$ZFS share -a
if [ $? -ne 0 ]; then
stat_fail
exit 1
fi
add_daemon zfs
stat_done
;;
stop)
stat_busy "Stopping zfs"
$ZFS umount -a
rm_daemon zfs
stat_done
;;
restart)
$0 stop
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac
exit 0