bump to pre6. resets ARCH env var after utils are compiled

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@360 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Eric Edgar 19 years ago
parent fe2f4e91be
commit 86c522b339

@ -52,6 +52,7 @@ compile_utils_args()
export_utils_args() export_utils_args()
{ {
save_args
if [ "${UTILS_ARCH}" != '' ] if [ "${UTILS_ARCH}" != '' ]
then then
export ARCH="${UTILS_ARCH}" export ARCH="${UTILS_ARCH}"
@ -88,10 +89,12 @@ unset_utils_args()
then then
unset AS unset AS
fi fi
reset_args
} }
export_kernel_args() export_kernel_args()
{ {
save_args
if [ "${KERNEL_CC}" != '' ] if [ "${KERNEL_CC}" != '' ]
then then
export CC="${KERNEL_CC}" export CC="${KERNEL_CC}"
@ -128,6 +131,53 @@ unset_kernel_args()
then then
unset CROSS_COMPILE unset CROSS_COMPILE
fi fi
reset_args
}
save_args()
{
if [ "${ARCH}" != '' ]
then
export ORIG_ARCH="${ARCH}"
fi
if [ "${CC}" != '' ]
then
export ORIG_CC="${CC}"
fi
if [ "${LD}" != '' ]
then
export ORIG_LD="${LD}"
fi
if [ "${AS}" != '' ]
then
export ORIG_AS="${AS}"
fi
if [ "${CROSS_COMPILE}" != '' ]
then
export ORIG_CROSS_COMPILE="${CROSS_COMPILE}"
fi
}
reset_args()
{
if [ "${ORIG_ARCH}" != '' ]
then
export ARCH="${ORIG_ARCH}"
fi
if [ "${ORIG_CC}" != '' ]
then
export CC="${ORIG_CC}"
fi
if [ "${ORIG_LD}" != '' ]
then
export LD="${ORIG_LD}"
fi
if [ "${ORIG_AS}" != '' ]
then
export AS="${ORIG_AS}"
fi
if [ "${ORIG_CROSS_COMPILE}" != '' ]
then
export CROSS_COMPILE="${ORIG_CROSS_COMPILE}"
fi
} }
compile_generic() { compile_generic() {

@ -32,7 +32,7 @@ create_base_layout_cpio() {
# SGI LiveCDs need the following binary (no better place for it than here) # SGI LiveCDs need the following binary (no better place for it than here)
# getdvhoff is a DEPEND of genkernel, so it *should* exist # getdvhoff is a DEPEND of genkernel, so it *should* exist
if [ "${MIPS_EMBEDDED_IMAGE}" != '' -a "${MIPS_LIVECD}" != ''] if [ "${MIPS_EMBEDDED_IMAGE}" != '' -a "${MIPS_LIVECD}" != '' ]
then then
[ -e /usr/lib/getdvhoff/getdvhoff ] \ [ -e /usr/lib/getdvhoff/getdvhoff ] \
&& cp /usr/lib/getdvhoff/getdvhoff ${TEMP}/initramfs-base-temp/bin \ && cp /usr/lib/getdvhoff/getdvhoff ${TEMP}/initramfs-base-temp/bin \

@ -2,7 +2,7 @@
# Genkernel v3 # Genkernel v3
PATH="/bin:/usr/bin:/sbin:/usr/sbin" PATH="/bin:/usr/bin:/sbin:/usr/sbin"
GK_V='3.3.11_pre5' GK_V='3.3.11_pre6'
TMPDIR='/var/tmp/genkernel' TMPDIR='/var/tmp/genkernel'
TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified. TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.

Loading…
Cancel
Save