Package bootadm only (no installgrub)

9 files changed, 17 insertions, 88 deletions

diff --git a/bootadm/debian/bootadm.install b/bootadm/debian/bootadm.install
new file mode 100644
index 0000000..042bc3f
--- /dev/null
+++ b/bootadm/debian/bootadm.install
@@ -0,0 +1,6 @@
+sbin/bootadm
+usr/sbin/bootadm
+lib/svc/method/boot-archive
+lib/svc/method/boot-archive-update
+lib/svc/manifest/system/boot-archive.xml
+lib/svc/manifest/system/boot-archive-update.xml
diff --git a/bootadm/debian/bootadm.manpages b/bootadm/debian/bootadm.manpages
new file mode 100644
index 0000000..7916d70
--- /dev/null
+++ b/bootadm/debian/bootadm.manpages
@@ -0,0 +1 @@
+usr/src/man/man1m/bootadm.1m
diff --git a/bootadm/debian/changelog b/bootadm/debian/changelog
index 6093dfb..06f0863 100644
--- a/bootadm/debian/changelog
+++ b/bootadm/debian/changelog
@@ -1,4 +1,4 @@
-zfsutils (2.10-1) unstable; urgency=low
+bootadm (2.10-1) unstable; urgency=low
 
   * Initial release.
 
diff --git a/bootadm/debian/control b/bootadm/debian/control
index 675e1c9..e3ba417 100644
--- a/bootadm/debian/control
+++ b/bootadm/debian/control
@@ -8,16 +8,15 @@ Build-Depends:
  libefi1-dev,
  libnvpair1-dev,
  libz-dev,
- libfdisk1-dev [illumos-amd64 illumos-i386],
  quilt,
 Standards-Version: 3.9.3
 Homepage: https://www.illumos.org
  
 Package: bootadm
 Priority: required
-Section: admin
+Section: kernel
 Architecture: illumos-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, mkisofs
 Description: manage bootability of iIllumos
  The bootadm command manages the boot archive and,  with  x86 boot
  environments, the GRUB (GRand Unified Bootloader) menu.  The update-archive
diff --git a/bootadm/debian/patches/boot-no-unused-progs.patch b/bootadm/debian/patches/boot-no-unused-progs.patch
deleted file mode 100644
index 7275d83..0000000
--- a/bootadm/debian/patches/boot-no-unused-progs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: These progs are not used
-Index: bootadm/usr/src/cmd/boot/Makefile
-===================================================================
---- bootadm.orig/usr/src/cmd/boot/Makefile	2012-10-08 04:25:22.000000000 +0400
-+++ bootadm/usr/src/cmd/boot/Makefile	2012-12-30 01:34:38.979292682 +0400
-@@ -34,8 +34,6 @@
- 
- i386_SUBDIRS=		\
- 	installgrub	\
--	mbr		\
--	symdef
- 
- sparc_SUBDIRS=		\
- 	installboot
diff --git a/bootadm/debian/patches/boot-scripts-make.patch b/bootadm/debian/patches/boot-scripts-make.patch
deleted file mode 100644
index 716de88..0000000
--- a/bootadm/debian/patches/boot-scripts-make.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix building root_archive
- GNU make tries root_archive.c, add a rule for *.ksh
-Index: bootadm/usr/src/cmd/boot/scripts/Makefile.com
-===================================================================
---- bootadm.orig/usr/src/cmd/boot/scripts/Makefile.com	2012-10-08 04:25:23.000000000 +0400
-+++ bootadm/usr/src/cmd/boot/scripts/Makefile.com	2012-12-29 16:14:55.437683894 +0400
-@@ -67,7 +67,7 @@
- 	$(RM) $@; $(SYMLINK) ../../../usr/sbin/$(@F) $@
- 
- # Default rule for building ksh scripts.
--.ksh:
-+%: %.ksh
- 	$(RM) $@
- 	$(CAT) $< > $@
- 	$(CHMOD) +x $@
diff --git a/bootadm/debian/patches/fiocompress.c-avoid-extra-headers.patch b/bootadm/debian/patches/fiocompress.c-avoid-extra-headers.patch
deleted file mode 100644
index 1b5b967..0000000
--- a/bootadm/debian/patches/fiocompress.c-avoid-extra-headers.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: bootadm/usr/src/cmd/boot/fiocompress/fiocompress.c
-===================================================================
---- bootadm.orig/usr/src/cmd/boot/fiocompress/fiocompress.c	2012-10-08 04:25:23.000000000 +0400
-+++ bootadm/usr/src/cmd/boot/fiocompress/fiocompress.c	2012-12-29 15:47:09.786339992 +0400
-@@ -30,6 +30,7 @@
-  */
- 
- #include <stdio.h>
-+#include <string.h>
- #include <errno.h>
- #include <stdlib.h>
- #include <fcntl.h>
-@@ -37,11 +38,29 @@
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <unistd.h>
--#include <utility.h>
- #include <zlib.h>
- 
- #include <sys/filio.h>
--#include <sys/fs/decomp.h>
-+
-+/* From sys/fs/decomp.h >>>>> */
-+struct comphdr {
-+        uint64_t        ch_magic;
-+        uint64_t        ch_version;
-+        uint64_t        ch_algorithm;
-+        uint64_t        ch_fsize;
-+        uint64_t        ch_blksize;
-+        uint64_t        ch_blkmap[1];
-+};
-+
-+#define CH_MAGIC_ZLIB   0x5a636d70      /* ZLIB compression */
-+#define CH_MAGIC_GZIP   0x8B1F          /* GZIP compression */
-+#define CH_VERSION      1
-+#define CH_ALG_ZLIB     1
-+
-+#define ZMAXBUF(n) ((n) + ((n) / 1000) + 12)
-+/* <<<<< From sys/fs/decomp.h */
-+
-+#define MIN(x, y) ((x) < (y) ? (x) : (y))
- 
- #include "message.h"
- 
diff --git a/bootadm/debian/patches/series b/bootadm/debian/patches/series
index 244bb2d..201e4f6 100644
--- a/bootadm/debian/patches/series
+++ b/bootadm/debian/patches/series
@@ -2,6 +2,5 @@ revert-923.patch
 bootadm-pointers.patch
 bootadm-avoid-libadm.patch
 bootadm-avoid-smf.patch
-installgrub-libmd.patch
 dyson-bootadm-disable-multiarch.patch
 bootadm-redundlant-libfdisk.patch
diff --git a/bootadm/debian/rules b/bootadm/debian/rules
index 8d39400..bb3e1cc 100755
--- a/bootadm/debian/rules
+++ b/bootadm/debian/rules
@@ -9,13 +9,10 @@ unpack-stamp:
 		usr/src/cmd/boot/Makefile.com \
 		usr/src/cmd/boot/Makefile.targ \
 		usr/src/cmd/boot/bootadm \
-		usr/src/cmd/boot/common \
-		usr/src/cmd/boot/installgrub \
 		usr/src/cmd/boot/scripts/boot-archive-update.\* \
-		usr/src/common/fs/pcfilep.h \
-		usr/src/common/fs/pcfs.c \
+		usr/src/cmd/svc/milestone/boot-archive \
+		usr/src/cmd/svc/milestone/boot-archive.xml \
 		usr/src/man/man1m/bootadm.1m \
-		usr/src/man/man1m/installgrub.1m \
 
 	# Buggy and unused:
 	echo > usr/src/Makefile.msg.targ
@@ -34,9 +31,7 @@ unpatch:
 
 dirs-stamp: unpack-stamp
 	. usr/env.sh; mkdir -p \
-		debian/tmp/boot/solaris/bin \
 		debian/tmp/lib/svc/method \
-		debian/tmp/usr/bin \
 		debian/tmp/sbin \
 		debian/tmp/usr/sbin
 	touch $@
@@ -44,15 +39,17 @@ dirs-stamp: unpack-stamp
 install build build-arch build-indep: build-stamp
 
 build-stamp: dirs-stamp patch-stamp
-	dh_illumos_make --native \
-		usr/src/cmd/boot/bootadm \
-		usr/src/cmd/boot/installgrub
+	dh_illumos_make --native usr/src/cmd/boot/bootadm
 	mkdir -p debian/tmp/lib/svc/method \
 		debian/tmp/lib/svc/manifest/system
 	cp usr/src/cmd/boot/scripts/boot-archive-update.ksh \
 		debian/tmp/lib/svc/method/boot-archive-update
 	cp usr/src/cmd/boot/scripts/boot-archive-update.xml \
 		debian/tmp/lib/svc/manifest/system/boot-archive-update.xml
+	cp usr/src/cmd/svc/milestone/boot-archive \
+		debian/tmp/lib/svc/method/boot-archive
+	cp usr/src/cmd/svc/milestone/boot-archive.xml \
+		debian/tmp/lib/svc/manifest/system/boot-archive.xml
 	touch $@
 
 binary binary-arch binary-indep: binary-stamp