Build mdb/libtopo

4 files changed, 114 insertions, 0 deletions

diff --git a/mdb/debian/control b/mdb/debian/control
index bc29d1f..1a61735 100644
--- a/mdb/debian/control
+++ b/mdb/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
  libstanddisasm-dev ,
  libstandumem-dev   ,
  libsysevent1-dev   ,
+ libtopo1-dev (>= 4.3),
  uts-dev (>= 4.3+3),
  ncurses-term,
  quilt,
diff --git a/mdb/debian/patches/mdb-libtopo-headers.patch b/mdb/debian/patches/mdb-libtopo-headers.patch
new file mode 100644
index 0000000..039c1fc
--- /dev/null
+++ b/mdb/debian/patches/mdb-libtopo-headers.patch
@@ -0,0 +1,17 @@
+Index: mdb/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c
+===================================================================
+--- mdb.orig/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c	2014-03-01 16:18:00.000000000 +0400
++++ mdb/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c	2014-04-16 18:33:00.547986732 +0400
+@@ -28,9 +28,9 @@
+ #include <sys/mdb_modapi.h>
+ #include <libelf.h>
+ #include <sys/fm/protocol.h>
+-#include <topo_mod.h>
+-#include <topo_tree.h>
+-#include <topo_module.h>
++#include <fm/topo_mod.h>
++#include <fm/topo_tree.h>
++#include <fm/topo_module.h>
+ #include <stddef.h>
+ 
+ 
diff --git a/mdb/debian/patches/mdb-libtopo-pointers.patch b/mdb/debian/patches/mdb-libtopo-pointers.patch
new file mode 100644
index 0000000..af1a7b5
--- /dev/null
+++ b/mdb/debian/patches/mdb-libtopo-pointers.patch
@@ -0,0 +1,94 @@
+Index: mdb/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c
+===================================================================
+--- mdb.orig/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c	2014-04-16 18:33:00.547986732 +0400
++++ mdb/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c	2014-04-16 19:01:38.394135118 +0400
+@@ -572,7 +572,7 @@
+ {
+ 	topo_hdl_t th;
+ 
+-	if (wsp->walk_addr == NULL) {
++	if (wsp->walk_addr == 0) {
+ 		mdb_warn("NULL topo_hdl_t passed in");
+ 		return (WALK_ERR);
+ 	}
+@@ -595,7 +595,7 @@
+ 	int rv;
+ 	ttree_t *tree;
+ 
+-	if (wsp->walk_addr == NULL)
++	if (wsp->walk_addr == 0)
+ 		return (WALK_DONE);
+ 
+ 	if (mdb_vread(wsp->walk_data, sizeof (ttree_t), wsp->walk_addr)
+@@ -627,7 +627,7 @@
+ {
+ 	topo_hdl_t th;
+ 
+-	if (wsp->walk_addr == NULL) {
++	if (wsp->walk_addr == 0) {
+ 		mdb_warn("NULL topo_hdl_t passed in");
+ 		return (WALK_ERR);
+ 	}
+@@ -666,7 +666,7 @@
+ 	int rv;
+ 	topo_mod_t *tm;
+ 
+-	if (wsp->walk_addr == NULL)
++	if (wsp->walk_addr == 0)
+ 		return (WALK_DONE);
+ 
+ 	if (mdb_vread(wsp->walk_data, sizeof (topo_mod_t), wsp->walk_addr)
+@@ -692,7 +692,7 @@
+ 			return (DCMD_ERR);
+ 		}
+ 	else
+-		wsp->walk_addr = NULL;
++		wsp->walk_addr = 0;
+ 
+ 	return (rv);
+ }
+@@ -709,7 +709,7 @@
+ {
+ 	tnode_t node;
+ 
+-	if (wsp->walk_addr == NULL) {
++	if (wsp->walk_addr == 0) {
+ 		mdb_warn("NULL tnode_t passed in");
+ 		return (WALK_ERR);
+ 	}
+@@ -732,7 +732,7 @@
+ 	int rv;
+ 	topo_pgroup_t *tpgp;
+ 
+-	if (wsp->walk_addr == NULL)
++	if (wsp->walk_addr == 0)
+ 		return (WALK_DONE);
+ 
+ 	if (mdb_vread(wsp->walk_data, sizeof (topo_pgroup_t), wsp->walk_addr)
+@@ -765,7 +765,7 @@
+ {
+ 	topo_pgroup_t pg;
+ 
+-	if (wsp->walk_addr == NULL) {
++	if (wsp->walk_addr == 0) {
+ 		mdb_warn("NULL topo_pgroup_t passed in");
+ 		return (WALK_ERR);
+ 	}
+@@ -788,7 +788,7 @@
+ 	int rv;
+ 	topo_proplist_t *plp;
+ 
+-	if (wsp->walk_addr == NULL)
++	if (wsp->walk_addr == 0)
+ 		return (WALK_DONE);
+ 
+ 	if (mdb_vread(wsp->walk_data, sizeof (topo_proplist_t), wsp->walk_addr)
+@@ -822,7 +822,7 @@
+ 	tnode_t node;
+ 	tnwalk_state_t *state;
+ 
+-	if (wsp->walk_addr == NULL) {
++	if (wsp->walk_addr == 0) {
+ 		mdb_warn("NULL tnode_t passed in");
+ 		return (WALK_ERR);
+ 	}
diff --git a/mdb/debian/patches/series b/mdb/debian/patches/series
index 5809911..b24d81d 100644
--- a/mdb/debian/patches/series
+++ b/mdb/debian/patches/series
@@ -73,3 +73,5 @@ mdb-includes.patch
 mdb-only-needs-libtinfo.patch
 mdb-root-detect.patch
 mdb-dtrace-headers.patch
+mdb-libtopo-headers.patch
+mdb-libtopo-pointers.patch