Re: xentools41 paths

[Ignatios Souvatzis <is%netbsd.org@localhost>]

On Thu, Mar 14, 2013 at 08:47:29PM +0100, Ignatios Souvatzis wrote:
> On Thu, Mar 14, 2013 at 09:32:29AM -0700, Jeff Rizzo wrote:
> > On 3/13/13 6:43 AM, Ignatios Souvatzis wrote:
> > >On Tue, Mar 12, 2013 at 01:08:57PM +0100, Ignatios Souvatzis wrote:
> > >
> 
> [rpath handling patch to ocamlmklib]
> 
> > >May I commit?
> > 
> > Please do!
> 
> With this, the rpath handling in xentools41 works if patched thusly:
> 
> I intend to commit this soon.

Here's what's missing from Aarons patch set:

a) config paths, device paths adapted
b) Trimming what's read out ... but instead of Aaron's adopted
   Rosetta code, using a new String class function.

Hm... I wonder whether xenstored_proc_kva and xenstored_proc_port
should be patched per-OS. What does cxenstored do in our pkg?

        -is

Index: patches/patch-ocaml_xenstored_define.ml
===================================================================
RCS file: patches/patch-ocaml_xenstored_define.ml
diff -N patches/patch-ocaml_xenstored_define.ml
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ocaml_xenstored_define.ml     14 Mar 2013 20:38:16 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- ocaml/xenstored/define.ml.orig     2012-11-24 07:27:21.000000000 +0000
++++ ocaml/xenstored/define.ml  2012-11-24 07:33:59.000000000 +0000
+@@ -17,13 +17,13 @@
+ let xenstored_major = 1
+ let xenstored_minor = 0
+ 
+-let xenstored_proc_kva = "/proc/xen/xsd_kva"
+-let xenstored_proc_port = "/proc/xen/xsd_port"
++let xenstored_proc_kva = "/dev/xsd_kva"
++let xenstored_proc_port = "/kern/xen/xsd_port"
+ 
+ let xs_daemon_socket = "/var/run/xenstored/socket"
+ let xs_daemon_socket_ro = "/var/run/xenstored/socket_ro"
+ 
+-let default_config_dir = "/etc/xensource"
++let default_config_dir = "/usr/pkg/etc/xen"
+ 
+ let maxwatch = ref (50)
+ let maxtransaction = ref (20)
Index: patches/patch-ocaml_xenstored_utils.ml
===================================================================
RCS file: patches/patch-ocaml_xenstored_utils.ml
diff -N patches/patch-ocaml_xenstored_utils.ml
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ocaml_xenstored_utils.ml      14 Mar 2013 20:38:16 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- ocaml/xenstored/utils.ml.orig
++++ ocaml/xenstored/utils.ml
+@@ -87,7 +83,7 @@ let read_file_single_integer filename =
+       let buf = String.make 20 (char_of_int 0) in
+       let sz = Unix.read fd buf 0 20 in
+       Unix.close fd;
+-      int_of_string (String.sub buf 0 sz)
++      int_of_string (String.trim (String.sub buf 0 sz))
+ 
+ let path_complete path connection_path =
+       if String.get path 0 <> '/' then
--- listinfo    2013-03-14 21:20:58.000000000 +0100
+++ distinfo    2013-03-14 21:34:16.000000000 +0100
@@ -48,5 +48,7 @@
 SHA1 (patch-libxl_libxl_internal.h) = e126e5e998117903f0c66cc370d350c504ed33d9
 SHA1 (patch-ocaml_Makefile.rules) = 104f9d40186e5e4ca6a2e6359bbb369c3c91d1dc
 SHA1 (patch-ocaml_common.make) = c59d32301198d65691ab23529dd791de5ac40199
+SHA1 (patch-ocaml_xenstored_define.ml) = 
de83d4d4d8c891801e3bd38687097531f6591ed0
+SHA1 (patch-ocaml_xenstored_utils.ml) = 
cc792a696743fa348b274b1c23783ea1a0d7da47
 SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5
 SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7