summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2014-07-27 22:58:36 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-29 09:58:26 +0100
commitc6a57f7f4c8502d8d401db4d872738f680cfc637 (patch)
tree9b5751a2e67e8d45b55289c4386c4ac21e926203 /meta
parentcaea71ff33a73d17960e90fb81e8e42219bef5db (diff)
downloadpoky-c6a57f7f4c8502d8d401db4d872738f680cfc637.tar.gz
base-files: fix up misleading dir grouping names for lsb dirs
In commit b0df35f47fb79dc149504bd66d1186b3276f9510 ("base-files: Add to make some directories needed by LSB.") there were new groupings of dirs made. But rather than keep the grouping names permissions based as they clearly were, it seems that it was unfortunately misinterpreted as a counter, simply incrementing as a new group was added. This leads to dir3755 getting chmod'd to 0755 and dir4775 being chmod'd to 2775 which to any new reader of the code is terribly confusing. Choose names that clearly reflect the permissions, and add a lsb suffix to indicate the role. Also note that the settings for /var/mail seem incorrect, and so they have been aligned with what is seen in most common distros. (From OE-Core rev: 5cba414e3fd7dbe761a6f628c6a368a412c0cba3) Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/files/fs-perms.txt6
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb19
2 files changed, 13 insertions, 12 deletions
diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
index 9c144109ea..109cbe553c 100644
--- a/meta/files/fs-perms.txt
+++ b/meta/files/fs-perms.txt
@@ -60,8 +60,8 @@ ${localstatedir}/local 0755 root root false - - -
60/tmp 01777 root root false - - - 60/tmp 01777 root root false - - -
61${localstatedir}/volatile/tmp 01777 root root false - - - 61${localstatedir}/volatile/tmp 01777 root root false - - -
62 62
63# Set 3755 63# Set 755-lsb
64/srv 0755 root root false - - - 64/srv 0755 root root false - - -
65 65
66# Set 4775 66# Set 2775-lsb
67/var/mail 02755 root root false - - - 67/var/mail 02775 root mail false - - -
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 10d0f449fa..30b1bf463b 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -45,12 +45,13 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
45 ${localstatedir}/volatile/log \ 45 ${localstatedir}/volatile/log \
46 /home ${prefix}/src ${localstatedir}/local \ 46 /home ${prefix}/src ${localstatedir}/local \
47 /media" 47 /media"
48dirs3755 = "/srv \ 48
49 ${prefix}/local ${prefix}/local/bin ${prefix}/local/games \ 49dirs755-lsb = "/srv \
50 ${prefix}/local/include ${prefix}/local/lib ${prefix}/local/sbin \ 50 ${prefix}/local ${prefix}/local/bin ${prefix}/local/games \
51 ${prefix}/local/share ${prefix}/local/src \ 51 ${prefix}/local/include ${prefix}/local/lib ${prefix}/local/sbin \
52 ${prefix}/lib/locale" 52 ${prefix}/local/share ${prefix}/local/src \
53dirs4775 = "/var/mail" 53 ${prefix}/lib/locale"
54dirs2775-lsb = "/var/mail"
54 55
55volatiles = "log tmp" 56volatiles = "log tmp"
56conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ 57conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
@@ -130,12 +131,12 @@ do_install_basefilesissue () {
130} 131}
131 132
132do_install_append_linuxstdbase() { 133do_install_append_linuxstdbase() {
133 for d in ${dirs3755}; do 134 for d in ${dirs755-lsb}; do
134 install -m 0755 -d ${D}$d 135 install -m 0755 -d ${D}$d
135 done 136 done
136 137
137 for d in ${dirs4775}; do 138 for d in ${dirs2775-lsb}; do
138 install -m 2755 -d ${D}$d 139 install -m 2775 -d ${D}$d
139 done 140 done
140} 141}
141 142