Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Brown (fdd4ac8b8abfa3695743e8f47fa4391797310159)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Brown (fdd4ac8b8abfa3695743e8f47fa4391797310159)
  • Date: Sun, 31 Dec 2006 19:20:19 -0600

GIT changes to master grimoire by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 2 -
configs | 3 -
smgl/smgl-fhs/CONFIGURE | 5 ---
smgl/smgl-fhs/INSTALL | 80
++++++++++++------------------------------------
4 files changed, 22 insertions(+), 68 deletions(-)

New commits:
commit fdd4ac8b8abfa3695743e8f47fa4391797310159
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

configs make sure the gconfd files are not considered configs so they
will not get staged

commit b5d4d23adabe65e3671cefe344691bdc4916bb6e
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Revert "configs make sure the gconfd files are not considered config
files so stage root will not stage then"

Ah this did more than I thought... *sigh*

This reverts commit a1035cbfff87a977047a5b429f60dc29b34ccf3c.

diff --git a/ChangeLog b/ChangeLog
index a97857f..bb764c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
2006-12-31 David Brown <dmlb2000 AT gmail.com>
- * configs: make sure the gconfd files aren't considered config files
+ * configs: make sure the gconfd files aren't considered configs

2006-12-31 George Sherwood <george AT beernabeer.com>
* disk/devede: new spell
diff --git a/configs b/configs
index 4d3d5be..2d9f04d 100644
--- a/configs
+++ b/configs
@@ -1,4 +1 @@
!^/etc/gconf/gconf\.xml\.default\..*
-!^/etc/ld.so.cache$
-!^/etc/pango/pangox.aliases$
-!^/etc/pango/pango.modules$
diff --git a/smgl/smgl-fhs/CONFIGURE b/smgl/smgl-fhs/CONFIGURE
deleted file mode 100755
index d2220f7..0000000
--- a/smgl/smgl-fhs/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query FHS_2_3 "be fhs 2.3 complient?" n &&
-config_query OPTIONAL_ETC "install optional /etc dirs?" y &&
-config_query OPTIONAL_USR "install optional /usr dirs?" y &&
-config_query OPTIONAL_USR_SHARE "install optional /usr/share dirs?" y &&
-config_query OPTIONAL_VAR "install optional /var dirs?" y
diff --git a/smgl/smgl-fhs/INSTALL b/smgl/smgl-fhs/INSTALL
index a235717..a4a75b5 100755
--- a/smgl/smgl-fhs/INSTALL
+++ b/smgl/smgl-fhs/INSTALL
@@ -20,14 +20,6 @@ done &&

fhs_mkdir /tmp 1777 &&

-if [[ $FHS_2_3 == y ]]
-then
- for root_directory in srv media
- do
- fhs_mkdir /$root_directory
- done
-fi &&
-
#
# http://www.pathname.com/fhs/2.2/fhs-6.1.html
# in the linux specific section, /proc is indeed mentioned
@@ -37,17 +29,10 @@ fhs_mkdir /proc &&
#
# http://www.pathname.com/fhs/2.2/fhs-3.7.html
#
-for etc_directory in opt
+for etc_directory in opt X11 sgml
do
fhs_mkdir /etc/$etc_directory
done &&
-if [[ $OPTIONAL_ETC == y ]]
-then
- for etc_directory in sgml opt X11 xml
- do
- fhs_mkdir /etc/$etc_directory
- done
-fi &&

#
# http://www.pathname.com/fhs/2.2/fhs-3.9.html
@@ -60,23 +45,16 @@ done &&
#
# http://www.pathname.com/fhs/2.2/fhs-4.html
#
-for usr_directory in bin include lib local sbin share
+for usr_directory in X11R6 bin include lib local sbin share src
do
fhs_mkdir /usr/$usr_directory
done &&

-if [[ $OPTIONAL_USR == y ]]
-then
- for usr_directory in X11R6 src
- do
- fhs_mkdir /usr/$usr_directory
- done &&
- #
- # For games
- #
- create_group games &&
- fhs_mkdir /usr/games 0750 root games
-fi &&
+#
+# For games
+#
+create_group games &&
+fhs_mkdir /usr/games 0750 root games &&

#
# http://www.pathname.com/fhs/2.2/fhs-4.6.html
@@ -97,18 +75,11 @@ done &&
#
# http://www.pathname.com/fhs/2.2/fhs-4.11.html
#
-for share_directory in man misc
+for share_directory in dict doc games info locale man misc nls \
+ sgml terminfo tmac zoneinfo
do
- fhs_mkdir /usr/share/$share_directory
-done &&
-if [[ $OPTIONAL_USR_SHARE == y ]]
-then
- for share_directory in dict doc games info locale nls \
- sgml terminfo tmac zoneinfo
- do
- fhs_mkdir /usr/share/$share_directory
- done
-fi &&
+ fhs_mkdir /usr/share/$share_directory
+done &&

#
# http://www.pathname.com/fhs/2.2/fhs-4.11.html (4.11.5.2)
@@ -121,32 +92,23 @@ done &&
#
# http://www.pathname.com/fhs/2.2/fhs-4.4.html
#
-if [[ $OPTIONAL_USR == y ]]
-then
- for X11_directory in bin lib/X11 include/X11
- do
- fhs_mkdir /usr/X11R6/$X11_directory &&
- pushd $INSTALL_ROOT/ &&
- ln -sf usr/$X11_directory \
- usr/X11R6/$X11_directory &&
- popd
- done
-fi &&
+for X11_directory in bin lib/X11 include/X11
+do
+ fhs_mkdir /usr/X11R6/$X11_directory &&
+ pushd $INSTALL_ROOT/ &&
+ ln -sf usr/$X11_directory \
+ usr/X11R6/$X11_directory &&
+ popd
+done &&

#
# http://www.pathname.com/fhs/2.2/fhs-5.html
#
-for var_directory in cache lib local lock log opt run spool
+for var_directory in account cache crash games lib lock log \
+ opt run spool yp
do
fhs_mkdir /var/$var_directory
done &&
-if [[ $OPTIONAL_VAR == y ]]
-then
- for var_directory in account crash games mail yp
- do
- fhs_mkdir /var/$var_directory
- done
-fi &&

#
# This is the permission set I have on mine



  • [SM-Commit] GIT changes to master grimoire by David Brown (fdd4ac8b8abfa3695743e8f47fa4391797310159), David Brown, 12/31/2006

Archive powered by MHonArc 2.6.24.

Top of Page