summaryrefslogtreecommitdiff
path: root/bootadm
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2013-01-01 05:35:17 +0400
committerIgor Pashev <pashev.igor@gmail.com>2013-01-01 05:35:17 +0400
commit36ff0d5000b2d4263ba1ca5dcc132461fe5240c9 (patch)
tree9893683547fa3333343947bef326c05807b544fb /bootadm
parentcc3d9c42fc8c1a0c641d3e5f0edcf4d40a50763d (diff)
downloadillumos-packaging-36ff0d5000b2d4263ba1ca5dcc132461fe5240c9.tar.gz
libfdisk is not used
Diffstat (limited to 'bootadm')
-rw-r--r--bootadm/debian/patches/bootadm-redundlant-libfdisk.patch14
-rw-r--r--bootadm/debian/patches/series1
2 files changed, 15 insertions, 0 deletions
diff --git a/bootadm/debian/patches/bootadm-redundlant-libfdisk.patch b/bootadm/debian/patches/bootadm-redundlant-libfdisk.patch
new file mode 100644
index 0000000..e1df9fa
--- /dev/null
+++ b/bootadm/debian/patches/bootadm-redundlant-libfdisk.patch
@@ -0,0 +1,14 @@
+Index: bootadm/usr/src/cmd/boot/bootadm/Makefile
+===================================================================
+--- bootadm.orig/usr/src/cmd/boot/bootadm/Makefile 2013-01-01 05:23:55.382973632 +0400
++++ bootadm/usr/src/cmd/boot/bootadm/Makefile 2013-01-01 05:25:03.486524010 +0400
+@@ -35,8 +35,7 @@
+
+ .KEEP_STATE:
+
+-LDLIBS_i386= -lfdisk
+-LDLIBS += -lnvpair -lgen -lefi -lz $(LDLIBS_$(MACH))
++LDLIBS += -lnvpair -lgen -lefi -lz
+
+ # Writing into string literals is incorrect. We need to match gcc's
+ # behavior, which causes us to take SIGSEGV on such a write.
diff --git a/bootadm/debian/patches/series b/bootadm/debian/patches/series
index 1b30a76..244bb2d 100644
--- a/bootadm/debian/patches/series
+++ b/bootadm/debian/patches/series
@@ -4,3 +4,4 @@ bootadm-avoid-libadm.patch
bootadm-avoid-smf.patch
installgrub-libmd.patch
dyson-bootadm-disable-multiarch.patch
+bootadm-redundlant-libfdisk.patch