Date: Tue, 3 Aug 2021 10:32:33 -0700 (PDT) From: "Rodney W. Grimes" <freebsd@gndrsh.dnsmgr.net> To: Baptiste Daroussin <bapt@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 184d64af1344 - main - locales: stop hardcoding the directories in the mtree Message-ID: <202108031732.173HWXr9049195@gndrsh.dnsmgr.net> In-Reply-To: <202108031227.173CR1qN084657@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=184d64af1344d6f3c370499510cede49320f4863 > > commit 184d64af1344d6f3c370499510cede49320f4863 > Author: Baptiste Daroussin <bapt@FreeBSD.org> > AuthorDate: 2021-08-03 12:25:00 +0000 > Commit: Baptiste Daroussin <bapt@FreeBSD.org> > CommitDate: 2021-08-03 12:25:00 +0000 > > locales: stop hardcoding the directories in the mtree > > The framework knows how to create directories and tag them properly > for a the creation of a mtree, not need to hardcode all the locales > entries in bsd.usr.mk > > This simplifies addition of new locales but also allow people building > with WITHOUT_LOCALES to end up with a directory full of empty files The uses of /etc/mtree go beyond the simple directory creation, please cause something to build a BSD.locale.dist file and install it in /etc/mtree to replace the functionality removal you have just performed. Thanks, Rod > --- > etc/mtree/BSD.usr.dist | 383 ----------------------------------- > share/colldef/Makefile | 2 + > share/colldef_unicode/Makefile | 2 + > share/ctypedef/Makefile | 2 + > share/monetdef/Makefile | 2 + > share/monetdef_unicode/Makefile | 2 + > share/msgdef/Makefile | 2 + > share/msgdef_unicode/Makefile | 2 + > share/numericdef/Makefile | 2 + > share/numericdef_unicode/Makefile | 2 + > share/timedef/Makefile | 2 + > tools/tools/locale/tools/cldr2def.pl | 2 + > 12 files changed, 22 insertions(+), 383 deletions(-) > > diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist > index 97d17cedb5a1..c96ec1ea5fb5 100644 > --- a/etc/mtree/BSD.usr.dist > +++ b/etc/mtree/BSD.usr.dist > @@ -465,389 +465,6 @@ > .. > .. > locale > - af_ZA.ISO8859-1 > - .. > - af_ZA.ISO8859-15 > - .. > - af_ZA.UTF-8 > - .. > - ar_AE.UTF-8 > - .. > - ar_EG.UTF-8 > - .. > - ar_JO.UTF-8 > - .. > - ar_MA.UTF-8 > - .. > - ar_QA.UTF-8 > - .. > - ar_SA.UTF-8 > - .. > - am_ET.UTF-8 > - .. > - be_BY.CP1131 > - .. > - be_BY.CP1251 > - .. > - be_BY.ISO8859-5 > - .. > - be_BY.UTF-8 > - .. > - bg_BG.CP1251 > - .. > - bg_BG.UTF-8 > - .. > - ca_AD.ISO8859-1 > - .. > - ca_AD.ISO8859-15 > - .. > - ca_ES.ISO8859-1 > - .. > - ca_ES.ISO8859-15 > - .. > - ca_FR.ISO8859-1 > - .. > - ca_FR.ISO8859-15 > - .. > - ca_IT.ISO8859-1 > - .. > - ca_IT.ISO8859-15 > - .. > - ca_AD.UTF-8 > - .. > - ca_ES.UTF-8 > - .. > - ca_FR.UTF-8 > - .. > - ca_IT.UTF-8 > - .. > - cs_CZ.ISO8859-2 > - .. > - cs_CZ.UTF-8 > - .. > - da_DK.ISO8859-1 > - .. > - da_DK.ISO8859-15 > - .. > - da_DK.UTF-8 > - .. > - de_AT.ISO8859-1 > - .. > - de_AT.ISO8859-15 > - .. > - de_AT.UTF-8 > - .. > - de_CH.ISO8859-1 > - .. > - de_CH.ISO8859-15 > - .. > - de_CH.UTF-8 > - .. > - de_DE.ISO8859-1 > - .. > - de_DE.ISO8859-15 > - .. > - de_DE.UTF-8 > - .. > - el_GR.ISO8859-7 > - .. > - el_GR.UTF-8 > - .. > - en_AU.ISO8859-1 > - .. > - en_AU.ISO8859-15 > - .. > - en_AU.US-ASCII > - .. > - en_AU.UTF-8 > - .. > - en_CA.ISO8859-1 > - .. > - en_CA.ISO8859-15 > - .. > - en_CA.US-ASCII > - .. > - en_CA.UTF-8 > - .. > - en_GB.ISO8859-1 > - .. > - en_GB.ISO8859-15 > - .. > - en_GB.US-ASCII > - .. > - en_GB.UTF-8 > - .. > - en_HK.ISO8859-1 > - .. > - en_HK.UTF-8 > - .. > - en_IE.ISO8859-1 > - .. > - en_IE.ISO8859-15 > - .. > - en_IE.UTF-8 > - .. > - en_NZ.ISO8859-1 > - .. > - en_NZ.ISO8859-15 > - .. > - en_NZ.US-ASCII > - .. > - en_NZ.UTF-8 > - .. > - en_PH.UTF-8 > - .. > - en_SG.ISO8859-1 > - .. > - en_SG.UTF-8 > - .. > - en_US.ISO8859-1 > - .. > - en_US.ISO8859-15 > - .. > - en_US.US-ASCII > - .. > - en_US.UTF-8 > - .. > - en_ZA.ISO8859-1 > - .. > - en_ZA.ISO8859-15 > - .. > - en_ZA.US-ASCII > - .. > - en_ZA.UTF-8 > - .. > - es_AR.ISO8859-1 > - .. > - es_AR.UTF-8 > - .. > - es_CR.UTF-8 > - .. > - es_ES.ISO8859-1 > - .. > - es_ES.ISO8859-15 > - .. > - es_ES.UTF-8 > - .. > - es_MX.ISO8859-1 > - .. > - es_MX.UTF-8 > - .. > - et_EE.ISO8859-1 > - .. > - et_EE.ISO8859-15 > - .. > - et_EE.UTF-8 > - .. > - eu_ES.ISO8859-1 > - .. > - eu_ES.ISO8859-15 > - .. > - eu_ES.UTF-8 > - .. > - fi_FI.ISO8859-1 > - .. > - fi_FI.ISO8859-15 > - .. > - fi_FI.UTF-8 > - .. > - fr_BE.ISO8859-1 > - .. > - fr_BE.ISO8859-15 > - .. > - fr_BE.UTF-8 > - .. > - fr_CA.ISO8859-1 > - .. > - fr_CA.ISO8859-15 > - .. > - fr_CA.UTF-8 > - .. > - fr_CH.ISO8859-1 > - .. > - fr_CH.ISO8859-15 > - .. > - fr_CH.UTF-8 > - .. > - fr_FR.ISO8859-1 > - .. > - fr_FR.ISO8859-15 > - .. > - fr_FR.UTF-8 > - .. > - ga_IE.UTF-8 > - .. > - he_IL.UTF-8 > - .. > - hi_IN.ISCII-DEV > - .. > - hi_IN.UTF-8 > - .. > - hr_HR.ISO8859-2 > - .. > - hr_HR.UTF-8 > - .. > - hu_HU.ISO8859-2 > - .. > - hu_HU.UTF-8 > - .. > - hy_AM.ARMSCII-8 > - .. > - hy_AM.UTF-8 > - .. > - is_IS.ISO8859-1 > - .. > - is_IS.ISO8859-15 > - .. > - is_IS.UTF-8 > - .. > - it_CH.ISO8859-1 > - .. > - it_CH.ISO8859-15 > - .. > - it_CH.UTF-8 > - .. > - it_IT.ISO8859-1 > - .. > - it_IT.ISO8859-15 > - .. > - it_IT.UTF-8 > - .. > - ja_JP.SJIS > - .. > - ja_JP.UTF-8 > - .. > - ja_JP.eucJP > - .. > - kk_KZ.UTF-8 > - .. > - ko_KR.CP949 > - .. > - ko_KR.UTF-8 > - .. > - ko_KR.eucKR > - .. > - lt_LT.ISO8859-13 > - .. > - lt_LT.UTF-8 > - .. > - lv_LV.ISO8859-13 > - .. > - lv_LV.UTF-8 > - .. > - mn_MN.UTF-8 > - .. > - nb_NO.ISO8859-1 > - .. > - nb_NO.ISO8859-15 > - .. > - nb_NO.UTF-8 > - .. > - nl_BE.ISO8859-1 > - .. > - nl_BE.ISO8859-15 > - .. > - nl_BE.UTF-8 > - .. > - nl_NL.ISO8859-1 > - .. > - nl_NL.ISO8859-15 > - .. > - nl_NL.UTF-8 > - .. > - nn_NO.ISO8859-1 > - .. > - nn_NO.ISO8859-15 > - .. > - nn_NO.UTF-8 > - .. > - pl_PL.ISO8859-2 > - .. > - pl_PL.UTF-8 > - .. > - pt_BR.ISO8859-1 > - .. > - pt_BR.UTF-8 > - .. > - pt_PT.ISO8859-1 > - .. > - pt_PT.ISO8859-15 > - .. > - pt_PT.UTF-8 > - .. > - ro_RO.ISO8859-2 > - .. > - ro_RO.UTF-8 > - .. > - ru_RU.CP1251 > - .. > - ru_RU.CP866 > - .. > - ru_RU.ISO8859-5 > - .. > - ru_RU.KOI8-R > - .. > - ru_RU.UTF-8 > - .. > - se_FI.UTF-8 > - .. > - se_NO.UTF-8 > - .. > - sk_SK.ISO8859-2 > - .. > - sk_SK.UTF-8 > - .. > - sl_SI.ISO8859-2 > - .. > - sl_SI.UTF-8 > - .. > - sr_RS.ISO8859-5 > - .. > - sr_RS.UTF-8 > - .. > - sr_RS.ISO8859-2 > - .. > - sr_RS.UTF-8@latin > - .. > - sv_FI.ISO8859-1 > - .. > - sv_FI.ISO8859-15 > - .. > - sv_FI.UTF-8 > - .. > - sv_SE.ISO8859-1 > - .. > - sv_SE.ISO8859-15 > - .. > - sv_SE.UTF-8 > - .. > - tr_TR.ISO8859-9 > - .. > - tr_TR.UTF-8 > - .. > - uk_UA.CP1251 > - .. > - uk_UA.ISO8859-5 > - .. > - uk_UA.KOI8-U > - .. > - uk_UA.UTF-8 > - .. > - zh_CN.GB18030 > - .. > - zh_CN.GB2312 > - .. > - zh_CN.GBK > - .. > - zh_CN.eucCN > - .. > - zh_CN.UTF-8 > - .. > - zh_HK.UTF-8 > - .. > - zh_TW.Big5 > - .. > - zh_TW.UTF-8 > .. > .. > man > diff --git a/share/colldef/Makefile b/share/colldef/Makefile > index 89454f84a5e4..15e84179c768 100644 > --- a/share/colldef/Makefile > +++ b/share/colldef/Makefile > @@ -133,7 +133,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) > FILES= ${LOCALES:S/$/.LC_COLLATE/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile > index e84d952a1316..4dd4bf78a36f 100644 > --- a/share/colldef_unicode/Makefile > +++ b/share/colldef_unicode/Makefile > @@ -104,7 +104,9 @@ SAME+= zh_TW.UTF-8 zh_HK.UTF-8 > FILES= ${LOCALES:S/$/.LC_COLLATE/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile > index da580d72c32f..ad7eb237f3eb 100644 > --- a/share/ctypedef/Makefile > +++ b/share/ctypedef/Makefile > @@ -215,7 +215,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) > FILES= ${LOCALES:S/$/.LC_CTYPE/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile > index e5d861da468d..f0b34998f4bd 100644 > --- a/share/monetdef/Makefile > +++ b/share/monetdef/Makefile > @@ -129,7 +129,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) > FILES= ${LOCALES:S/$/.out/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/monetdef_unicode/Makefile b/share/monetdef_unicode/Makefile > index 6eaab4f0ad94..4655c742669b 100644 > --- a/share/monetdef_unicode/Makefile > +++ b/share/monetdef_unicode/Makefile > @@ -96,7 +96,9 @@ SAME+= sr_RS.UTF-8@latin sr_RS.UTF-8 > FILES= ${LOCALES:S/$/.out/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile > index 44f1ca316953..9f0b7f2f3bcf 100644 > --- a/share/msgdef/Makefile > +++ b/share/msgdef/Makefile > @@ -122,7 +122,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) > FILES= ${LOCALES:S/$/.out/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/msgdef_unicode/Makefile b/share/msgdef_unicode/Makefile > index 3f14010b9fa8..c0bffc05ccc6 100644 > --- a/share/msgdef_unicode/Makefile > +++ b/share/msgdef_unicode/Makefile > @@ -96,7 +96,9 @@ SAME+= zh_TW.UTF-8 zh_HK.UTF-8 > FILES= ${LOCALES:S/$/.out/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile > index 1742dd724d1c..f1047e9cb5d3 100644 > --- a/share/numericdef/Makefile > +++ b/share/numericdef/Makefile > @@ -125,7 +125,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) > FILES= ${LOCALES:S/$/.out/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/numericdef_unicode/Makefile b/share/numericdef_unicode/Makefile > index c7568a4177fb..3f7f3e4f285e 100644 > --- a/share/numericdef_unicode/Makefile > +++ b/share/numericdef_unicode/Makefile > @@ -96,7 +96,9 @@ SAME+= fr_FR.UTF-8 fr_BE.UTF-8 > FILES= ${LOCALES:S/$/.out/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/share/timedef/Makefile b/share/timedef/Makefile > index 042f2f0e36f0..428e8067ae18 100644 > --- a/share/timedef/Makefile > +++ b/share/timedef/Makefile > @@ -208,7 +208,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) > FILES= ${LOCALES:S/$/.out/} > CLEANFILES= ${FILES} > > +DIRS+= SAMEDIRS > .for f t in ${SAME} > +SAMEDIRS+= ${LOCALEDIR}/$t > SYMLINKS+= ../$f/${FILESNAME} \ > ${LOCALEDIR}/$t/${FILESNAME} > .endfor > diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl > index 70e0bdad525b..277102d60a49 100755 > --- a/tools/tools/locale/tools/cldr2def.pl > +++ b/tools/tools/locale/tools/cldr2def.pl > @@ -1081,7 +1081,9 @@ EOF > FILES= \${LOCALES:S/\$/.${SRCOUT2}/} > CLEANFILES= \${FILES} > > +DIRS+= SAMEDIRS > .for f t in \${SAME} > +SAMEDIRS+= \${LOCALEDIR}/\$t > SYMLINKS+= ../\$f/\${FILESNAME} \\ > \${LOCALEDIR}/\$t/\${FILESNAME} > .endfor > -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108031732.173HWXr9049195>