Skip to content
Permalink
Browse files

Update copy-builtin for new directory layout

And fix the sed command in Makefile.am

Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
  • Loading branch information...
freqlabs committed Jul 9, 2019
1 parent a961a99 commit cf6716292cc1c1e26677539a4deb2a6e25a775e8
Showing with 6 additions and 6 deletions.
  1. +2 −2 Makefile.am
  2. +4 −4 copy-builtin
@@ -53,7 +53,7 @@ gitrev:

BUILT_SOURCES = gitrev

distclean-local::
distclean-local:
-$(RM) -R autom4te*.cache
-find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
-o -name .pc -o -name .hg -o -name .git \) -prune -o \
@@ -71,7 +71,7 @@ all-local:

dist-hook: gitrev
cp ${top_srcdir}/include/zfs_gitrev.h $(distdir)/include; \
sed -e 's/Release:[[:print:]]*/Release: $(RELEASE)/' -i '' \
sed -i.bak -e 's/Release:[[:print:]]*/Release: $(RELEASE)/' \
$(distdir)/META

if BUILD_LINUX
@@ -12,12 +12,11 @@ usage()
KERNEL_DIR="$(readlink --canonicalize-existing "$1")"

MODULES=()
MODULES+="spl"
for MODULE_DIR in module/*
for MODULE_DIR in module/* module/os/linux/*
do
[ -d "$MODULE_DIR" ] || continue
[ "spl" = "${MODULE_DIR##*/}" ] && continue
MODULES+=("${MODULE_DIR##*/}")
[ "os" = "${MODULE_DIR#*/}" ] && continue
MODULES+=("${MODULE_DIR#*/}")
done

if ! [ -e 'zfs_config.h' ]
@@ -64,6 +63,7 @@ EOF
ZFS_MODULE_CFLAGS = -I$(srctree)/include/zfs
ZFS_MODULE_CFLAGS += -I$(srctree)/include/zfs/spl
ZFS_MODULE_CFLAGS += -I$(srctree)/include/zfs/os/linux/spl
ZFS_MODULE_CFLAGS += -I$(srctree)/include/zfs/os/linux/zfs
ZFS_MODULE_CFLAGS += -include $(srctree)/include/zfs/zfs_config.h
ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement
ZFS_MODULE_CPPFLAGS = -D_KERNEL

0 comments on commit cf67162

Please sign in to comment.
You can’t perform that action at this time.