From: Phil Blundell <philb@gnu.org>
Date: Sat, 13 Nov 2004 20:54:07 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel
X-Git-Tag: Release-2010-05/1~16282
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=398a0cc52e80adf49d3e0a8fef524c4ba01e984f;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/13 20:53:41+00:00 nexus.co.uk!pb
remove spurious variable settings from /etc/profile


BKrev: 4196746fm1mCTvjQIzxCJz0axdzNDQ
---

diff --git a/base-files/base-files/profile b/base-files/base-files/profile
index 50433a4682..3de4dfe607 100644
--- a/base-files/base-files/profile
+++ b/base-files/base-files/profile
@@ -1,10 +1,7 @@
 # /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
 # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
 
-OPIEDIR=/opt/QtPalmtop
-QPEDIR=/opt/QtPalmtop
-QTDIR=/opt/QtPalmtop
-PATH="/opt/QtPalmtop/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
+PATH="/usr/local/bin:/usr/bin:/bin"
 
 if [ "`id -u`" -eq 0 ]; then
    PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index bb52712602..3d31496a8c 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = " \
            file://nsswitch.conf \