diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-11-15 16:00:02 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-11-15 16:00:02 +0000 |
| commit | e95acc31215fe2290e0ad700faf1370daf47b286 (patch) | |
| tree | 11ccff1530ab83b30c039e79dd0b6f14362b0734 /zfsutils | |
| parent | e617096abe6133fa0def7868356baa62e595f691 (diff) | |
| download | illumos-packaging-e95acc31215fe2290e0ad700faf1370daf47b286.tar.gz | |
Build zfs
Diffstat (limited to 'zfsutils')
| -rw-r--r-- | zfsutils/debian/patches/series | 2 | ||||
| -rw-r--r-- | zfsutils/debian/patches/zfs-NULL-0.patch | 13 | ||||
| -rw-r--r-- | zfsutils/debian/patches/zfs-no-etc-links.patch | 12 | ||||
| -rwxr-xr-x | zfsutils/debian/rules | 1 |
4 files changed, 28 insertions, 0 deletions
diff --git a/zfsutils/debian/patches/series b/zfsutils/debian/patches/series index bc2ac5f..5841a48 100644 --- a/zfsutils/debian/patches/series +++ b/zfsutils/debian/patches/series @@ -20,3 +20,5 @@ zdb-build.patch zinject-build.patch ztest-avoid-libcmdutils.patch ztest-build.patch +zfs-NULL-0.patch +zfs-no-etc-links.patch diff --git a/zfsutils/debian/patches/zfs-NULL-0.patch b/zfsutils/debian/patches/zfs-NULL-0.patch new file mode 100644 index 0000000..79c2195 --- /dev/null +++ b/zfsutils/debian/patches/zfs-NULL-0.patch @@ -0,0 +1,13 @@ +Index: zfsutils/usr/src/cmd/zfs/zfs_main.c +=================================================================== +--- zfsutils.orig/usr/src/cmd/zfs/zfs_main.c 2012-10-08 00:25:34.000000000 +0000 ++++ zfsutils/usr/src/cmd/zfs/zfs_main.c 2012-11-15 15:45:39.604542883 +0000 +@@ -3393,7 +3393,7 @@ + usage(B_FALSE); + } + +- ret = zfs_for_each(argc - 2, argv + 2, NULL, ++ ret = zfs_for_each(argc - 2, argv + 2, 0, + ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb); + + return (ret); diff --git a/zfsutils/debian/patches/zfs-no-etc-links.patch b/zfsutils/debian/patches/zfs-no-etc-links.patch new file mode 100644 index 0000000..cbb53f3 --- /dev/null +++ b/zfsutils/debian/patches/zfs-no-etc-links.patch @@ -0,0 +1,12 @@ +Index: zfsutils/usr/src/cmd/zfs/Makefile +=================================================================== +--- zfsutils.orig/usr/src/cmd/zfs/Makefile 2012-10-08 00:25:34.000000000 +0000 ++++ zfsutils/usr/src/cmd/zfs/Makefile 2012-11-15 15:49:53.988302464 +0000 +@@ -74,7 +74,6 @@ + $(POST_PROCESS) + + install: all $(ROOTSBINPROG) $(ROOTUSRSBINLINKS) $(USRLIBFSTYPELINKS) \ +- $(ROOTETCFSTYPELINKS) + + $(POFILE): $(POFILES) + $(RM) $@ diff --git a/zfsutils/debian/rules b/zfsutils/debian/rules index 9d5c61b..bc011e3 100755 --- a/zfsutils/debian/rules +++ b/zfsutils/debian/rules @@ -72,6 +72,7 @@ dirs-stamp: unpack-stamp debian/tmp$$DEB_USRLIBDIR_64 \ debian/tmp/usr/bin \ debian/tmp/sbin \ + debian/tmp/usr/lib/fs/zfs \ debian/tmp/usr/sbin touch $@ |