base-files: move profile for SHR from shr-image.inc to base-files

Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>

3 files changed, 50 insertions, 17 deletions

diff --git a/recipes/base-files/base-files/shr/profile b/recipes/base-files/base-files/shr/profile
new file mode 100644
index 0000000000..e39a8f1a63
--- /dev/null
+++ b/recipes/base-files/base-files/shr/profile
@@ -0,0 +1,49 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/bin/vi"			# needed for packages like cron
+test -z "$TERM" && TERM="vt100"	# Basic terminal capab. For screen etc.
+
+if [ ! -e /etc/localtime ]; then
+	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+				# for an explanation of how to set this to your local timezone.
+	export TZ
+fi
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in /etc/profile.d/*.sh; do
+    if [ -r $i ]; then
+      . $i
+    fi
+  done
+  unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
+
+alias pico=nano
+alias fso='cd /local/pkg/fso'
+alias ipkg='opkg'
+export PS1="\[\033[01;32m\]\u@\h\[\033[01;34m\] \w $\[\033[00m\] "
+if [ "$DISPLAY" = "" ]
+then
+    export DISPLAY=localhost:0
+fi
+export HISTFILESIZE=1000
+export HISTSIZE=1000
+alias rm='rm -i'; alias cp='cp -i'; alias mv='mv -i'
+alias la='ls  -ltrA'; alias lh='ls  -ltrh'; alias lr='ls  -ltr';
+alias lR='ls  -ltrR'
+# set your locale here:
+export LANG=en_US.UTF-8
diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index 3e112a360b..8f1de11c7b 100644
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r90"
+PR = "r91"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc
index 3bdcdfc100..4668f155e4 100644
--- a/recipes/images/shr-image.inc
+++ b/recipes/images/shr-image.inc
@@ -86,22 +86,6 @@ shr_rootfs_postprocess() {
     #font cache optimization, persistent cache
     sed -i "s/<cachedir>.*\/var\/cache\/\(.*\)<\/cachedir>/<cachedir>\/var\/local\/\1<\/cachedir>/g" ./etc/fonts/fonts.conf
 
-    #set up a nice gentoo-like PS1
-    echo "export PS1=\"\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] \"">> ./etc/profile
-
-    #set up some variables to improve default settings
-    echo "if [ \"\$DISPLAY\" = \"\" ]" >> ./etc/profile
-    echo "then" >> ./etc/profile
-    echo "    export DISPLAY=localhost:0" >> ./etc/profile
-    echo "fi" >> ./etc/profile
-    echo "export HISTFILESIZE=1000" >> ./etc/profile
-    echo "export HISTSIZE=1000" >> ./etc/profile
-    echo "alias rm='rm -i'; alias cp='cp -i'; alias mv='mv -i'" >> ./etc/profile
-    echo "alias la='ls $LS_OPTIONS -ltrA'; alias lh='ls $LS_OPTIONS -ltrh'; alias lr='ls $LS_OPTIONS -ltr';" >> ./etc/profile
-    echo "alias lR='ls $LS_OPTIONS -ltrR'" >> ./etc/profile
-    echo "# set your locale here:" >> ./etc/profile
-    echo "export LANG=en_US.UTF-8" >> ./etc/profile
-
     # Add some missing entries to the passwd and group file; but do so carefully
     # since this will be fixed upstream at some point.
     grep -q '^tss:' ./etc/passwd || echo 'tss:x:93:93:Linux TSS User:/bin:/bin/sh' >>./etc/passwd