From: Jeremy Huddleston Date: Sat, 15 Jan 2005 13:41:16 +0000 (+0000) Subject: Added support for hackish profiles that symlink lib to lib64. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d76ff8c681428f2f13bdbf3007ef092b38e2993c;p=gentoo.git Added support for hackish profiles that symlink lib to lib64. Package-Manager: portage-2.0.51-r12 --- diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 1279c41824c0..4cf9b749f1b7 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.200 2005/01/15 00:59:35 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.201 2005/01/15 13:41:16 eradicator 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 + 15 Jan 2005; Jeremy Huddleston + baselayout-1.11.8-r2.ebuild, baselayout-1.9.4-r7.ebuild: + Added support for hackish profiles that symlink lib to lib64. + 14 Jan 2005; Jeremy Huddleston baselayout-1.9.4-r7.ebuild: Stable for 2005.0. diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 89041bbfd291..fffe9a1fb5c3 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 6a12a69308466a080cbe61be475da253 ChangeLog 45315 +MD5 ecddf1e40446a712d38d1233ceacde13 ChangeLog 45496 MD5 d9e60daa58a85965186f7dbecac8516d baselayout-1.11.8.ebuild 15655 MD5 c79e8a69ea8161be1c6fc7aea865206e baselayout-1.11.7-r2.ebuild 15745 -MD5 eda0f83a749a683ed80c3da0b1c84caf baselayout-1.9.4-r7.ebuild 17502 -MD5 8ae1c8197dfb94506c11a56ba25df1d7 baselayout-1.11.8-r2.ebuild 16154 +MD5 e819385f8aa5ac0f1a8ad035a6b9c7f7 baselayout-1.9.4-r7.ebuild 18118 +MD5 d4bf5c6e026ef37866f19e9ea8cb0e9d baselayout-1.11.8-r2.ebuild 16778 MD5 245e39f14052cacd4e495fa02ecf2163 baselayout-1.9.4-r6.ebuild 16835 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443 @@ -25,7 +25,7 @@ MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB6GsEArHZZzCEUG0RAoAuAJ42xR0wihD6ZGvcw80Ah38GA5K25ACfQGUe -Iq7FD7bNzMdwApebvCns9fw= -=9nAG +iD8DBQFB6R2cArHZZzCEUG0RAmFSAJ9d5sV9rcUarRtDVl1gCzzRWOm9uQCaA5r5 +UsqkhKurokli5sMD6JyEP90= +=yQYw -----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild b/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild index ef3145a522ce..dc4b221868d8 100644 --- a/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild,v 1.1 2005/01/13 07:37:54 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild,v 1.2 2005/01/15 13:41:16 eradicator Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -111,12 +111,32 @@ unkdir() { } src_install() { - local dir libdirs libdirs_env + local dir libdirs libdirs_env rcscripts_dir # This directory is to stash away things that will be used in # pkg_postinst; it's needed first for kdir to function dodir /usr/share/baselayout + # Jeremy Huddleston + # For multilib, we want to make sure that all our multilibdirs exist + # and make lib even if it's not listed as one (like on amd64/ppc64 + # which sometimes has lib32/lib64 instead of lib/lib64). + # lib should NOT be a symlink to one of the other libdirs. + # Old systems with symlinks won't be affected by this change, as the + # symlinks already exist and won't get removed, but new systems will + # be setup properly. + # + # I'll be making a script to convert existing systems from symlink to + # nosymlink and putting it in /usr/portage/scripts. + libdirs=$(get_all_libdirs) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + if [ "${SYMLINK_LIB}" = "yes" ]; then + rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts" + else + rcscripts_dir="/lib/rcscripts" + fi + einfo "Creating directories..." kdir /usr kdir /usr/local @@ -184,27 +204,24 @@ src_install() { kdir /var/state kdir -m 1777 /var/tmp - # Jeremy Huddleston - # For multilib, we want to make sure that all our multilibdirs exist - # and make lib even if it's not listed as one (like on amd64/ppc64 - # which sometimes has lib32/lib64 instead of lib/lib64). - # lib should NOT be a symlink to one of the other libdirs. - # Old systems with symlinks won't be affected by this change, as the - # symlinks already exist and won't get removed, but new systems will - # be setup properly. - # - # I'll be making a script to convert existing systems from symlink to - # nosymlink and putting it in /usr/portage/scripts. - libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... for dir in ${libdirs}; do + libdirs_env="${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}" + [ "${dir}" = "lib" -a "${SYMLINK_LIB}" = "yes" ] && continue kdir /${dir} kdir /usr/${dir} kdir /usr/local/${dir} kdir /usr/X11R6/${dir} - libdirs_env="${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}" done + # Ugly compatibility with stupid ebuilds and old profiles symlinks + if [ "${SYMLINK_LIB}" = "yes" ]; then + rm -rf ${D}/lib ${D}/usr/lib ${D}/usr/local/lib ${D}/usr/X11R6/lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/X11R6/lib + fi + # FHS compatibility symlinks stuff dosym /var/tmp /usr/tmp dosym ../../share/info /usr/X11R6/share/info @@ -304,7 +321,7 @@ src_install() { # under CONFIG_PROTECTed /etc # cd ${S}/sbin - exeinto /lib/rcscripts/sh + exeinto ${rcscripts_dir}/sh doexe rc-services.sh rc-daemon.sh rc-help.sh # We can only install new, fast awk versions of scripts @@ -318,15 +335,15 @@ src_install() { into / dosbin depscan.sh dosbin env-update.sh - insinto /lib/rcscripts/awk + insinto ${rcscripts_dir}/awk doins ${S}/src/awk/*.awk fi # Original design had these in /etc/net.modules.d but that is too # problematic with CONFIG_PROTECT - dodir /lib/rcscripts - cp -a ${S}/lib/rcscripts/net.modules.d ${D}/lib/rcscripts - chown -R root:root ${D}/lib/rcscripts + dodir ${rcscripts_dir} + cp -a ${S}${rcscripts_dir}/net.modules.d ${D}${rcscripts_dir} + chown -R root:root ${D}${rcscripts_dir} # # Install baselayout documentation diff --git a/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild b/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild index 577562fb00c3..748103a56bb5 100644 --- a/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild +++ b/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild,v 1.2 2005/01/15 00:59:35 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild,v 1.3 2005/01/15 13:41:16 eradicator Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -170,7 +170,7 @@ unkdir() { } src_install() { - local foo bar dir libdirs libdirs_env + local foo bar dir libdirs libdirs_env rcscripts_dir # ROOT is purged from the environment prior to calling # src_install. Good thing we saved it in a temporary file. @@ -185,6 +185,26 @@ src_install() { # pkg_postinst dodir /usr/share/baselayout + # Jeremy Huddleston + # For multilib, we want to make sure that all our multilibdirs exist + # and make lib even if it's not listed as one (like on amd64/ppc64 + # which sometimes has lib32/lib64 instead of lib/lib64). + # lib should NOT be a symlink to one of the other libdirs. + # Old systems with symlinks won't be affected by this change, as the + # symlinks already exist and won't get removed, but new systems will + # be setup properly. + # + # I'll be making a script to convert existing systems from symlink to + # nosymlink and putting it in /usr/portage/scripts. + libdirs=$(get_all_libdirs) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + if [ "${SYMLINK_LIB}" = "yes" ]; then + rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts" + else + rcscripts_dir="/lib/rcscripts" + fi + einfo "Creating directories..." kdir /boot kdir /dev @@ -248,27 +268,24 @@ src_install() { dodir /etc/init.d # .keep file might mess up init.d stuff dodir /var/db/pkg # .keep file messes up Portage when looking in /var/db/pkg - # Jeremy Huddleston - # For multilib, we want to make sure that all our multilibdirs exist - # and make lib even if it's not listed as one (like on amd64/ppc64 - # which sometimes has lib32/lib64 instead of lib/lib64). - # lib should NOT be a symlink to one of the other libdirs. - # Old systems with symlinks won't be affected by this change, as the - # symlinks already exist and won't get removed, but new systems will - # be setup properly. - # - # I'll be making a script to convert existing systems from symlink to - # nosymlink and putting it in /usr/portage/scripts. - libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... for dir in ${libdirs}; do + libdirs_env="${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}" + [ "${dir}" = "lib" -a "${SYMLINK_LIB}" = "yes" ] && continue kdir /${dir} kdir /usr/${dir} kdir /usr/local/${dir} kdir /usr/X11R6/${dir} - libdirs_env="${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}" done + # Ugly compatibility with stupid ebuilds and old profiles symlinks + if [ "${SYMLINK_LIB}" = "yes" ]; then + rm -rf ${D}/lib ${D}/usr/lib ${D}/usr/local/lib ${D}/usr/X11R6/lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/X11R6/lib + fi + # FHS compatibility symlinks stuff dosym ../var/tmp /usr/tmp dosym share/man /usr/man @@ -388,7 +405,7 @@ src_install() { # Setup files in /lib/rcsripts/sh # cd ${S}/sbin - exeinto /lib/rcscripts/sh + exeinto ${rcscripts_dir}/sh doexe rc-services.sh rc-daemon.sh rc-help.sh # We can only install new, fast awk versions of scripts @@ -402,7 +419,7 @@ src_install() { into / dosbin depscan.sh dosbin env-update.sh - insinto /lib/rcscripts/awk + insinto ${rcscripts_dir}/awk doins ${S}/src/awk/*.awk fi