diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-01-17 19:53:53 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-01-17 19:53:53 +0000 |
| commit | c92a66e259fc4088e03cc14a85e90fd3aaeea210 (patch) | |
| tree | 2f48478dd94dc6cdbf08658f59a49506b5e72303 /sys-apps/baselayout | |
| parent | also fix -r1 (diff) | |
| download | gentoo-2-c92a66e259fc4088e03cc14a85e90fd3aaeea210.tar.gz gentoo-2-c92a66e259fc4088e03cc14a85e90fd3aaeea210.tar.bz2 gentoo-2-c92a66e259fc4088e03cc14a85e90fd3aaeea210.zip | |
This patch should resolve the issue on amd64/ppc64 and close bug #110143. It is not the cleanest solution, but will work for the 2006.0 release until a better solution can be made.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.11.14.ebuild | 15 |
2 files changed, 16 insertions, 7 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 5c3dd3630917..62bc8742ff98 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,16 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.296 2006/01/16 15:51:48 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.297 2006/01/17 19:53:53 wolf31o2 Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 17 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> + baselayout-1.11.14.ebuild: + This patch should resolve the issue on amd64/ppc64 and close bug #110143. It + is not the cleanest solution, but will work for the 2006.0 release until a + better solution can be made. + 16 Jan 2006; Roy Marples <uberlord@gentoo.org> baselayout-1.12.0_pre13.ebuild, baselayout-1.12.0_pre13-r1.ebuild, baselayout-1.12.0_pre14.ebuild, baselayout-1.12.0_pre14-r1.ebuild, diff --git a/sys-apps/baselayout/baselayout-1.11.14.ebuild b/sys-apps/baselayout/baselayout-1.11.14.ebuild index 0d9c0496c1ee..00c934f4724a 100644 --- a/sys-apps/baselayout/baselayout-1.11.14.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14.ebuild,v 1.5 2006/01/17 02:15:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14.ebuild,v 1.6 2006/01/17 19:53:53 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -151,13 +151,16 @@ src_install() { libdirs=$(get_all_libdirs) : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - # This should be /lib/rcscripts, but we have to support old profiles too. + # fixes 110143 if [[ ${SYMLINK_LIB} == "yes" ]]; then - rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts" + default_lib_dir="$(get_abi_LIBDIR ${DEFAULT_ABI})" else - rcscripts_dir="/lib/rcscripts" + default_lib_dir="lib" fi + # This should be /lib/rcscripts, but we have to support old profiles too. + rcscripts_dir="/${default_lib_dir}/rcscripts" + einfo "Creating directories..." kdir /usr kdir /usr/local @@ -238,8 +241,8 @@ src_install() { ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib fi - kdir /lib/dev-state - kdir /lib/udev-state + kdir /${default_lib_dir}/dev-state + kdir /${default_lib_dir}/udev-state # FHS compatibility symlinks stuff ksym /var/tmp /usr/tmp |