From f2ab143716542a578067bd12dcfb431189c0f6b4 Mon Sep 17 00:00:00 2001 From: David James Date: Thu, 9 Jun 2011 12:55:44 -0700 Subject: [PATCH] Fix *.pc files for folks who have /build/x86-mario.dev symlinked to /build/x86-mario BUG=chromium-os:16364 TEST=Ran with symlinked directories Change-Id: I374eced27f1b0b3147b9632d5f9dd2637b0d7d28 Reviewed-on: http://gerrit.chromium.org/gerrit/2390 Reviewed-by: Daniel Erat Tested-by: David James --- chroot_version_hooks.d/3_libtool_update | 2 +- chroot_version_hooks.d/5_symlink_pc_update | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 chroot_version_hooks.d/5_symlink_pc_update diff --git a/chroot_version_hooks.d/3_libtool_update b/chroot_version_hooks.d/3_libtool_update index fc63cbd05c..072c2ad27b 100644 --- a/chroot_version_hooks.d/3_libtool_update +++ b/chroot_version_hooks.d/3_libtool_update @@ -44,7 +44,7 @@ for board_root in /build/*; do '(' -name 'lib*.la' -not -name 'libltdl.la' ')' -delete info "Removing hard-coded paths to ${board_root} in *.pc files" - sudo find "${board_root}" -type f -name '*.pc' | xargs sudo \ + sudo find "${board_root}/usr" -type f -name '*.pc' | xargs sudo \ sed -i -e "s|${board_root}/|/|g" fi done diff --git a/chroot_version_hooks.d/5_symlink_pc_update b/chroot_version_hooks.d/5_symlink_pc_update new file mode 100644 index 0000000000..f6668378f9 --- /dev/null +++ b/chroot_version_hooks.d/5_symlink_pc_update @@ -0,0 +1,15 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +for board_root in /build/*; do + if [ -h "${board_root}" ]; then + board=$(basename "${board_root}") + info "Removing hard-coded paths to ${board_root} in *.pc files" + sudo find "${board_root}/usr" -type f -name '*.pc' | xargs sudo \ + sed -i -e "s|${board_root}/|/|g" + fi +done + +info "Chroot upgraded to version 5: fix symlinked *.pc files" +exit 0