mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-07 13:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(make_chroot): use the new places for make.conf

Browse Source 
make.conf should live in /etc/portage these days

Change-Id: I55372ae3ee6a4ae7abf6873c08c1fcef46d7cd53
This commit is contained in:
Brandon Philips 2013-02-05 18:43:10 -08:00
parent 474313e651
commit 6a362d27f9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk_lib/make_chroot.sh
View File

@ -198,13 +198,13 @@ init_setup () {
# TODO: This should really be part of a profile in the portage. # TODO: This should really be part of a profile in the portage.
info "Setting up /etc/make.*..." info "Setting up /etc/make.*..."
ln -sf "${CHROOT_CONFIG}/make.conf.amd64-host" \ ln -sf "${CHROOT_CONFIG}/make.conf.amd64-host" \
"${FLAGS_chroot}/etc/make.conf" "${FLAGS_chroot}/etc/portage/make.conf"
ln -sf "${CHROOT_OVERLAY}/profiles/default/linux/amd64/10.0" \ ln -sf "${CHROOT_OVERLAY}/profiles/default/linux/amd64/10.0" \
"${FLAGS_chroot}/etc/make.profile" "${FLAGS_chroot}/etc/portage/make.profile"
# Create make.conf.user . # Create make.conf.user .
touch "${FLAGS_chroot}"/etc/make.conf.user touch "${FLAGS_chroot}"/etc/portage/make.conf.user
chmod 0644 "${FLAGS_chroot}"/etc/make.conf.user chmod 0644 "${FLAGS_chroot}"/etc/portage/make.conf.user
# Create directories referred to by our conf files. # Create directories referred to by our conf files.
mkdir -p -m 775 "${FLAGS_chroot}/var/lib/portage/pkgs" \ mkdir -p -m 775 "${FLAGS_chroot}/var/lib/portage/pkgs" \
@ -254,7 +254,7 @@ EOF
# don't exist, then either bind mounts have failed, an invocation # don't exist, then either bind mounts have failed, an invocation
# from above is broke, or some assumption about the stage3 is no longer # from above is broke, or some assumption about the stage3 is no longer
# true. # true.
early_enter_chroot ls -l /etc/make.{conf,profile} \ early_enter_chroot ls -l /etc/portage/make.{conf,profile} \
/usr/local/portage/coreos/profiles/default/linux/amd64/10.0 /usr/local/portage/coreos/profiles/default/linux/amd64/10.0
target="${FLAGS_chroot}/etc/profile.d" target="${FLAGS_chroot}/etc/profile.d"

2
sdk_lib/make_conf_util.sh
View File

@ -81,7 +81,7 @@ EOF
# inside the chroot. # inside the chroot.
_create_host_setup() { _create_host_setup() {
local fetchtype="$1" local fetchtype="$1"
local host_setup="$2/etc/make.conf.host_setup" local host_setup="$2/etc/portage/make.conf.host_setup"
( echo "# Automatically generated. EDIT THIS AND BE SORRY." ( echo "# Automatically generated. EDIT THIS AND BE SORRY."
echo echo
_make_conf_fetchcommand "$fetchtype" _make_conf_fetchcommand "$fetchtype"