[SM-Commit] GIT changes to master grimoire by David Brown (a1035cbfff87a977047a5b429f60dc29b34ccf3c)

David Brown scm at mail.sourcemage.org
Sun Dec 31 20:04:12 EST 2006


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

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

New commits:
commit a1035cbfff87a977047a5b429f60dc29b34ccf3c
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

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

diff --git a/ChangeLog b/ChangeLog
index 0f10660..a97857f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-12-31 David Brown <dmlb2000 at gmail.com>
+	* configs: make sure the gconfd files aren't considered config files
+
 2006-12-31 George Sherwood <george at beernabeer.com>
 	* disk/devede: new spell
 
diff --git a/configs b/configs
new file mode 100644
index 0000000..4d3d5be
--- /dev/null
+++ b/configs
@@ -0,0 +1,4 @@
+!^/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
new file mode 100755
index 0000000..d2220f7
--- /dev/null
+++ b/smgl/smgl-fhs/CONFIGURE
@@ -0,0 +1,5 @@
+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 a4a75b5..a235717 100755
--- a/smgl/smgl-fhs/INSTALL
+++ b/smgl/smgl-fhs/INSTALL
@@ -20,6 +20,14 @@ 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
@@ -29,10 +37,17 @@ fhs_mkdir /proc &&
 #
 # http://www.pathname.com/fhs/2.2/fhs-3.7.html
 #
-for  etc_directory  in  opt  X11  sgml
+for  etc_directory  in  opt
 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
@@ -45,16 +60,23 @@ done  &&
 #
 # http://www.pathname.com/fhs/2.2/fhs-4.html
 #
-for  usr_directory  in  X11R6  bin  include  lib  local  sbin  share  src
+for  usr_directory  in  bin  include  lib  local  sbin  share
 do
   fhs_mkdir  /usr/$usr_directory
 done  &&
 
-#
-# For games
-#
-create_group  games  &&
-fhs_mkdir  /usr/games  0750  root  games  &&
+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 &&
 
 #
 # http://www.pathname.com/fhs/2.2/fhs-4.6.html
@@ -75,11 +97,18 @@ done  &&
 #
 # http://www.pathname.com/fhs/2.2/fhs-4.11.html
 #
-for  share_directory  in  dict  doc  games  info  locale  man  misc  nls  \
-                          sgml  terminfo  tmac  zoneinfo
+for  share_directory  in  man  misc
 do
-  fhs_mkdir  /usr/share/$share_directory
-done  &&
+  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 &&
 
 #
 # http://www.pathname.com/fhs/2.2/fhs-4.11.html (4.11.5.2)
@@ -92,23 +121,32 @@ done  &&
 #
 # http://www.pathname.com/fhs/2.2/fhs-4.4.html
 #
-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  &&
+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 &&
 
 #
 # http://www.pathname.com/fhs/2.2/fhs-5.html
 #
-for  var_directory  in  account  cache  crash  games  lib  lock  log  \
-                        opt  run  spool  yp
+for  var_directory  in  cache  lib  local  lock  log  opt  run  spool 
 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



More information about the SM-Commit mailing list