From cc49250563b65c80d87afa5273ae350d06aa8d3b Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 9 Jul 2015 11:41:14 -0700 Subject: [PATCH] Move dracut directory to contrib The dracut code is analogous to the initramfs code and as such it should be located in the contrib with initramfs for consistency. Signed-off-by: Brian Behlendorf --- Makefile.am | 2 +- configure.ac | 4 +-- contrib/Makefile.am | 4 +-- {dracut => contrib/dracut}/90zfs/.gitignore | 0 contrib/dracut/90zfs/Makefile.am | 25 +++++++++++++++++++ .../dracut}/90zfs/export-zfs.sh.in | 0 .../dracut}/90zfs/module-setup.sh.in | 0 .../dracut}/90zfs/mount-zfs.sh.in | 0 .../dracut}/90zfs/parse-zfs.sh.in | 0 .../dracut}/90zfs/zfs-lib.sh.in | 0 {dracut => contrib/dracut}/Makefile.am | 0 .../dracut}/README.dracut.markdown | 0 dracut/90zfs/Makefile.am | 25 ------------------- rpm/generic/zfs.spec.in | 2 +- 14 files changed, 31 insertions(+), 31 deletions(-) rename {dracut => contrib/dracut}/90zfs/.gitignore (100%) create mode 100644 contrib/dracut/90zfs/Makefile.am rename {dracut => contrib/dracut}/90zfs/export-zfs.sh.in (100%) rename {dracut => contrib/dracut}/90zfs/module-setup.sh.in (100%) rename {dracut => contrib/dracut}/90zfs/mount-zfs.sh.in (100%) rename {dracut => contrib/dracut}/90zfs/parse-zfs.sh.in (100%) rename {dracut => contrib/dracut}/90zfs/zfs-lib.sh.in (100%) rename {dracut => contrib/dracut}/Makefile.am (100%) rename {dracut => contrib/dracut}/README.dracut.markdown (100%) delete mode 100644 dracut/90zfs/Makefile.am diff --git a/Makefile.am b/Makefile.am index 788122d2a..10c87ddcd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ include $(top_srcdir)/config/tgz.am SUBDIRS = include rpm if CONFIG_USER -SUBDIRS += dracut udev etc man scripts lib cmd contrib +SUBDIRS += udev etc man scripts lib cmd contrib endif if CONFIG_KERNEL SUBDIRS += module diff --git a/configure.ac b/configure.ac index 0e79a491c..9907857e2 100644 --- a/configure.ac +++ b/configure.ac @@ -58,8 +58,6 @@ ZFS_AC_DEBUG_DMU_TX AC_CONFIG_FILES([ Makefile - dracut/Makefile - dracut/90zfs/Makefile udev/Makefile udev/rules.d/Makefile etc/Makefile @@ -115,6 +113,8 @@ AC_CONFIG_FILES([ cmd/zed/Makefile contrib/Makefile contrib/bash_completion.d/Makefile + contrib/dracut/Makefile + contrib/dracut/90zfs/Makefile contrib/initramfs/Makefile module/Makefile module/avl/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 4a13cfa98..b05e5c45b 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = bash_completion.d initramfs -DIST_SUBDIRS = bash_completion.d initramfs +SUBDIRS = bash_completion.d dracut initramfs +DIST_SUBDIRS = bash_completion.d dracut initramfs diff --git a/dracut/90zfs/.gitignore b/contrib/dracut/90zfs/.gitignore similarity index 100% rename from dracut/90zfs/.gitignore rename to contrib/dracut/90zfs/.gitignore diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am new file mode 100644 index 000000000..30880bfc5 --- /dev/null +++ b/contrib/dracut/90zfs/Makefile.am @@ -0,0 +1,25 @@ +pkgdracutdir = $(dracutdir)/modules.d/90zfs +pkgdracut_SCRIPTS = \ + $(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh \ + $(top_srcdir)/contrib/dracut/90zfs/module-setup.sh \ + $(top_srcdir)/contrib/dracut/90zfs/mount-zfs.sh \ + $(top_srcdir)/contrib/dracut/90zfs/parse-zfs.sh \ + $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh + +EXTRA_DIST = \ + $(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh.in \ + $(top_srcdir)/contrib/dracut/90zfs/module-setup.sh.in \ + $(top_srcdir)/contrib/dracut/90zfs/mount-zfs.sh.in \ + $(top_srcdir)/contrib/dracut/90zfs/parse-zfs.sh.in \ + $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in + +$(pkgdracut_SCRIPTS): + -$(SED) -e 's,@bindir\@,$(bindir),g' \ + -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@udevdir\@,$(udevdir),g' \ + -e 's,@udevruledir\@,$(udevruledir),g' \ + -e 's,@sysconfdir\@,$(sysconfdir),g' \ + '$@.in' >'$@' + +distclean-local:: + -$(RM) $(pkgdracut_SCRIPTS) diff --git a/dracut/90zfs/export-zfs.sh.in b/contrib/dracut/90zfs/export-zfs.sh.in similarity index 100% rename from dracut/90zfs/export-zfs.sh.in rename to contrib/dracut/90zfs/export-zfs.sh.in diff --git a/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in similarity index 100% rename from dracut/90zfs/module-setup.sh.in rename to contrib/dracut/90zfs/module-setup.sh.in diff --git a/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in similarity index 100% rename from dracut/90zfs/mount-zfs.sh.in rename to contrib/dracut/90zfs/mount-zfs.sh.in diff --git a/dracut/90zfs/parse-zfs.sh.in b/contrib/dracut/90zfs/parse-zfs.sh.in similarity index 100% rename from dracut/90zfs/parse-zfs.sh.in rename to contrib/dracut/90zfs/parse-zfs.sh.in diff --git a/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in similarity index 100% rename from dracut/90zfs/zfs-lib.sh.in rename to contrib/dracut/90zfs/zfs-lib.sh.in diff --git a/dracut/Makefile.am b/contrib/dracut/Makefile.am similarity index 100% rename from dracut/Makefile.am rename to contrib/dracut/Makefile.am diff --git a/dracut/README.dracut.markdown b/contrib/dracut/README.dracut.markdown similarity index 100% rename from dracut/README.dracut.markdown rename to contrib/dracut/README.dracut.markdown diff --git a/dracut/90zfs/Makefile.am b/dracut/90zfs/Makefile.am deleted file mode 100644 index 650953c1b..000000000 --- a/dracut/90zfs/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -pkgdracutdir = $(dracutdir)/modules.d/90zfs -pkgdracut_SCRIPTS = \ - $(top_srcdir)/dracut/90zfs/export-zfs.sh \ - $(top_srcdir)/dracut/90zfs/module-setup.sh \ - $(top_srcdir)/dracut/90zfs/mount-zfs.sh \ - $(top_srcdir)/dracut/90zfs/parse-zfs.sh \ - $(top_srcdir)/dracut/90zfs/zfs-lib.sh - -EXTRA_DIST = \ - $(top_srcdir)/dracut/90zfs/export-zfs.sh.in \ - $(top_srcdir)/dracut/90zfs/module-setup.sh.in \ - $(top_srcdir)/dracut/90zfs/mount-zfs.sh.in \ - $(top_srcdir)/dracut/90zfs/parse-zfs.sh.in \ - $(top_srcdir)/dracut/90zfs/zfs-lib.sh.in - -$(pkgdracut_SCRIPTS): - -$(SED) -e 's,@bindir\@,$(bindir),g' \ - -e 's,@sbindir\@,$(sbindir),g' \ - -e 's,@udevdir\@,$(udevdir),g' \ - -e 's,@udevruledir\@,$(udevruledir),g' \ - -e 's,@sysconfdir\@,$(sysconfdir),g' \ - '$@.in' >'$@' - -distclean-local:: - -$(RM) $(pkgdracut_SCRIPTS) diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in index 50b61f010..68bc00192 100644 --- a/rpm/generic/zfs.spec.in +++ b/rpm/generic/zfs.spec.in @@ -313,7 +313,7 @@ exit 0 %{_datadir}/%{name} %files dracut -%doc dracut/README.dracut.markdown +%doc contrib/dracut/README.dracut.markdown %{_dracutdir}/modules.d/* %if 0%{?_initramfs}