Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: build_image

Issue 2850045: Allow python to find gtk module. (originally nsanders CL) (Closed) Base URL: ssh://gitrw.chromium.org/crosutils.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Script to build a bootable keyfob-based chromeos system image from within 7 # Script to build a bootable keyfob-based chromeos system image from within
8 # a chromiumos setup. This assumes that all needed packages have been built into 8 # a chromiumos setup. This assumes that all needed packages have been built into
9 # the given target's root with binary packages turned on. This script will 9 # the given target's root with binary packages turned on. This script will
10 # build the Chrome OS image using only pre-built binary packages. 10 # build the Chrome OS image using only pre-built binary packages.
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 # Additional changes to developer image. 413 # Additional changes to developer image.
414 414
415 # The ldd tool is a useful shell script but lives in glibc; just copy it. 415 # The ldd tool is a useful shell script but lives in glibc; just copy it.
416 sudo cp -a "$(which ldd)" "${root_dev_dir}/usr/bin" 416 sudo cp -a "$(which ldd)" "${root_dev_dir}/usr/bin"
417 417
418 # If vim is installed, then a vi symlink would probably help. 418 # If vim is installed, then a vi symlink would probably help.
419 if [[ -x "${ROOT_FS_DIR}/usr/local/bin/vim" ]]; then 419 if [[ -x "${ROOT_FS_DIR}/usr/local/bin/vim" ]]; then
420 sudo ln -sf vim "${ROOT_FS_DIR}/usr/local/bin/vi" 420 sudo ln -sf vim "${ROOT_FS_DIR}/usr/local/bin/vi"
421 fi 421 fi
422 422
423 # If pygtk is installed in stateful-dev, then install a path.
424 if [[ -d \
425 "${ROOT_FS_DIR}/usr/local/lib/python2.6/site-packages/gtk-2.0" ]]; then
426 sudo bash -c "\
Tom Wai-Hong Tam 2010/07/07 02:46:00 Why don't you just "sudo echo gtk-2.0 > ..."?
Tammo Spalink 2010/07/07 02:52:31 Does that work with the redirect -- I can never re
Tom Wai-Hong Tam 2010/07/07 03:14:45 You are right. Not work with redirect. Keep the or
427 echo gtk-2.0 > \
428 ${ROOT_FS_DIR}/usr/local/lib/python2.6/site-packages/pygtk.pth"
429 fi
430
423 # Check that the image has been correctly created. Only do it if not 431 # Check that the image has been correctly created. Only do it if not
424 # building a factory install image, as the INSTALL_MASK for it will 432 # building a factory install image, as the INSTALL_MASK for it will
425 # make test_image fail. 433 # make test_image fail.
426 if [[ ${FLAGS_factory_install} -eq ${FLAGS_FALSE} ]] ; then 434 if [[ ${FLAGS_factory_install} -eq ${FLAGS_FALSE} ]] ; then
427 "${SCRIPTS_DIR}/test_image" \ 435 "${SCRIPTS_DIR}/test_image" \
428 --root="${ROOT_FS_DIR}" \ 436 --root="${ROOT_FS_DIR}" \
429 --target="${ARCH}" 437 --target="${ARCH}"
430 fi 438 fi
431 echo "Developer image built and stored at ${image_name}" 439 echo "Developer image built and stored at ${image_name}"
432 440
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 echo "Developer image created as ${DEVELOPER_IMAGE_NAME}" 703 echo "Developer image created as ${DEVELOPER_IMAGE_NAME}"
696 fi 704 fi
697 705
698 print_time_elapsed 706 print_time_elapsed
699 707
700 echo "To copy to USB keyfob, OUTSIDE the chroot, do something like:" 708 echo "To copy to USB keyfob, OUTSIDE the chroot, do something like:"
701 echo " ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdX" 709 echo " ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdX"
702 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:" 710 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:"
703 echo " ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}" 711 echo " ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
704 echo "from the scripts directory where you entered the chroot." 712 echo "from the scripts directory where you entered the chroot."
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698