diff --git a/prepare.sh b/prepare.sh index 3406b58..51dd2ff 100755 --- a/prepare.sh +++ b/prepare.sh @@ -38,7 +38,7 @@ if [ ! -f portage/make.conf/10-crossdev.conf ]; then > "${CONFIGDIR}"/portage/target/etc/portage/make.conf/10-crossdev.conf fi -ln -snf /var/db/repos/gentoo/profiles/default/linux/${ARCH}/17.0 \ +ln -snf /var/db/repos/gentoo/profiles/${profile} \ /usr/${target}/etc/portage/make.profile FEATURES="${FEATURES}" \ @@ -47,14 +47,9 @@ ${target}-emerge -bk1nvj sys-libs/glibc FEATURES="${FEATURES}" \ PKGDIR=$(portageq envvar PKGDIR) \ -USE=pam \ +USE='pam build' \ ${target}-emerge -bknvj sys-apps/util-linux -# Migrate to the merged-usr layout -mkdir -p /usr/${target}/bin -emerge -bknv --quiet-build=y merge-usr -merge-usr --root=/usr/${target} - # Set the Portage profile ln -snf \ /var/db/repos/gentoo/profiles/${profile} \