Print this page
11736 Stop using $VERSION for the genunix label
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Toomas Soome <tsoome@me.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/mdb/Makefile.module
          +++ new/usr/src/cmd/mdb/Makefile.module
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  # Copyright (c) 2013 by Delphix. All rights reserved.
  26   26  # Copyright (c) 2019 Carlos Neira <cneirabustos@gmail.com>
  27   27  # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  28      -# Copyright (c) 2019, Joyent, Inc.
       28 +# Copyright 2019 Joyent, Inc.
  29   29  #
  30   30  
  31   31  .KEEP_STATE:
  32   32  .SUFFIXES:
  33   33  
  34   34  include $(SRC)/cmd/mdb/Makefile.tools
  35   35  
  36   36  #
  37   37  # Make sure we're getting a consistent execution environment for the
  38   38  # embedded scripts.
↓ open down ↓ 165 lines elided ↑ open up ↑
 204  204  #
 205  205  # Ensure that dmods don't use floating point
 206  206  #
 207  207  KMDB_FPTEST_CMD = $(KMDB_FPTEST)
 208  208  
 209  209  $(KMODFILE): kmod .WAIT $(KMODOBJS) $(MAPFILE)
 210  210          $(LD) -dy -r $(MAPFILE:%=-M%) -Nmisc/kmdbmod -o $@ $(KMODOBJS) \
 211  211          $(STANDOBJS)
 212  212          $(KMDB_LINKTEST_CMD)
 213  213          $(KMDB_FPTEST_CMD)
 214      -        $(CTFMERGE) -f -L VERSION -o $@ $(KMODOBJS)
      214 +        $(CTFMERGE) -l "$(UTS_LABEL)" -o $@ $(KMODOBJS)
 215  215          $(POST_PROCESS)
 216  216          $(SETDYNFLAG) -f DF_1_NOKSYMS $@
 217  217  
 218  218  linktest: linktest_check .WAIT kmod .WAIT $(KMODOBJS)
 219  219          $(KMDB_LINKTEST)
 220  220  
 221  221  linktest_check:
 222  222          @if [ "$(MDBTGT)" != "kvm" ] ; then \
 223  223                  echo "ERROR: linktest is not supported non-kvm/disasm dmods" \
 224  224                      >&2 ; \
↓ open down ↓ 80 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX