sane homes

- root home is in /opt/home/root
- /root does not link anywhere, this has to be done in ks file
  since mic creates /root before anything, so rpm install would fail
- /home/{app,developer} link to /opt/home

Change-Id: Ie377a14537aaa0c06bc088bbf262e22419f58547

diff --git a/packaging/Makefile b/packaging/Makefile
deleted file mode 100644 (file)
index 3dcdfdb..0000000
--- a/packaging/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-PKG_NAME := filesystem
-SPECFILE = $(addsuffix .spec, $(PKG_NAME))
-YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
-
-include /usr/share/packaging-tools/Makefile.common
-

diff --git a/packaging/filesystem.changes b/packaging/filesystem.changes
index d443b93..b6aee17 100644 (file)
--- a/packaging/filesystem.changes
+++ b/packaging/filesystem.changes
@@ -1,5 +1,15 @@
+* Tue Jul 10 2012 Anas Nashif <anas.nashif@intel.com> 20fe377
+- sane homes
+
+* Tue Jun 26 2012 William Douglas <william.douglas@intel.com> d23695d
+- update commit log
+
 * Fri Jun 22 2012 Chris E Ferron <chris.e.ferron@linux.intel.com> 8c21faa
-- changed creation of /root /home to be done in filesystem, and /opt/home /opt/home/root to be links to root dirs as opt is product specific. Setup package to be changed to only add users and libpriv control to add link for user as needed for product specific needs.
+- changed creation of /root /home to be done in filesystem, 
+  and /opt/home /opt/home/root to be links to root dirs as opt 
+  is product specific. 
+- Setup package to be changed to only add users and libpriv control 
+  to add link for user as needed for product specific needs.
 
 * Fri Jun 08 2012 Anas Nashif <anas.nashif@intel.com> 5045263
 - reinitialize changelog

diff --git a/packaging/filesystem.spec b/packaging/filesystem.spec
index 54c622b..d7d5e04 100644 (file)
--- a/packaging/filesystem.spec
+++ b/packaging/filesystem.spec
@@ -1,17 +1,16 @@
 %define disable_docs_package 1
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 0.1
+Version: 0.2
 Release: 1
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
 Group: System/Base
 BuildArch: noarch
-# Raw source1 URL: https://fedorahosted.org/filesystem/browser/lang-exceptions?format=raw
-Source1: https://fedorahosted.org/filesystem/browser/lang-exceptions
+Source1: lang-exceptions
 Source2: iso_639.sed
 Source3: iso_3166.sed
-Source1001: packaging/filesystem.manifest 
+Source1001: filesystem.manifest 
 Requires(pre): setup 
 BuildRequires: iso-codes
 
@@ -35,11 +34,11 @@ install -p -c -m755 %SOURCE3 %{buildroot}/iso_3166.sed
 
 cd %{buildroot}
 
-mkdir -p bin boot dev run root home \
+mkdir -p bin boot dev run home \
         mnt/{mntlib,moviefs,nfs,ums} \
-        opt/{dbspace,etc,lib,driver,storage/sdcard,share/applications}  \
+        opt/{home/{app,developer,root},dbspace,etc,lib,driver,storage/sdcard,share/applications}  \
         etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki,rc.d/init.d} \
-        lib/modules %{_lib}/tls media  proc  sbin srv sys tmp \
+        lib/modules %{_lib}/tls media proc sbin srv sys tmp \
         usr/{bin,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale},libexec,local/{bin,games,lib,%{_lib},sbin,src,libexec,include,},sbin,share/{applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug} \
         var/{lib/misc,local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games} 
 
@@ -47,8 +46,8 @@ ln -snf ../var/tmp usr/tmp
 ln -snf spool/mail var/mail
 ln -snf rc.d/init.d etc/init.d
 ln -snf mnt/mmc sdcard
-ln -sf  ../home %{buildroot}/opt/home
-ln -sf  ../../root %{buildroot}/opt/home/root
+ln -sf  ../opt/home/app %{buildroot}/home/
+ln -sf  ../opt/home/developer %{buildroot}/home/
 
 
 sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml \
@@ -131,10 +130,11 @@ rm -rf %{buildroot}
 %dir /opt
 %dir /opt/dbspace
 %dir /home
-#Links to be tracked 
-/home/root
-/opt/home
-/opt/home/root
+/home/app
+/home/developer
+%attr(550,root,root) /opt/home/root
+%attr(750,app,app) /opt/home/app
+%attr(750,developer,developer) /opt/home/developer
 %dir /opt/etc
 %dir /opt/lib
 %dir /opt/driver