Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-07-28 16:52:22 -07:00
parent b2c62c2caa 61bba3bcd8
commit 1f1212fc5f
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -34,7 +34,7 @@ distclean-local::
if CONFIG_KERNEL if CONFIG_KERNEL
install-data-local: install-data-local:
destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \ destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \
instdest=$(DESTDIR)/${prefix}/src/$$destname; \ instdest=$(DESTDIR)/usr/src/$$destname; \
echo "${ZFS_META_VERSION}" >$$instdest/zfs.release; \ echo "${ZFS_META_VERSION}" >$$instdest/zfs.release; \
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \

1
config/zfs-build.m4
View File

@ -79,6 +79,7 @@ KERNEL_MODULES=( \\
SPL_MODULES=( \\ SPL_MODULES=( \\
\${SPLBUILD}/spl/spl.ko \\ \${SPLBUILD}/spl/spl.ko \\
\${SPLBUILD}/splat/splat.ko \\
) )
ZFS_MODULES=( \\ ZFS_MODULES=( \\

16
module/Makefile.in
View File

@ -17,16 +17,29 @@ clean:
if [ -f Module.markers ]; then $(RM) Module.markers; fi if [ -f Module.markers ]; then $(RM) Module.markers; fi
modules_install: modules_install:
# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
INSTALL_MOD_PATH=$(DESTDIR) \ INSTALL_MOD_PATH=$(DESTDIR) \
INSTALL_MOD_DIR=addon/zfs $@ INSTALL_MOD_DIR=addon/zfs $@
find ${DESTDIR}/lib/modules/ -name 'modules.*' | xargs ${RM} find ${DESTDIR}/lib/modules/ -name 'modules.*' | xargs ${RM}
sysmap=${DESTDIR}/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
# Install the required headers in to the kernel source # Install the required headers in to the kernel source
destname=zfs-@ZFS_META_VERSION@/@LINUX_VERSION@; \ destname=zfs-@ZFS_META_VERSION@/@LINUX_VERSION@; \
instdest=$(DESTDIR)/@prefix@/src/$$destname; \ instdest=$(DESTDIR)/usr/src/$$destname; \
(find . -mindepth 3 -name '*.h' | xargs -Ihdr sh -c \ (find . -mindepth 3 -name '*.h' | xargs -Ihdr sh -c \
"DEST=hdr && install -D hdr $$instdest/\$${DEST#*/*/*/}") || exit 1 "DEST=hdr && install -D hdr $$instdest/\$${DEST#*/*/*/}") || exit 1
modules_uninstall:
# Uninstall the kernel modules
$(RM) -R ${DESTDIR}/lib/modules/@LINUX_VERSION@/addon/zfs
# Uninstall the required headers from the kernel source
destname=zfs-@ZFS_META_VERSION@/@LINUX_VERSION@; \
instdest=$(DESTDIR)/usr/src/$$destname; \
$(RM) -R $$instdest
distdir: distdir:
distfiles=`find . -name '*.c' -o -name '*.h'`; \ distfiles=`find . -name '*.c' -o -name '*.h'`; \
for distfile in $$distfiles; do \ for distfile in $$distfiles; do \
@ -37,5 +50,6 @@ distdir:
distclean maintainer-clean: clean distclean maintainer-clean: clean
install: modules_install install: modules_install
uninstall: modules_uninstall
all: modules all: modules
check: check:

2
scripts/common.sh.in
View File

@ -11,7 +11,7 @@ SCRIPT_CONFIG=.script-config
if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then
. "${basedir}/../${SCRIPT_CONFIG}" . "${basedir}/../${SCRIPT_CONFIG}"
else else
MODULES=(zlib_deflate spl zavl znvpair zunicode zcommon zfs) MODULES=(zlib_deflate spl splat zavl znvpair zunicode zcommon zfs)
fi fi
PROG="<define PROG>" PROG="<define PROG>"