Package mkfs and friends

6 files changed, 33 insertions, 0 deletions

diff --git a/mount/debian/control b/mount/debian/control
index c315123..b621dcc 100644
--- a/mount/debian/control
+++ b/mount/debian/control
@@ -5,6 +5,8 @@ Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
  dh-illumos,
  illumos-source-2.10,
+ libkstat-dev,
+ libdiskmgt1-dev,
  quilt,
 Standards-Version: 3.9.3
 Homepage: https://www.illumos.org
diff --git a/mount/debian/mount.install b/mount/debian/mount.install
index cdde36b..93aba54 100644
--- a/mount/debian/mount.install
+++ b/mount/debian/mount.install
@@ -4,3 +4,8 @@ sbin/umount
 sbin/umountall
 usr/lib/fs/*/mount
 usr/sbin/fsck
+usr/sbin/clri
+usr/sbin/fsdb
+usr/sbin/labelit
+usr/sbin/mkfs
+usr/sbin/dcopy
diff --git a/mount/debian/mount.manpages b/mount/debian/mount.manpages
index b318f24..adff74b 100644
--- a/mount/debian/mount.manpages
+++ b/mount/debian/mount.manpages
@@ -1,3 +1,5 @@
 usr/src/man/man1m/mount.1m
 usr/src/man/man1m/mountall.1m
 usr/src/man/man1m/fsck.1m
+usr/src/man/man1m/clri.1m
+usr/src/man/man1m/mkfs.1m
diff --git a/mount/debian/patches/fssnapsup.c.patch b/mount/debian/patches/fssnapsup.c.patch
new file mode 100644
index 0000000..ebdac95
--- /dev/null
+++ b/mount/debian/patches/fssnapsup.c.patch
@@ -0,0 +1,15 @@
+Description: missing prototypes for malloc() and localtime()
+Index: mount/usr/src/cmd/fs.d/fssnapsup.c
+===================================================================
+--- mount.orig/usr/src/cmd/fs.d/fssnapsup.c	2012-10-08 00:25:23.000000000 +0000
++++ mount/usr/src/cmd/fs.d/fssnapsup.c	2013-02-10 04:17:57.458227370 +0000
+@@ -31,7 +31,9 @@
+  * the real fssnap command.
+  */
+ 
++#include <stdlib.h>
+ #include <stdio.h>
++#include <time.h>
+ #include <kstat.h>
+ #include <libintl.h>
+ #include <sys/fssnap_if.h>
diff --git a/mount/debian/patches/series b/mount/debian/patches/series
index cc68a00..2a43439 100644
--- a/mount/debian/patches/series
+++ b/mount/debian/patches/series
@@ -10,3 +10,4 @@ udfs-ud_lib.c-pointers.patch
 hsfs-no-fstyp-link.patch
 hsfs-mount-no-etc.patch
 ufs-no-etc.patch
+fssnapsup.c.patch
diff --git a/mount/debian/rules b/mount/debian/rules
index caaeb89..127b9ee 100755
--- a/mount/debian/rules
+++ b/mount/debian/rules
@@ -18,6 +18,8 @@ unpack-stamp:
 		usr/src/man/man1m/mount.1m \
 		usr/src/man/man1m/mountall.1m \
 		usr/src/man/man1m/fsck\* \
+		usr/src/man/man1m/clri.1m \
+		usr/src/man/man1m/mkfs.1m \
 		usr/src/cmd/initpkg/\*mountall.sh
 
 	dh_illumos_gate \
@@ -62,6 +64,11 @@ install-stamp: build-stamp
 		usr/src/cmd/fs.d/umount
 	install -m 755 -t debian/tmp/usr/sbin \
 		usr/src/cmd/fs.d/fsck
+	install -m 755 -t debian/tmp/usr/sbin \
+		usr/src/cmd/fs.d/clri
+	for f in mkfs dcopy labelit fsdb; do \
+		ln -sf clri debian/tmp/usr/sbin/$$f; \
+	done
 	install -m 755 usr/src/cmd/initpkg/mountall.sh \
 		debian/tmp/sbin/mountall
 	install -m 755 usr/src/cmd/initpkg/umountall.sh \
@@ -74,6 +81,7 @@ build-stamp: dirs-stamp patch-stamp
 	dh_illumos_make --native usr/src/cmd/fs.d -t mount
 	dh_illumos_make --native usr/src/cmd/fs.d -t umount
 	dh_illumos_make --native usr/src/cmd/fs.d -t fsck
+	dh_illumos_make --native usr/src/cmd/fs.d -t clri
 	for fs in $(fs); do \
 		if [ -d usr/src/cmd/fs.d/$$fs/mount ]; then \
 			dh_illumos_make --native usr/src/cmd/fs.d/$$fs/mount ; \