Bug 211046 - usr/share/locale/kk_KZ.UTF-8/* created by usr/src/etc/mtree/BSD.usr.dist and listed in src/ObsoleteFiles.inc
Summary: usr/share/locale/kk_KZ.UTF-8/* created by usr/src/etc/mtree/BSD.usr.dist and ...
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: conf (show other bugs)
Version: 11.0-STABLE
Hardware: Any Any
: --- Affects Some People
Assignee: Enji Cooper
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-07-12 20:21 UTC by david
Modified: 2016-07-27 06:30 UTC (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description david 2016-07-12 20:21:31 UTC 
Running:

FreeBSD g1-252.catwhisker.org 11.0-BETA1 FreeBSD 11.0-BETA1 #40  r302627M/302639:1100120: Tue Jul 12 03:52:24 PDT 2016     root@localhost:/common/S3/obj/usr/src/sys/CANARY  amd64

or:

FreeBSD g1-252.catwhisker.org 12.0-CURRENT FreeBSD 12.0-CURRENT #41  r302638M/302639:1200001: Tue Jul 12 04:50:41 PDT 2016     root@g1-252.catwhisker.org:/common/S4/obj/usr/src/sys/CANARY  amd64

on invoking 'make delete-old-libs', I see:

...
>>> Removing old files (only deletes safe to delete libs)
remove /usr/share/locale/kk_KZ.UTF-8/LC_COLLATE? y
remove /usr/share/locale/kk_KZ.UTF-8/LC_CTYPE? y
remove /usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES? y
remove /usr/share/locale/kk_KZ.UTF-8/LC_MONETARY? y
remove /usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC? y
remove /usr/share/locale/kk_KZ.UTF-8/LC_TIME? y
>>> Old files removed
...

Checking the stable/11 @r302627 sources, I find:

grep -wrn kk_KZ /usr/src/*
/usr/src/ObsoleteFiles.inc:456:OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
/usr/src/ObsoleteFiles.inc:457:OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
/usr/src/ObsoleteFiles.inc:458:OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
/usr/src/ObsoleteFiles.inc:459:OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MONETARY
/usr/src/ObsoleteFiles.inc:460:OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC
/usr/src/ObsoleteFiles.inc:461:OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME
/usr/src/ObsoleteFiles.inc:462:OLD_DIRS+=usr/share/locale/kk_KZ.PT154/
/usr/src/ObsoleteFiles.inc:463:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE
/usr/src/ObsoleteFiles.inc:464:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE
/usr/src/ObsoleteFiles.inc:465:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
/usr/src/ObsoleteFiles.inc:466:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY
/usr/src/ObsoleteFiles.inc:467:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC
/usr/src/ObsoleteFiles.inc:468:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME
/usr/src/ObsoleteFiles.inc:469:OLD_DIRS+=usr/share/locale/kk_KZ.UTF-8
/usr/src/etc/mtree/BSD.usr.dist:772:            kk_KZ.UTF-8
/usr/src/etc/mtree/BSD.usr.dist:1282:            kk_KZ.PT154
/usr/src/etc/mtree/BSD.usr.dist:1284:            kk_KZ.UTF-8
/usr/src/share/monetdef/Makefile:66:LOCALES+=        kk_KZ.UTF-8
/usr/src/share/msgdef/Makefile:44:LOCALES+=  kk_KZ.UTF-8
/usr/src/share/colldef/Makefile:33:LOCALES+= kk_KZ.UTF-8
/usr/src/share/timedef/Makefile:79:LOCALES+= kk_KZ.UTF-8
/usr/src/share/numericdef/Makefile:77:SAME+=         uk_UA.UTF-8 kk_KZ.UTF-8
/usr/src/share/ctypedef/Makefile:72:SAME+=           en_US.UTF-8 kk_KZ.UTF-8
/usr/src/tools/build/mk/OptionalObsoleteFiles.inc:5131:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE
/usr/src/tools/build/mk/OptionalObsoleteFiles.inc:5132:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE
/usr/src/tools/build/mk/OptionalObsoleteFiles.inc:5133:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
/usr/src/tools/build/mk/OptionalObsoleteFiles.inc:5134:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY
/usr/src/tools/build/mk/OptionalObsoleteFiles.inc:5135:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC
/usr/src/tools/build/mk/OptionalObsoleteFiles.inc:5136:OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME

I'm not clear what the intent is, but creating a handful of files just to delete them seems .... well, fixable.  (And this has actually been observed for the last several days -- from around the stable/11 branch point, IIRC.)

In any case, cleaning this up prior to 11-RELEASE seems goal-worthy.
Comment 1 Enji Cooper freebsd_committer freebsd_triage 2016-07-13 20:37:41 UTC 
I'll handle this tonight.
Comment 2 commit-hook freebsd_committer freebsd_triage 2016-07-14 14:16:37 UTC 
A commit references this bug:

Author: ngie
Date: Thu Jul 14 14:16:20 UTC 2016
New revision: 302842
URL: https://svnweb.freebsd.org/changeset/base/302842

Log:
  Don't delete usr/share/local/kk_KZ.UTF-8 with "make delete-old" after r302329

  kk_KZ.UTF-8 was originally removed in r290494, but restored as an alias to
  en_US.UTF-8 in r302329

  MFC after: 1 week
  X-MFC with: r302329
  PR: 211046
  Reported by: dhw, O. Hartman <ohartman@zedat.fu-berlin.de>
  Sponsored by: EMC / Isilon Storage Division

Changes:
  head/ObsoleteFiles.inc
Comment 3 commit-hook freebsd_committer freebsd_triage 2016-07-27 06:29:48 UTC 
A commit references this bug:

Author: ngie
Date: Wed Jul 27 06:29:27 UTC 2016
New revision: 303363
URL: https://svnweb.freebsd.org/changeset/base/303363

Log:
  MFC r302842:

  Don't delete usr/share/local/kk_KZ.UTF-8 with "make delete-old" after r302329

  kk_KZ.UTF-8 was originally removed in r290494, but restored as an alias to
  en_US.UTF-8 in r302329

  Approved by: re (kib)
  PR: 211046

Changes:
_U  stable/11/
Comment 4 commit-hook freebsd_committer freebsd_triage 2016-07-27 06:29:50 UTC 
A commit references this bug:

Author: ngie
Date: Wed Jul 27 06:29:41 UTC 2016
New revision: 303364
URL: https://svnweb.freebsd.org/changeset/base/303364

Log:
  MFC r302842:

  Don't delete usr/share/local/kk_KZ.UTF-8 with "make delete-old" after r302329

  kk_KZ.UTF-8 was originally removed in r290494, but restored as an alias to
  en_US.UTF-8 in r302329

  Approved by: re (kib)
  PR: 211046

Changes:
  stable/11/ObsoleteFiles.inc