| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-28 04:26:14 +0000 (Thu, 28 Feb 2008) |
| 3 |
New Revision: 1334 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/grp/grp-chroot.sh |
| 8 |
trunk/targets/stage1/stage1-chroot.sh |
| 9 |
trunk/targets/support/kmerge.sh |
| 10 |
trunk/targets/support/livecdfs-update.sh |
| 11 |
Log: |
| 12 |
Rather than using the environment, we write out our USE to make.conf, then remove it once we're done. We don't bother adding clst_HOSTUSE, since it'll be written to make.conf, already. |
| 13 |
|
| 14 |
Modified: trunk/ChangeLog |
| 15 |
=================================================================== |
| 16 |
--- trunk/ChangeLog 2008-02-28 03:59:26 UTC (rev 1333) |
| 17 |
+++ trunk/ChangeLog 2008-02-28 04:26:14 UTC (rev 1334) |
| 18 |
@@ -2,6 +2,13 @@ |
| 19 |
# $Id: $ |
| 20 |
|
| 21 |
28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 22 |
+ targets/grp/grp-chroot.sh, targets/stage1/stage1-chroot.sh, |
| 23 |
+ targets/support/kmerge.sh, targets/support/livecdfs-update.sh: |
| 24 |
+ Rather than using the environment, we write out our USE to make.conf, then |
| 25 |
+ remove it once we're done. We don't bother adding clst_HOSTUSE, since it'll |
| 26 |
+ be written to make.conf, already. |
| 27 |
+ |
| 28 |
+ 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 29 |
targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, |
| 30 |
targets/livecd-stage1/livecd-stage1-chroot.sh, |
| 31 |
targets/netboot/netboot-chroot.sh, targets/netboot/netboot-combine.sh, |
| 32 |
|
| 33 |
Modified: trunk/targets/grp/grp-chroot.sh |
| 34 |
=================================================================== |
| 35 |
--- trunk/targets/grp/grp-chroot.sh 2008-02-28 03:59:26 UTC (rev 1333) |
| 36 |
+++ trunk/targets/grp/grp-chroot.sh 2008-02-28 04:26:14 UTC (rev 1334) |
| 37 |
@@ -5,14 +5,8 @@ |
| 38 |
## START BUILD |
| 39 |
setup_pkgmgr |
| 40 |
|
| 41 |
-unset DISTDIR |
| 42 |
- |
| 43 |
-# Don't grab MS core fonts, etc. |
| 44 |
-export USE="${USE} ${clst_HOSTUSE} ${clst_use}" |
| 45 |
- |
| 46 |
if [ "${clst_grp_type}" = "pkgset" ] |
| 47 |
then |
| 48 |
- unset DISTDIR |
| 49 |
export PKGDIR="/tmp/grp/${clst_grp_target}" |
| 50 |
|
| 51 |
run_merge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} \ |
| 52 |
@@ -20,5 +14,4 @@ |
| 53 |
else |
| 54 |
DISTDIR="/tmp/grp/${clst_grp_target}" run_merge --fetchonly \ |
| 55 |
${clst_grp_packages} || exit 1 |
| 56 |
- unset PKGDIR |
| 57 |
fi |
| 58 |
|
| 59 |
Modified: trunk/targets/stage1/stage1-chroot.sh |
| 60 |
=================================================================== |
| 61 |
--- trunk/targets/stage1/stage1-chroot.sh 2008-02-28 03:59:26 UTC (rev 1333) |
| 62 |
+++ trunk/targets/stage1/stage1-chroot.sh 2008-02-28 04:26:14 UTC (rev 1334) |
| 63 |
@@ -6,9 +6,8 @@ |
| 64 |
source /tmp/chroot-functions.sh |
| 65 |
|
| 66 |
# Setup our environment |
| 67 |
-export STAGE1_USE="$(portageq envvar STAGE1_USE)" |
| 68 |
-export USE="-* bindist build ${STAGE1_USE}" |
| 69 |
-export FEATURES="${clst_myfeatures} nodoc noman noinfo" |
| 70 |
+STAGE1_USE="$(portageq envvar STAGE1_USE)" |
| 71 |
+FEATURES="${clst_myfeatures} nodoc noman noinfo" |
| 72 |
|
| 73 |
## Sanity check profile |
| 74 |
if [ -z "${clst_buildpkgs}" ] |
| 75 |
@@ -22,6 +21,15 @@ |
| 76 |
## START BUILD |
| 77 |
clst_root_path=/ setup_pkgmgr |
| 78 |
|
| 79 |
-USE="-build" run_merge "--oneshot --nodeps virtual/baselayout" |
| 80 |
+# First, we drop in a known-good baselayout |
| 81 |
+[ -e ${ROOT}/etc/make.conf ] && \ |
| 82 |
+ echo 'USE="${USE} -build' >> ${ROOT}/etc/make.conf |
| 83 |
+run_merge "--oneshot --nodeps virtual/baselayout" |
| 84 |
+sed -i '/USE="${USE} -build/d' ${ROOT}/etc/make.conf |
| 85 |
|
| 86 |
-USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}" run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}" |
| 87 |
+[ -e ${ROOT}/etc/make.conf ] && \ |
| 88 |
+ echo 'USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"' \ |
| 89 |
+ >> ${ROOT}/etc/make.conf |
| 90 |
+run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}" |
| 91 |
+sed -i '/USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"/d' \ |
| 92 |
+ ${ROOT}/etc/make.conf |
| 93 |
|
| 94 |
Modified: trunk/targets/support/kmerge.sh |
| 95 |
=================================================================== |
| 96 |
--- trunk/targets/support/kmerge.sh 2008-02-28 03:59:26 UTC (rev 1333) |
| 97 |
+++ trunk/targets/support/kmerge.sh 2008-02-28 04:26:14 UTC (rev 1334) |
| 98 |
@@ -126,7 +126,6 @@ |
| 99 |
filtered_kname=${filtered_kname/\./_} |
| 100 |
|
| 101 |
eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use" |
| 102 |
-export USE="${clst_kernel_use} ${clst_HOSTUSE}" |
| 103 |
|
| 104 |
eval "clst_kernel_gk_kernargs=\$clst_boot_kernel_${filtered_kname}_gk_kernargs" |
| 105 |
eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources" |
| 106 |
@@ -185,27 +184,19 @@ |
| 107 |
fi |
| 108 |
fi |
| 109 |
|
| 110 |
-mkdir -p /tmp/kerncache/${clst_kname} |
| 111 |
- |
| 112 |
+[ -e /etc/make.conf ] && echo 'USE="${USE} ${clst_kernel_use} symlink build' \ |
| 113 |
+ >> /etc/make.conf |
| 114 |
+ |
| 115 |
if [ -n "${clst_KERNCACHE}" ] |
| 116 |
then |
| 117 |
- ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} USE="${USE} symlink build" emerge --nodeps -uqkb "${clst_ksource}" || exit 1 |
| 118 |
-# KERNELVERSION=`/usr/lib/portage/bin/portageq best_visible / "${clst_ksource}"` |
| 119 |
-# if [ ! -e /etc/portage/profile/package.provided ] |
| 120 |
-# then |
| 121 |
-# mkdir -p /etc/portage/profile |
| 122 |
-# echo "${KERNELVERSION}" > /etc/portage/profile/package.provided |
| 123 |
-# else |
| 124 |
-# if ( ! grep -q "^${KERNELVERSION}" /etc/portage/profile/package.provided ) |
| 125 |
-# then |
| 126 |
-# echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided |
| 127 |
-# fi |
| 128 |
-# fi |
| 129 |
- [ -d /usr/src/linux ] && rm /usr/src/linux |
| 130 |
+mkdir -p /tmp/kerncache/${clst_kname} |
| 131 |
+ ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_emerge --nodeps -uqkb "${clst_ksource}" || exit 1 |
| 132 |
+ [ -l /usr/src/linux ] && rm -f /usr/src/linux |
| 133 |
ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux |
| 134 |
else |
| 135 |
- USE="${USE} symlink build" emerge "${clst_ksource}" || exit 1 |
| 136 |
+ run_emerge "${clst_ksource}" || exit 1 |
| 137 |
fi |
| 138 |
+sed -i '/USE="${USE} ${clst_kernel_use} symlink build/d' /etc/make.conf |
| 139 |
|
| 140 |
# If catalyst has set to a empty string, extraversion wasn't specified so we |
| 141 |
# skip this part |
| 142 |
|
| 143 |
Modified: trunk/targets/support/livecdfs-update.sh |
| 144 |
=================================================================== |
| 145 |
--- trunk/targets/support/livecdfs-update.sh 2008-02-28 03:59:26 UTC (rev 1333) |
| 146 |
+++ trunk/targets/support/livecdfs-update.sh 2008-02-28 04:26:14 UTC (rev 1334) |
| 147 |
@@ -310,6 +310,7 @@ |
| 148 |
|
| 149 |
# This gives us our list of system packages for the installer |
| 150 |
mkdir -p /usr/livecd |
| 151 |
+ ### XXX: Andrew says we don't need this anymore |
| 152 |
USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt |
| 153 |
|
| 154 |
# This is my hack to reduce tmpfs usage |
| 155 |
|
| 156 |
-- |
| 157 |
gentoo-commits@l.g.o mailing list |
Archives