util-illumos (2.10+1) unstable; urgency=low

  * Added pbind-no-isaexec.patch
  * Added psrset-no-isaexec.patch
  * Build depends on libadm1-dev
  * Build prtdiag, pbind, psrinfo, psrset
  * Use native version scheme

7 files changed, 53 insertions, 7 deletions

diff --git a/util-illumos/debian/changelog b/util-illumos/debian/changelog
index 453f250..bef9569 100644
--- a/util-illumos/debian/changelog
+++ b/util-illumos/debian/changelog
@@ -1,8 +1,12 @@
-util-illumos (2.10-5) UNRELEASED; urgency=low
+util-illumos (2.10+1) unstable; urgency=low
 
+  * Added pbind-no-isaexec.patch
+  * Added psrset-no-isaexec.patch
   * Build depends on libadm1-dev
+  * Build prtdiag, pbind, psrinfo, psrset
+  * Use native version scheme
 
- -- Igor Pashev <pashev.igor@gmail.com>  Mon, 29 Apr 2013 01:27:10 +0400
+ -- Igor Pashev <pashev.igor@gmail.com>  Tue, 24 Sep 2013 16:04:02 +0400
 
 util-illumos (2.10-4) unstable; urgency=low
 
diff --git a/util-illumos/debian/patches/pbind-no-isaexec.patch b/util-illumos/debian/patches/pbind-no-isaexec.patch
new file mode 100644
index 0000000..bb2a0e3
--- /dev/null
+++ b/util-illumos/debian/patches/pbind-no-isaexec.patch
@@ -0,0 +1,13 @@
+Index: util-illumos/usr/src/cmd/pbind/Makefile
+===================================================================
+--- util-illumos.orig/usr/src/cmd/pbind/Makefile	2012-10-08 04:25:31.000000000 +0400
++++ util-illumos/usr/src/cmd/pbind/Makefile	2013-09-24 14:57:16.049797292 +0400
+@@ -46,8 +46,6 @@
+ all clean clobber lint:	$(SUBDIRS)
+ 
+ install:	$(SUBDIRS)
+-	-$(RM) $(ROOTUSRSBINPROG)
+-	-$(LN) $(ISAEXEC) $(ROOTUSRSBINPROG)
+ 
+ $(SUBDIRS):	FRC
+ 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/util-illumos/debian/patches/psrset-no-isaexec.patch b/util-illumos/debian/patches/psrset-no-isaexec.patch
new file mode 100644
index 0000000..9ce2d3b
--- /dev/null
+++ b/util-illumos/debian/patches/psrset-no-isaexec.patch
@@ -0,0 +1,13 @@
+Index: util-illumos/usr/src/cmd/psrset/Makefile
+===================================================================
+--- util-illumos.orig/usr/src/cmd/psrset/Makefile	2012-10-08 04:25:33.000000000 +0400
++++ util-illumos/usr/src/cmd/psrset/Makefile	2013-09-24 16:03:35.124873146 +0400
+@@ -46,8 +46,6 @@
+ all clean clobber lint:	$(SUBDIRS)
+ 
+ install:	$(SUBDIRS)
+-	-$(RM) $(ROOTUSRSBINPROG)
+-	-$(LN) $(ISAEXEC) $(ROOTUSRSBINPROG)
+ 
+ $(SUBDIRS):	FRC
+ 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/util-illumos/debian/patches/series b/util-illumos/debian/patches/series
index c69cec9..ec0edfc 100644
--- a/util-illumos/debian/patches/series
+++ b/util-illumos/debian/patches/series
@@ -16,3 +16,5 @@ fdisk-avoid-libadm.patch
 lofiadm.patch
 lofiadm-man-page-no-crypt.patch
 format-int-of-range.patch
+pbind-no-isaexec.patch
+psrset-no-isaexec.patch
diff --git a/util-illumos/debian/rules b/util-illumos/debian/rules
index 8bd4a69..0bf9532 100755
--- a/util-illumos/debian/rules
+++ b/util-illumos/debian/rules
@@ -6,24 +6,28 @@ export DH_VERBOSE = 1
 
 # We've patched it, so i386 is suitable for any arch:
 cmd := \
-	prtconf/i386 \
-	sysdef/i386 \
-	newtask/i386 \
-	swap/i386 \
 	biosdev \
 	devprop \
 	fdisk \
 	fmthard \
-	prtvtoc \
 	format \
 	isainfo \
 	isalist \
 	lofiadm \
 	mesg \
 	mkfile \
+	newtask/i386 \
+	prtconf/i386 \
+	pbind/i386 \
+	prtdiag \
+	prtvtoc \
 	psradm \
+	psrinfo \
+	psrset/i386 \
 	ramdiskadm \
 	rtc \
+	swap/i386 \
+	sysdef/i386 \
 	zonename \
 
 unpack: unpack-stamp
@@ -52,6 +56,8 @@ unpack-stamp:
 	# Disable ISA dirs:
 	echo 'ROOTUSRSBIN32=$$(ROOTUSRSBIN)' >> usr/src/cmd/Makefile.cmd
 	echo 'ROOTBIN32=$$(ROOTBIN)' >> usr/src/cmd/Makefile.cmd
+	echo 'ROOTUSRSBIN64=$$(ROOTUSRSBIN)' >> usr/src/cmd/Makefile.cmd
+	echo 'ROOTBIN64=$$(ROOTBIN)' >> usr/src/cmd/Makefile.cmd
 	touch $@
 
 patch: patch-stamp
diff --git a/util-illumos/debian/util-illumos.install b/util-illumos/debian/util-illumos.install
index 1e18025..a802ac1 100644
--- a/util-illumos/debian/util-illumos.install
+++ b/util-illumos/debian/util-illumos.install
@@ -20,9 +20,13 @@ usr/sbin/fmthard
 usr/sbin/format
 usr/sbin/lofiadm
 usr/sbin/mkfile
+usr/sbin/pbind
 usr/sbin/prtconf
+usr/sbin/prtdiag
 usr/sbin/prtvtoc
 usr/sbin/psradm
+usr/sbin/psrinfo
+usr/sbin/psrset
 usr/sbin/ramdiskadm
 usr/sbin/rtc
 usr/sbin/swap
diff --git a/util-illumos/debian/util-illumos.manpages b/util-illumos/debian/util-illumos.manpages
index c81ed2f..8ddcdb4 100644
--- a/util-illumos/debian/util-illumos.manpages
+++ b/util-illumos/debian/util-illumos.manpages
@@ -11,9 +11,13 @@ usr/src/man/man1m/fmthard.1m
 usr/src/man/man1m/format.1m
 usr/src/man/man1m/lofiadm.1m
 usr/src/man/man1m/mkfile.1m
+usr/src/man/man1m/pbind.1m
 usr/src/man/man1m/prtconf.1m
+usr/src/man/man1m/prtdiag.1m
 usr/src/man/man1m/prtvtoc.1m
 usr/src/man/man1m/psradm.1m
+usr/src/man/man1m/psrinfo.1m
+usr/src/man/man1m/psrset.1m
 usr/src/man/man1m/ramdiskadm.1m
 usr/src/man/man1m/rtc.1m
 usr/src/man/man1m/soconfig.1m