debian/patches/0005-Remove-userland-dist-rules.patch

   1 From c652c2bf6340dd4ece7afab606eff2e886ba656b Mon Sep 17 00:00:00 2001
   2 From: Darik Horn <dajhorn@vanadac.com>
   3 Date: Tue, 17 Jan 2012 22:23:16 -0600
   4 Subject: [PATCH 5/7] Remove userland dist rules.
   5
   6 The `make dist` rule is used to create the DKMS source package, which
   7 does not contain the userland. (eg: Dist --with-config=kernel only.)
   8
   9 For all userland components in each automake template, delete
  10 instances of EXTRA_DIST and change dist_ to nodist_.
  11 ---
  12  Makefile.am                       |    3 +--
  13  cmd/vdev_id/Makefile.am           |    2 +-
  14  cmd/zpool_id/Makefile.am          |    2 +-
  15  cmd/zpool_layout/Makefile.am      |    2 +-
  16  etc/zfs/Makefile.am               |    2 --
  17  man/man8/Makefile.am              |    1 -
  18  scripts/Makefile.am               |    2 +-
  19  scripts/zpios-profile/Makefile.am |    2 +-
  20  scripts/zpios-test/Makefile.am    |    2 +-
  21  scripts/zpool-config/Makefile.am  |    2 +-
  22  scripts/zpool-layout/Makefile.am  |    2 +-
  23  udev/rules.d/Makefile.am          |    6 ------
  24  12 files changed, 9 insertions(+), 19 deletions(-)
  25
  26 diff --git a/Makefile.am b/Makefile.am
  27 index 9618b03..a1c66d0 100644
  28 --- a/Makefile.am
  29 +++ b/Makefile.am
  30 @@ -12,8 +12,7 @@ endif
  31  SUBDIRS = $(USER_DIR) $(KERNEL_DIR) include
  32
  33  AUTOMAKE_OPTIONS = foreign
  34 -EXTRA_DIST  = autogen.sh zfs.spec.in zfs-modules.spec.in
  35 -EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
  36 +EXTRA_DIST  = config/config.awk config/rpm.am config/deb.am config/tgz.am
  37  EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown
  38  EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
  39  EXTRA_DIST += dkms.postinst copy-builtin
  40 diff --git a/cmd/vdev_id/Makefile.am b/cmd/vdev_id/Makefile.am
  41 index fb815fa..86d91d3 100644
  42 --- a/cmd/vdev_id/Makefile.am
  43 +++ b/cmd/vdev_id/Makefile.am
  44 @@ -1 +1 @@
  45 -dist_udev_SCRIPTS = vdev_id
  46 +nodist_udev_SCRIPTS = vdev_id
  47 diff --git a/cmd/zpool_id/Makefile.am b/cmd/zpool_id/Makefile.am
  48 index 5f492cf..f186d78 100644
  49 --- a/cmd/zpool_id/Makefile.am
  50 +++ b/cmd/zpool_id/Makefile.am
  51 @@ -1 +1 @@
  52 -dist_udev_SCRIPTS = zpool_id
  53 +nodist_udev_SCRIPTS = zpool_id
  54 diff --git a/cmd/zpool_layout/Makefile.am b/cmd/zpool_layout/Makefile.am
  55 index b17e6a3..f8c61fd 100644
  56 --- a/cmd/zpool_layout/Makefile.am
  57 +++ b/cmd/zpool_layout/Makefile.am
  58 @@ -1 +1 @@
  59 -dist_bin_SCRIPTS = zpool_layout
  60 +nodist_bin_SCRIPTS = zpool_layout
  61 diff --git a/etc/zfs/Makefile.am b/etc/zfs/Makefile.am
  62 index b1a1cf4..d81526a 100644
  63 --- a/etc/zfs/Makefile.am
  64 +++ b/etc/zfs/Makefile.am
  65 @@ -8,5 +8,3 @@ pkgsysconf_DATA = \
  66         zdev.conf.supermicro.example \
  67         zdev.conf.dragon.example \
  68         zdev.conf.x4550.example
  69 -
  70 -EXTRA_DIST = $(pkgsysconf_DATA)
  71 diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
  72 index 05ca1ce..951a54c 100644
  73 --- a/man/man8/Makefile.am
  74 +++ b/man/man8/Makefile.am
  75 @@ -1,5 +1,4 @@
  76  man_MANS = vdev_id.8 zdb.8 zfs.8 zpool.8 zstreamdump.8
  77 -EXTRA_DIST = $(man_MANS)
  78
  79  install-data-local:
  80         $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8"
  81 diff --git a/scripts/Makefile.am b/scripts/Makefile.am
  82 index 3dc1e67..aad0cd4 100644
  83 --- a/scripts/Makefile.am
  84 +++ b/scripts/Makefile.am
  85 @@ -1,7 +1,7 @@
  86  SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
  87
  88  pkglibexecdir = $(libexecdir)/@PACKAGE@
  89 -dist_pkglibexec_SCRIPTS = \
  90 +nodist_pkglibexec_SCRIPTS = \
  91         $(top_builddir)/scripts/common.sh \
  92         $(top_srcdir)/scripts/zconfig.sh \
  93         $(top_srcdir)/scripts/zfault.sh \
  94 diff --git a/scripts/zpios-profile/Makefile.am b/scripts/zpios-profile/Makefile.am
  95 index 403c020..4cfb343 100644
  96 --- a/scripts/zpios-profile/Makefile.am
  97 +++ b/scripts/zpios-profile/Makefile.am
  98 @@ -1,5 +1,5 @@
  99  pkglibexecdir = $(libexecdir)/@PACKAGE@/zpios-profile
 100 -dist_pkglibexec_SCRIPTS = \
 101 +nodist_pkglibexec_SCRIPTS = \
 102         $(top_srcdir)/scripts/zpios-profile/zpios-profile-disk.sh \
 103         $(top_srcdir)/scripts/zpios-profile/zpios-profile-pids.sh \
 104         $(top_srcdir)/scripts/zpios-profile/zpios-profile-post.sh \
 105 diff --git a/scripts/zpios-test/Makefile.am b/scripts/zpios-test/Makefile.am
 106 index 54935b4..54336d5 100644
 107 --- a/scripts/zpios-test/Makefile.am
 108 +++ b/scripts/zpios-test/Makefile.am
 109 @@ -1,5 +1,5 @@
 110  pkglibexecdir = $(libexecdir)/@PACKAGE@/zpios-test
 111 -dist_pkglibexec_SCRIPTS = \
 112 +nodist_pkglibexec_SCRIPTS = \
 113         $(top_srcdir)/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh \
 114         $(top_srcdir)/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh \
 115         $(top_srcdir)/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh \
 116 diff --git a/scripts/zpool-config/Makefile.am b/scripts/zpool-config/Makefile.am
 117 index 87f58bb..7973114 100644
 118 --- a/scripts/zpool-config/Makefile.am
 119 +++ b/scripts/zpool-config/Makefile.am
 120 @@ -1,5 +1,5 @@
 121  pkglibexecdir = $(libexecdir)/@PACKAGE@/zpool-config
 122 -dist_pkglibexec_SCRIPTS = \
 123 +nodist_pkglibexec_SCRIPTS = \
 124         $(top_srcdir)/scripts/zpool-config/dm0-raid0.sh \
 125         $(top_srcdir)/scripts/zpool-config/file-raid0.sh \
 126         $(top_srcdir)/scripts/zpool-config/file-raid10.sh \
 127 diff --git a/scripts/zpool-layout/Makefile.am b/scripts/zpool-layout/Makefile.am
 128 index 3eef241..ede02d0 100644
 129 --- a/scripts/zpool-layout/Makefile.am
 130 +++ b/scripts/zpool-layout/Makefile.am
 131 @@ -1,5 +1,5 @@
 132  pkglibexecdir = $(libexecdir)/@PACKAGE@/zpool-layout
 133 -dist_pkglibexec_SCRIPTS = \
 134 +nodist_pkglibexec_SCRIPTS = \
 135         $(top_srcdir)/scripts/zpool-layout/dragon.ddn.conf \
 136         $(top_srcdir)/scripts/zpool-layout/dragon.llnl.conf
 137
 138 diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am
 139 index 586d76a..373be6c 100644
 140 --- a/udev/rules.d/Makefile.am
 141 +++ b/udev/rules.d/Makefile.am
 142 @@ -4,12 +4,6 @@ udevrule_DATA = \
 143         $(top_srcdir)/udev/rules.d/60-zvol.rules \
 144         $(top_srcdir)/udev/rules.d/90-zfs.rules
 145
 146 -EXTRA_DIST = \
 147 -       $(top_srcdir)/udev/rules.d/60-vdev.rules.in \
 148 -       $(top_srcdir)/udev/rules.d/60-zpool.rules.in \
 149 -       $(top_srcdir)/udev/rules.d/60-zvol.rules.in \
 150 -       $(top_srcdir)/udev/rules.d/90-zfs.rules.in
 151 -
 152  $(udevrule_DATA):
 153         -$(SED) -e 's,@bindir\@,$(bindir),g' \
 154                 -e 's,@sbindir\@,$(sbindir),g' \
 155 --
 156 1.7.9.5
 157