diff options
| author | Khem Raj <raj.khem@gmail.com> | 2008-04-21 09:51:52 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2008-04-21 09:51:52 +0000 |
| commit | a17f033a59b49ca3e2ea519301c8d15a7773ab33 (patch) | |
| tree | a91e1c0178bb6656aebf516bd8f0fd36458721e2 | |
| parent | 89511d0970a5d93663076d8a5e6e97d722e3be5c (diff) | |
| parent | 33926780849af2b0d3d86023950e6b02bf0b3ba1 (diff) | |
merge of '8a3c4530401cc8efd585c6614fd3e4bcc0679140'
and 'a76532fd2709fdf263260cffd0dd46812f4c8540'
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 6 | ||||
| -rw-r--r-- | packages/base-files/base-files/profile | 6 | ||||
| -rw-r--r-- | packages/base-files/base-files_3.0.14.bb | 2 | ||||
| -rw-r--r-- | packages/glibc/eglibc_svn.bb | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e661af67f7..88da2c8181 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -22,9 +22,9 @@ SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "127" SRCREV_pn-diversity-nav ?= "238" SRCREV_pn-eds-dbus ?= "659" -SRCREV_pn-eglibc ?= "5790" -SRCREV_pn-eglibc-initial ?= "5790" -SRCREV_pn-eglibc-intermediate ?= "5790" +SRCREV_pn-eglibc ?= "5963" +SRCREV_pn-eglibc-initial ?= "5963" +SRCREV_pn-eglibc-intermediate ?= "5963" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" diff --git a/packages/base-files/base-files/profile b/packages/base-files/base-files/profile index 3dc22f316a..5797535093 100644 --- a/packages/base-files/base-files/profile +++ b/packages/base-files/base-files/profile @@ -20,8 +20,10 @@ if [ "$PS1" ]; then fi if [ -d /etc/profile.d ]; then - for i in `ls /etc/profile.d/`; do - . /etc/profile.d/$i + for i in /etc/profile.d/*.sh; do + if [ -r $i ]; then + . $i + fi done unset i fi diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 0391beaeae..83f6be3054 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r77" +PR = "r78" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index 3c2251878a..013f2666cb 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -2,8 +2,8 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" -PV = "2.7+svnr${SRCREV}" -PR = "r4" +PV = "2.8+svnr${SRCREV}" +PR = "r5" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-cargs6.patch;patch=1 \ file://eglibc-svn-arm-check_pf.patch;patch=1 \ |