Minor packaging fixes

The GIT file was removed from the tree because I have stopped
using TopGit.  Because of this is must also be removed from
the top level Makefile.am as will as the zfs.spec.in file
which referenced it.

Fix type in lib/libzpool/Makefile.am which was preventing
the needed zrlock.h header from being included by 'make dist'.
I simply had the name wrong in the Makefile.am.

Regenerated autogen.sh build products.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/Makefile.am b/Makefile.am
index 3689d1f8f9a5e51af263864da2b48de6f5cb3fb5..5a0791b44d6d471688d893ed5140690d529bfb0b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
 AUTOMAKE_OPTIONS = foreign dist-zip
 EXTRA_DIST  = autogen.sh zfs.spec.in zfs-modules.spec.in
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
-EXTRA_DIST += META DISCLAIMER COPYRIGHT GIT README.markdown
+EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown
 EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
 
 noinst_HEADERS = zfs_config.h
@@ -24,11 +24,10 @@ distclean-local::
                -o -name .pc -o -name .hg -o -name .git \) -prune -o \
                \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
                -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-               -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \
+               -o -name '.*.rej' -o -name '.script-config' -o -size 0 \
                -o -name '*%' -o -name '.*.cmd' -o -name 'core' \
                -o -name 'Makefile' -o -name 'Module.symvers' \
-               -o -name '*.order' -o -name '*.markers' \
-               -o -name '.script-config' \) \
+               -o -name '*.order' -o -name '*.markers' \) \
                -type f -print | xargs $(RM)
 
 if CONFIG_KERNEL

diff --git a/Makefile.in b/Makefile.in
index c91470ec29a24cb96431e0a6e7cdba78612381c8..87ed50c782b39b537b920b574935b8be2da041f8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -326,8 +326,8 @@ SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
 AUTOMAKE_OPTIONS = foreign dist-zip
 EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in \
        config/config.awk config/rpm.am config/deb.am config/tgz.am \
-       META DISCLAIMER COPYRIGHT GIT README.markdown \
-       OPENSOLARIS.LICENSE ZFS.RELEASE
+       META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE \
+       ZFS.RELEASE
 noinst_HEADERS = zfs_config.h
 all: zfs_config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -924,11 +924,10 @@ distclean-local::
                -o -name .pc -o -name .hg -o -name .git \) -prune -o \
                \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
                -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-               -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \
+               -o -name '.*.rej' -o -name '.script-config' -o -size 0 \
                -o -name '*%' -o -name '.*.cmd' -o -name 'core' \
                -o -name 'Makefile' -o -name 'Module.symvers' \
-               -o -name '*.order' -o -name '*.markers' \
-               -o -name '.script-config' \) \
+               -o -name '*.order' -o -name '*.markers' \) \
                -type f -print | xargs $(RM)
 
 @CONFIG_KERNEL_TRUE@install-data-local:

diff --git a/autogen.sh b/autogen.sh
index 728000ae4af588df82ebe2df1f54a364382b538a..aba740f16ec28c08f3198f6c4cc83afa770ed0bb 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,4 +5,3 @@ libtoolize --automake --copy
 autoheader &&
 automake --add-missing --include-deps --copy
 autoconf
-rm -rf autom4te.cache aclocal.m4

diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
index 2df3fb7300d2ff1cd687f016aa8a6b642f3dbb8e..f91b4d07824a06d136ef5afa8d436aee4f9ebbaf 100644 (file)
--- a/lib/libzpool/Makefile.am
+++ b/lib/libzpool/Makefile.am
@@ -152,13 +152,13 @@ libzpool_la_SOURCES = \
        ${top_srcdir}/module/zfs/include/sys/zfs_stat.h \
        ${top_srcdir}/module/zfs/include/sys/zfs_vfsops.h \
        ${top_srcdir}/module/zfs/include/sys/zfs_znode.h \
-       ${top_srcdir}/module/zfs/include/sys/zfs_zrlock.h \
        ${top_srcdir}/module/zfs/include/sys/zil.h \
        ${top_srcdir}/module/zfs/include/sys/zil_impl.h \
        ${top_srcdir}/module/zfs/include/sys/zio_checksum.h \
        ${top_srcdir}/module/zfs/include/sys/zio_compress.h \
        ${top_srcdir}/module/zfs/include/sys/zio.h \
        ${top_srcdir}/module/zfs/include/sys/zio_impl.h \
+       ${top_srcdir}/module/zfs/include/sys/zrlock.h \
        ${top_srcdir}/module/zfs/include/sys/zvol.h \
        ${top_srcdir}/module/zfs/include/sys/fm/protocol.h \
        ${top_srcdir}/module/zfs/include/sys/fm/util.h \

diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in
index 9ee45fa78f517aa6819ca7505d741e4dd900e5fc..79bd73df6a481b0b66378451e6245779de12e98f 100644 (file)
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@@ -516,13 +516,13 @@ libzpool_la_SOURCES = \
        ${top_srcdir}/module/zfs/include/sys/zfs_stat.h \
        ${top_srcdir}/module/zfs/include/sys/zfs_vfsops.h \
        ${top_srcdir}/module/zfs/include/sys/zfs_znode.h \
-       ${top_srcdir}/module/zfs/include/sys/zfs_zrlock.h \
        ${top_srcdir}/module/zfs/include/sys/zil.h \
        ${top_srcdir}/module/zfs/include/sys/zil_impl.h \
        ${top_srcdir}/module/zfs/include/sys/zio_checksum.h \
        ${top_srcdir}/module/zfs/include/sys/zio_compress.h \
        ${top_srcdir}/module/zfs/include/sys/zio.h \
        ${top_srcdir}/module/zfs/include/sys/zio_impl.h \
+       ${top_srcdir}/module/zfs/include/sys/zrlock.h \
        ${top_srcdir}/module/zfs/include/sys/zvol.h \
        ${top_srcdir}/module/zfs/include/sys/fm/protocol.h \
        ${top_srcdir}/module/zfs/include/sys/fm/util.h \

diff --git a/zfs.spec.in b/zfs.spec.in
index 17e0131ad8b1567bf359f3ebf54be61743248256..9bec437b9de87d7b9c384032c8d051ca30e45630 100644 (file)
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER
-%doc GIT OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
+%doc OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
 %{_sbindir}/*
 %{_bindir}/*
 %{_libdir}/*