Project

General

Profile

Bug #10507

NO_GENUNIX_UNIQUIFY has no effect

Added by Matthew Ahrens 5 months ago. Updated 3 months ago.

Status:
Closed
Priority:
Normal
Assignee:
Category:
-
Start date:
2019-03-05
Due date:
% Done:

100%

Estimated time:
Difficulty:
Medium
Tags:
needs-triage

Description

Looks like NO_GENUNIX_UNIQUIFY has been a no-op since 2015. However, this was usually not noticed, especially because (until recently) ctfmerge would not fail when trying to uniquify against a non-existent file. FYI, Rob Mustacchi is looking in to the change to how ctfmerge handles non-existent uniquification files.

It looks like this was introduced by a typo in the fix for 5773.

This will correct the error:

diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts
index 8f341807e12..e531a23f0b7 100644
--- a/usr/src/uts/Makefile.uts
+++ b/usr/src/uts/Makefile.uts
@ -348,7 +348,7 @ CTFMERGE_GENUNIX = \ #
NO_GENUNIX_UNIQUIFY=$(POUND_SIGN)
CTFMERGE_GENUNIX_DFLAG=-d $(CTFMERGE_GENUNIX)
-$(NO_GENUNIX_UNIQUIFY)CTF_GENUNIX_DFLAG=
+$(NO_GENUNIX_UNIQUIFY)CTFMERGE_GENUNIX_DFLAG=

CTFMERGE_UNIQUIFY_AGAINST_GENUNIX      = \
$(CTFMERGE) $(CTFMRGFLAGS) -L VERSION \

History

#1

Updated by Gordon Ross 3 months ago

  • Status changed from New to Pending RTI
  • Assignee changed from Matthew Ahrens to Gordon Ross
#2

Updated by Electric Monk 3 months ago

  • Status changed from Pending RTI to Closed
  • % Done changed from 0 to 100

git commit 0193495632be916873f94049cb3da876f1b1ae01

commit  0193495632be916873f94049cb3da876f1b1ae01
Author: Matt Ahrens <mahrens@delphix.com>
Date:   2019-05-03T02:12:51.000Z

    10507 NO_GENUNIX_UNIQUIFY has no effect
    Reviewed by: Robert MusMustacchi <rm@joyent.com>
    Reviewed by: Gergő Doma <domag02@gmail.com>
    Approved by: Richard Lowe <richlowe@richlowe.net>

Also available in: Atom PDF