mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-07 02:11:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

use --select for our core packages

Browse Source 
We are changing the default emerge options to use --oneshot, so make sure
our scripts select the packages we care about for @world.

BUG=None
TEST=setup_board+build_packages for tegra2 adds pkgs to world

Change-Id: I5fc68c538a1a1c846bd9724f27ef717029d11d42
Reviewed-on: https://gerrit.chromium.org/gerrit/16838
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-02-27 11:05:26 -05:00 committed by Gerrit
parent 2788e07b3f
commit 650bf873cd
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_packages
View File

@ -91,7 +91,7 @@ if [[ -z "${FLAGS_board}" ]]; then
exit 1 exit 1
fi fi
EMERGE_FLAGS="--backtrack=30" EMERGE_FLAGS="--backtrack=30 --select"
EMERGE_CMD="emerge" EMERGE_CMD="emerge"
EMERGE_BOARD_CMD="emerge-${FLAGS_board}" EMERGE_BOARD_CMD="emerge-${FLAGS_board}"

2
sdk_lib/make_chroot.sh
View File

@ -431,7 +431,7 @@ info "Deselecting dhcpcd"
early_enter_chroot $EMERGE_CMD --deselect dhcpcd early_enter_chroot $EMERGE_CMD --deselect dhcpcd
info "Running emerge ccache curl sudo ..." info "Running emerge ccache curl sudo ..."
early_enter_chroot $EMERGE_CMD -uNv $USEPKG $EMERGE_JOBS \ early_enter_chroot $EMERGE_CMD -uNv $USEPKG --select $EMERGE_JOBS \
ccache net-misc/curl sudo ccache net-misc/curl sudo
# Curl is now installed, so we can depend on it now. # Curl is now installed, so we can depend on it now.

17
setup_board
View File

@ -651,14 +651,6 @@ exec cros_workon --board ${BOARD_VARIANT} "\$@"
EOF EOF
sudo chmod +x "$CROS_WORKON_WRAPPER" sudo chmod +x "$CROS_WORKON_WRAPPER"
#
# Emerge the kernel headers into the board build root.
#
EMERGE_FLAGS=""
if [[ $FLAGS_usepkg -eq $FLAGS_TRUE ]]; then
EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg --usepkg"
fi
if ${HOST_BOARD}; then if ${HOST_BOARD}; then
EMERGE_CMD="emerge" EMERGE_CMD="emerge"
if [[ $FLAGS_fast -eq $FLAGS_TRUE ]]; then if [[ $FLAGS_fast -eq $FLAGS_TRUE ]]; then
@ -674,6 +666,7 @@ if ${HOST_BOARD}; then
# Next, install our rebuilt packages into our separate root. # Next, install our rebuilt packages into our separate root.
HOST_FLAGS="--root=$BOARD_ROOT --update --verbose --deep --root-deps" HOST_FLAGS="--root=$BOARD_ROOT --update --verbose --deep --root-deps"
HOST_FLAGS+=" --with-bdeps=y --newuse --jobs=$NUM_JOBS --usepkgonly" HOST_FLAGS+=" --with-bdeps=y --newuse --jobs=$NUM_JOBS --usepkgonly"
HOST_FLAGS+=" --select"
sudo -E $EMERGE_CMD $HOST_FLAGS $PACKAGES sudo -E $EMERGE_CMD $HOST_FLAGS $PACKAGES
sudo cp -a "${PKGDIR}" $BOARD_ROOT/packages sudo cp -a "${PKGDIR}" $BOARD_ROOT/packages
@ -715,6 +708,14 @@ if ${HOST_BOARD}; then
sudo find $BOARD_ROOT -type f -name '*.la' | xargs sudo \ sudo find $BOARD_ROOT -type f -name '*.la' | xargs sudo \
sed -i -e "s|$BOARD_ROOT/|/|g" sed -i -e "s|$BOARD_ROOT/|/|g"
else else
#
# Emerge the kernel headers into the board build root.
#
EMERGE_FLAGS="--select"
if [[ $FLAGS_usepkg -eq $FLAGS_TRUE ]]; then
EMERGE_FLAGS+=" --getbinpkg --usepkg"
fi
sudo -E "${EMERGE_WRAPPER}" ${EMERGE_FLAGS} chromeos-base/kernel-headers sudo -E "${EMERGE_WRAPPER}" ${EMERGE_FLAGS} chromeos-base/kernel-headers
fi fi

2
update_chroot
View File

@ -44,7 +44,7 @@ fi | sudo_clobber "$PREBUILT_SETUP"
info "Updating chroot" info "Updating chroot"
EMERGE_FLAGS="-uNv --with-bdeps=y" EMERGE_FLAGS="-uNv --with-bdeps=y --select"
if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg" EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg"