mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix install mask and move dev_mode to true when dev packages are installed

Browse Source 
Review URL: http://codereview.chromium.org/1553028
This commit is contained in:
Chris Sosa 2010-04-13 15:00:46 -07:00
parent 23fbe7dde4
commit 3d9a10b393
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_image
View File

@ -277,7 +277,7 @@ sudo cp -a "${BOARD_ROOT}"/lib/libgcc_s.so* "${ROOT_FS_DIR}/lib"
sudo cp -a "${BOARD_ROOT}"/usr/lib/libstdc++.so* "${ROOT_FS_DIR}/usr/lib" sudo cp -a "${BOARD_ROOT}"/usr/lib/libstdc++.so* "${ROOT_FS_DIR}/usr/lib"
INSTALL_MASK="" INSTALL_MASK=""
if [[ $FLAGS_installmask -eq $FLAGS_FALSE ]] ; then if [[ $FLAGS_installmask -eq ${FLAGS_TRUE} ]] ; then
INSTALL_MASK="$DEFAULT_INSTALL_MASK" INSTALL_MASK="$DEFAULT_INSTALL_MASK"
fi fi
@ -319,6 +319,11 @@ if [[ $FLAGS_withdev -eq $FLAGS_TRUE ]] ; then
--root="$ROOT_DEV_DIR" --root-deps=rdeps \ --root="$ROOT_DEV_DIR" --root-deps=rdeps \
--usepkgonly chromeos-dev $EMERGE_JOBS --usepkgonly chromeos-dev $EMERGE_JOBS
# TODO(sosa@chromium.org) - Re-hide under statefuldev after switch
# Flag will mount /usr/local on target device
sudo mkdir -p "$ROOT_FS_DIR/root"
sudo touch "$ROOT_FS_DIR/root/.dev_mode"
# The ldd tool is a useful shell script but lives in glibc; just copy it. # The ldd tool is a useful shell script but lives in glibc; just copy it.
sudo cp -a "$(which ldd)" "${ROOT_DEV_DIR}/usr/bin" sudo cp -a "$(which ldd)" "${ROOT_DEV_DIR}/usr/bin"
fi fi
@ -387,13 +392,8 @@ menuentry "serial debug" {
EOF EOF
# Enable dev mode on the target system and re-run ldconfig # Run ldconfig for rootfs's ld.so.cache
# for rootfs's ld.so.cache
if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then
# Flag will mount /usr/local on target device
sudo mkdir -p "$ROOT_FS_DIR/root"
sudo touch "$ROOT_FS_DIR/root/.dev_mode"
# Re-run ldconfig to fix /etc/ldconfig.so.cache # Re-run ldconfig to fix /etc/ldconfig.so.cache
sudo /sbin/ldconfig -r "$ROOT_FS_DIR" sudo /sbin/ldconfig -r "$ROOT_FS_DIR"

2
common.sh
View File

@ -117,7 +117,7 @@ fi
CHROOT_TRUNK_DIR="/home/$USER/trunk" CHROOT_TRUNK_DIR="/home/$USER/trunk"
# Install make for portage ebuilds. Used by build_image and gmergefs. # Install make for portage ebuilds. Used by build_image and gmergefs.
DEFAULT_INSTALL_MASK="/usr/include/ /usr/man /usr/share/man /usr/share/doc \ DEFAULT_INSTALL_MASK="/usr/include /usr/man /usr/share/man /usr/share/doc \
/usr/share/gtk-doc /usr/share/gtk-2.0 /usr/lib/gtk-2.0/include \ /usr/share/gtk-doc /usr/share/gtk-2.0 /usr/lib/gtk-2.0/include \
/usr/share/info /usr/share/aclocal /usr/lib/gcc /usr/lib/pkgconfig \ /usr/share/info /usr/share/aclocal /usr/lib/gcc /usr/lib/pkgconfig \
/usr/share/pkgconfig /usr/share/gettext /usr/share/readline /etc/runlevels \ /usr/share/pkgconfig /usr/share/gettext /usr/share/readline /etc/runlevels \