dladm (4.3) unstable; urgency=medium

  * New upstream snapshot
  * Use dh-smf
  * Build depends on uts-dev (>= 4.3+4) for IB headers
  * Added filesystem/root dependency to network/datalink-management
    (dlmgmtd-depends-on-rootfs.patch)

5 files changed, 34 insertions, 1 deletions

diff --git a/dladm/debian/changelog b/dladm/debian/changelog
index 5f36a44..2637673 100644
--- a/dladm/debian/changelog
+++ b/dladm/debian/changelog
@@ -1,3 +1,13 @@
+dladm (4.3) unstable; urgency=medium
+
+  * New upstream snapshot
+  * Use dh-smf
+  * Build depends on uts-dev (>= 4.3+4) for IB headers
+  * Added filesystem/root dependency to network/datalink-management
+    (dlmgmtd-depends-on-rootfs.patch)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Tue, 17 Jun 2014 21:20:16 +0400
+
 dladm (2.10+1) unstable; urgency=low
 
   * Use native version scheme
diff --git a/dladm/debian/control b/dladm/debian/control
index 14dd221..8945b2a 100644
--- a/dladm/debian/control
+++ b/dladm/debian/control
@@ -3,8 +3,9 @@ Section: admin
 Priority: optional
 Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
- illumos-source-2.10,
+ illumos-source-4.3,
  dh-illumos,
+ dh-smf,
  gcc-multilib [illumos-amd64],
  libncurses5-dev  , lib32ncurses5-dev [illumos-amd64]  , 
  libdevinfo1-dev  , lib32devinfo1-dev [illumos-amd64]  , 
@@ -18,6 +19,7 @@ Build-Depends:
  libsunavl-dev,
  librstp1-dev,
  quilt,
+ uts-dev (>= 4.3+4),
  symlinks,
 Standards-Version: 3.9.3
 Homepage: https://www.illumos.org
diff --git a/dladm/debian/patches/dlmgmtd-depends-on-rootfs.patch b/dladm/debian/patches/dlmgmtd-depends-on-rootfs.patch
new file mode 100644
index 0000000..79363ae
--- /dev/null
+++ b/dladm/debian/patches/dlmgmtd-depends-on-rootfs.patch
@@ -0,0 +1,19 @@
+Index: dladm/usr/src/cmd/dlmgmtd/dlmgmt.xml
+===================================================================
+--- dladm.orig/usr/src/cmd/dlmgmtd/dlmgmt.xml	2014-03-01 16:17:52.000000000 +0400
++++ dladm/usr/src/cmd/dlmgmtd/dlmgmt.xml	2014-06-17 20:22:09.864261189 +0400
+@@ -42,6 +42,14 @@
+ 
+ 	<single_instance/>
+ 
++	<dependency
++		name='rootfs'
++		grouping='require_all'
++		restart_on='none'
++		type='service'>
++		<service_fmri value='svc:/system/filesystem/root' />
++	</dependency>
++
+ 	<dependent name='dlmgmt-install-discovery'
+ 		grouping='require_all'
+ 		restart_on='none'>
diff --git a/dladm/debian/patches/series b/dladm/debian/patches/series
index 2411510..7ccf7e1 100644
--- a/dladm/debian/patches/series
+++ b/dladm/debian/patches/series
@@ -19,3 +19,4 @@ flowstat-include-time.h.patch
 flowstat-fprev-may-be-used-uninitialized.patch
 dlstat-fix-libinetutil-callbacks.patch
 libdladm-create-db.patch
+dlmgmtd-depends-on-rootfs.patch
diff --git a/dladm/debian/rules b/dladm/debian/rules
index e2c0dc1..b6016da 100755
--- a/dladm/debian/rules
+++ b/dladm/debian/rules
@@ -98,6 +98,7 @@ binary-stamp: install-stamp
 	dh_installexamples
 	dh_installchangelogs
 	dh_link
+	dh_smf
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -- -c4