bootadm (2.10-3) unstable; urgency=low

  * Strip binaries
  * Added named trigger "boot-archive"
  * Patch usr/src/cmd/boot/bootadm/bootadm.c to avoid sys/ucode.h by including
    all required definitions: UCODE_VENDORS and UCODE_INSTALL_PATH

5 files changed, 56 insertions, 2 deletions

diff --git a/bootadm/debian/bootadm.postinst b/bootadm/debian/bootadm.postinst
new file mode 100644
index 0000000..49041b6
--- /dev/null
+++ b/bootadm/debian/bootadm.postinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+trigger_boot_archive() {
+    /sbin/bootadm update-archive
+}
+
+case "$1" in
+    configure)
+    ;;
+
+    triggered)
+        trigger_boot_archive
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
diff --git a/bootadm/debian/bootadm.triggers b/bootadm/debian/bootadm.triggers
new file mode 100644
index 0000000..e4468ea
--- /dev/null
+++ b/bootadm/debian/bootadm.triggers
@@ -0,0 +1 @@
+interest boot-archive
diff --git a/bootadm/debian/changelog b/bootadm/debian/changelog
index 61cf101..a9ca4aa 100644
--- a/bootadm/debian/changelog
+++ b/bootadm/debian/changelog
@@ -1,8 +1,11 @@
-bootadm (2.10-3) UNRELEASED; urgency=low
+bootadm (2.10-3) unstable; urgency=low
 
   * Strip binaries
+  * Added named trigger "boot-archive"
+  * Patch usr/src/cmd/boot/bootadm/bootadm.c to avoid sys/ucode.h by including
+    all required definitions: UCODE_VENDORS and UCODE_INSTALL_PATH
 
- -- Igor Pashev <pashev.igor@gmail.com>  Sat, 30 Mar 2013 11:53:56 +0000
+ -- Igor Pashev <pashev.igor@gmail.com>  Mon, 13 May 2013 16:28:52 +0400
 
 bootadm (2.10-2) unstable; urgency=low
 
diff --git a/bootadm/debian/patches/bootadm-avoid-sys_ucode.h.patch b/bootadm/debian/patches/bootadm-avoid-sys_ucode.h.patch
new file mode 100644
index 0000000..aa98757
--- /dev/null
+++ b/bootadm/debian/patches/bootadm-avoid-sys_ucode.h.patch
@@ -0,0 +1,24 @@
+Index: bootadm/usr/src/cmd/boot/bootadm/bootadm.c
+===================================================================
+--- bootadm.orig/usr/src/cmd/boot/bootadm/bootadm.c	2013-05-13 16:06:09.472271912 +0400
++++ bootadm/usr/src/cmd/boot/bootadm/bootadm.c	2013-05-13 16:15:11.856230842 +0400
+@@ -68,7 +68,18 @@
+ #endif
+ 
+ #if !defined(_OPB)
+-#include <sys/ucode.h>
++#define UCODE_INSTALL_PATH "platform/i86pc/ucode"
++#define UCODE_VENDORS               \
++static struct {                 \
++    char *filestr;              \
++    char *extstr;               \
++    char *vendorstr;            \
++    int  supported;             \
++} ucode_vendors[] = {               \
++    { "intel", "txt", "GenuineIntel", 1 },  \
++    { "amd", "bin", "AuthenticAMD", 1 },    \
++    { NULL, NULL, NULL, 0 }         \
++}
+ #endif
+ 
+ #include <pwd.h>
diff --git a/bootadm/debian/patches/series b/bootadm/debian/patches/series
index 808d8d4..63d9df6 100644
--- a/bootadm/debian/patches/series
+++ b/bootadm/debian/patches/series
@@ -9,3 +9,4 @@ bootadm-no-create_ramdisk.patch
 bootadm-no-extract_boot_filelist.patch
 bootadm-manpage.patch
 bootadm-POPEN_msg.patch
+bootadm-avoid-sys_ucode.h.patch