c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 02:49:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor packaging fixes

Browse Source 
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>
This commit is contained in:
Brian Behlendorf 2010-09-01 12:54:51 -07:00
parent 9691eb9fee
commit 1ae93745d2
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -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

9
Makefile.in
View File

@ -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:

1
autogen.sh
View File

@ -5,4 +5,3 @@ libtoolize --automake --copy
autoheader &&
automake --add-missing --include-deps --copy
autoconf
rm -rf autom4te.cache aclocal.m4

2
lib/libzpool/Makefile.am
View File

@ -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 \

2
lib/libzpool/Makefile.in
View File

@ -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 \

2
zfs.spec.in
View File

@ -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}/*