diff options
| author | John Levon <john.levon@joyent.com> | 2019-04-01 10:05:45 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2019-04-08 08:43:36 +0000 |
| commit | fa83485c3551a3fd3848f1535acb98b30c6595a2 (patch) | |
| tree | d1ab84da58bdbfaf128c634c000feebb17422123 /usr/src/cmd/mdb/intel/amd64 | |
| parent | 9a8207fa35a4a0b13b30000d6ead058c47c0ccc3 (diff) | |
| download | illumos-joyent-fa83485c3551a3fd3848f1535acb98b30c6595a2.tar.gz | |
OS-7260 SmartOS should support booting with loader
OS-7271 proto.boot should include loader instead of grub
OS-7332 RICHMOND-16 mitigation ensnares stock loaders
OS-7584 MDB module for disk labelling would be useful
OS-7585 Need workaround to EFI boot on AMI BIOS
OS-7595 Triton-specific extensions to Loader
Portions contributed by: Rob Johnston <rob.johnston@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/cmd/mdb/intel/amd64')
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/disk_label/Makefile | 28 |
2 files changed, 31 insertions, 2 deletions
diff --git a/usr/src/cmd/mdb/intel/amd64/Makefile b/usr/src/cmd/mdb/intel/amd64/Makefile index f7bc890fb5..6ddc6b59d5 100644 --- a/usr/src/cmd/mdb/intel/amd64/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/Makefile @@ -21,12 +21,13 @@ # # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# Copyright 2018 Joyent, Inc. +# Copyright 2019 Joyent, Inc. # include ../../Makefile.common -MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM) uhci +MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM) +MODULES += disk_label uhci SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES) diff --git a/usr/src/cmd/mdb/intel/amd64/disk_label/Makefile b/usr/src/cmd/mdb/intel/amd64/disk_label/Makefile new file mode 100644 index 0000000000..7b084ac28c --- /dev/null +++ b/usr/src/cmd/mdb/intel/amd64/disk_label/Makefile @@ -0,0 +1,28 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# +# Copyright (c) 2019, Joyent, Inc. +# + +MODULE = disk_label.so +MDBTGT = raw + +MODSRCS = disk_label.c + +include ../../../../Makefile.cmd +include ../../../../Makefile.cmd.64 +include ../../Makefile.amd64 +include ../../../Makefile.module + +MODSRCS_DIR = ../../../common/modules/disk_label + +CPPFLAGS += -I$(SRC)/uts/common -I$(SRC)/cmd/boot/installboot/i386 + +LDLIBS += -luuid |