Improve error message for zfs create with @ or # in name

[mirror_zfs.git] / config / tgz.am

diff --git a/config/tgz.am b/config/tgz.am
index 57d2eee3bd6d7f0c792d59cf47c460e5b044be1b..0657d045d1642bccf2a591bb0e2463e42d4ac03a 100644 (file)
--- a/config/tgz.am
+++ b/config/tgz.am
@@ -1,42 +1,32 @@
-###############################################################################
-# Copyright (C) 2010 Lawrence Livermore National Security, LLC.
-# Written by Brian Behlendorf <behlendorf1@llnl.gov>.
-###############################################################################
-# Build targets for TGZ packages.
-#
-# Long term native distro specific Slackware style packaging should be added.
-# In the short term RPM packages are built and converted to TGZ packages
-# using alien.  If someone familiar with Slackware style packaging were to
-# update the build system to correctly build Slackware style packages I would
-# happily take it.  Until then we will have to make due with alien.
-#
-###############################################################################
-
 tgz-local:
        @(if test "${HAVE_ALIEN}" = "no"; then \
                echo -e "\n" \
        "*** Required util ${ALIEN} missing.  Please install the\n" \
-        "*** package for your distribution which provides ${ALIEN},\n" \
+       "*** package for your distribution which provides ${ALIEN},\n" \
        "*** re-run configure, and try again.\n"; \
-                exit 1; \
+               exit 1; \
        fi)
 
-tgz-modules: tgz-local rpm-modules
-       name=${PACKAGE}-modules; \
-       version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
-       release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
-       pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \
-       pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
-       fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2; \
-       $(RM) $$pkg1 $$pkg2
+tgz-kmod: tgz-local rpm-kmod
+if CONFIG_KERNEL
+       name=${PACKAGE}; \
+       version=${VERSION}-${RELEASE}; \
+       arch=`$(RPM) -qp $${name}-kmod-$${version}.src.rpm --qf %{arch} | tail -1`; \
+       pkg1=kmod-$${name}*$${version}.$${arch}.rpm; \
+       fakeroot $(ALIEN) --scripts --to-tgz $$pkg1; \
+       $(RM) $$pkg1
+endif
 
 tgz-utils: tgz-local rpm-utils
+if CONFIG_USER
        name=${PACKAGE}; \
-       version=${SPL_META_VERSION}-${SPL_META_RELEASE}; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       version=${VERSION}-${RELEASE}; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}.$${arch}.rpm; \
-       fakeroot $(ALIEN) --scripts --to-tgz $$pkg1; \
-       $(RM) $$pkg1
+       pkg2=$${name}-devel-$${version}.$${arch}.rpm; \
+       pkg3=$${name}-test-$${version}.$${arch}.rpm; \
+       fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2 $$pkg3; \
+       $(RM) $$pkg1 $$pkg2 $$pkg3
+endif
 
-tgz: tgz-modules tgz-utils
+tgz: tgz-kmod tgz-utils