From ffd56e6830353443b8c62d350aa61a4014f09df3 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 11 Apr 2016 11:46:57 -0700 Subject: [PATCH] profiles: do not wrap pkg-config as a legacy library config script This little bit of glue for handling old-style foo-config scripts was assuming that anything in /usr/bin with a -config suffix was worth wrapping. This is certainly not the case if the file in question is a binary. This is most likely to cause confusion with pkg-config. --- .../profiles/coreos/targets/generic/profile.bashrc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/profile.bashrc b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/profile.bashrc index 9726a6cd20..a218a52beb 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/profile.bashrc +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/profile.bashrc @@ -18,6 +18,14 @@ cros_pre_pkg_preinst_wrap_old_config_scripts() { local c w for w in ${wrappers} ; do + # $CHOST-$CHOST-foo-config isn't helpful + if [[ ${w} == ${CHOST}-* ]]; then + continue + fi + # Skip anything that isn't a script, e.g. pkg-config + if ! head -n1 | egrep -q '^#!\s*/bin/(ba)?sh'; then + continue + fi w="${wdir}/${CHOST}-${w}" c="${CROS_ADDONS_TREE}/scripts/config_wrapper" if [[ ! -e ${w} ]] ; then