diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2007-03-21 20:00:33 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2007-03-21 20:00:33 +0000 |
| commit | 3e642aebf4a2760e4d6fc597d29333c37184aadd (patch) | |
| tree | e82feb9b49bc93b780a210e39004d1ac7ebe5174 /media-gfx/splashutils | |
| parent | x86 stable wrt bug 123386 (diff) | |
| download | gentoo-2-3e642aebf4a2760e4d6fc597d29333c37184aadd.tar.gz gentoo-2-3e642aebf4a2760e4d6fc597d29333c37184aadd.tar.bz2 gentoo-2-3e642aebf4a2760e4d6fc597d29333c37184aadd.zip | |
Update the old-baselayout patch so that /usr/bin/stat is not used during boot.
(Portage version: 2.1.2.2)
Diffstat (limited to 'media-gfx/splashutils')
| -rw-r--r-- | media-gfx/splashutils/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index d646e7be1def..6c7d2c4ed2fd 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/splashutils # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.77 2007/03/15 13:27:28 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.78 2007/03/21 20:00:33 spock Exp $ + + 21 Mar 2007; Michał Januszewski <spock@gentoo.org> + files/splashutils-gentoo-0.5.4-old-baselayout.patch: + Update the old-baselayout patch so that /usr/bin/stat is not used during boot. 15 Mar 2007; Michał Januszewski <spock@gentoo.org> +files/splashutils-1.3.1-cachedir.patch, splashutils-1.3.1.ebuild: diff --git a/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch b/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch index 02fed04fa279..252dab890c15 100644 --- a/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch +++ b/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch @@ -1,6 +1,6 @@ diff -Naurp splashutils-gentoo-0.5.4-orig/splash-functions.sh splashutils-gentoo-0.5.4/splash-functions.sh ---- splashutils-gentoo-0.5.4-orig/splash-functions.sh 2007-03-13 14:24:42.000000000 +0100 -+++ splashutils-gentoo-0.5.4/splash-functions.sh 2007-03-13 14:30:14.000000000 +0100 +--- splashutils-gentoo-0.5.4-orig/splash-functions.sh 2007-03-21 20:51:46.000000000 +0100 ++++ splashutils-gentoo-0.5.4/splash-functions.sh 2007-03-21 20:53:37.000000000 +0100 @@ -489,10 +489,39 @@ splash_cache_prep() { return "${retval}" fi @@ -13,7 +13,7 @@ diff -Naurp splashutils-gentoo-0.5.4-orig/splash-functions.sh splashutils-gentoo + # Now that the data from the old cache is copied, move tmpdir to cachedir. mount -n --move "${spl_tmpdir}" "${spl_cachedir}" -+ h=$(stat -c '%y' ${spl_cachedir}/deptree 2>/dev/null) ++ h=$(ls -ld --full-time ${spl_cachedir}/deptree | cut -f6,7,8 -d' ' 2>/dev/null) + + # Point depscan.sh to our cachedir + /sbin/depscan.sh --svcdir "${spl_cachedir}" @@ -33,8 +33,8 @@ diff -Naurp splashutils-gentoo-0.5.4-orig/splash-functions.sh splashutils-gentoo + local lastlev timestamp + { read lastlev; read timestamp; } < ${spl_cachedir}/levels + if [[ "${lastlev}" != "${BOOTLEVEL}/${DEFAULTLEVEL}" || \ -+ "${timestamp}" != "$(stat -c '%y' /etc/runlevels/${BOOTLEVEL})/$(stat -c '%y' /etc/runlevels/${DEFAULTLEVEL})" || \ -+ "$(stat -c '%y' ${spl_cachedir}/deptree)" != "${h}" ]]; then ++ "${timestamp}" != "$(ls -ld --full-time /etc/runlevels/${BOOTLEVEL} | cut -f6,7,8 -d' ')/$(ls -ld --full-time /etc/runlevels/${DEFAULTLEVEL} | cut -f6,7,8 -d' ')" || \ ++ "$(ls -ld --full-time ${spl_cachedir}/deptree | cut -f6,7,8 -d' ')" != "${h}" ]]; then + echo $(splash_svclist_update "start") > ${spl_cachedir}/svcs_start + fi + fi |