From 42c58a4cf3d5c5bead49ad334893183a93b0ca98 Mon Sep 17 00:00:00 2001 From: "mmoss@google.com" Date: Fri, 15 Oct 2010 15:18:16 +0000 Subject: Detect available lib64readline version before trying to install in chroot. This fixes a problem where creating a hardy32 chroot fails because the package name used to be lib64readline5. Perhaps all the packages should be detected like this, but it can wait until we know if there are other incompatibilities. Review URL: http://codereview.chromium.org/3775010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62743 0039d316-1c4b-4281-b951-d872f2087c98 --- build/install-chroot.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build') diff --git a/build/install-chroot.sh b/build/install-chroot.sh index 65bda04..194c0d6 100755 --- a/build/install-chroot.sh +++ b/build/install-chroot.sh @@ -256,8 +256,10 @@ sudo schroot -c "${target%bit}" -p -- apt-get -y install \ # If running a 32bit environment on a 64bit machine, install a few binaries # as 64bit. if [ "${arch}" = 32bit ] && file /bin/bash 2>/dev/null | grep -q x86-64; then + readlinepkg=$(sudo schroot -c "${target%bit}" -p -- sh -c \ + 'apt-cache search "lib64readline.\$" | sort | tail -n 1 | cut -d " " -f 1') sudo schroot -c "${target%bit}" -p -- apt-get -y install \ - lib64expat1 lib64ncurses5 lib64readline6 lib64z1 + lib64expat1 lib64ncurses5 ${readlinepkg} lib64z1 dep= for i in binutils gdb strace; do [ -d /usr/share/doc/"$i" ] || dep="$dep $i" -- cgit v1.1