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

Add /usr/local/lib to readlibs for test_image and move ldconfig higher for sful

Browse Source 
Review URL: http://codereview.chromium.org/1618007
This commit is contained in:
Chris Sosa 2010-04-08 10:05:46 -07:00
parent 4bffb8be6a
commit 503efe1f65
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build_image
View File

@ -360,17 +360,6 @@ menuentry "32-bit serial" {
} }
EOF EOF
"${SCRIPTS_DIR}/customize_rootfs" \
--root="$ROOT_FS_DIR" \
--target="$ARCH" \
--board="$BOARD" \
$WITH_DEV
# Check that the image has been correctly created.
"${SCRIPTS_DIR}/test_image" \
--root="$ROOT_FS_DIR" \
--target="$ARCH"
# Enable dev mode on the target system and re-run ldconfig # Enable dev mode on the target system and re-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
@ -385,6 +374,17 @@ if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then
sudo ln -sf "/usr/local/bin/aterm" "/usr/bin/xterm" sudo ln -sf "/usr/local/bin/aterm" "/usr/bin/xterm"
fi fi
"${SCRIPTS_DIR}/customize_rootfs" \
--root="$ROOT_FS_DIR" \
--target="$ARCH" \
--board="$BOARD" \
$WITH_DEV
# Check that the image has been correctly created.
"${SCRIPTS_DIR}/test_image" \
--root="$ROOT_FS_DIR" \
--target="$ARCH"
# Clean up symlinks so they work on a running target rooted at "/". # Clean up symlinks so they work on a running target rooted at "/".
# Here development packages are rooted at /usr/local. However, do not # Here development packages are rooted at /usr/local. However, do not
# create /usr/local or /var on host (already exist on target). # create /usr/local or /var on host (already exist on target).

1
check_deps
View File

@ -32,6 +32,7 @@ class CheckDependencies(object):
# required for understanding old-style Netscape plugins. # required for understanding old-style Netscape plugins.
self._ReadLibs([ self._ReadLibs([
"%s/lib" % root, "%s/lib" % root,
"%s/usr/local/lib" % root,
"%s/usr/lib" % root, "%s/usr/lib" % root,
"%s/usr/lib/nss" % root, "%s/usr/lib/nss" % root,
"%s/usr/lib/nspr" % root, "%s/usr/lib/nspr" % root,