From bd6d88c87793d8d03bd4bb1004eb1c05d867dffa Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Fri, 22 Mar 2013 17:46:43 -0700 Subject: [PATCH] fix(coreos/config): remove unneeded configs the sudo config was filtering out pam.d configs necessary for sudo to work. And these others aren't needed. Remove. --- .../coreos-overlay/coreos/config/env/app-admin/sudo | 2 -- .../coreos-overlay/coreos/config/env/dev-libs/glib | 12 ------------ .../coreos/config/env/gnome-base/libglade | 8 -------- .../coreos/config/env/media-sound/alsa-utils | 7 ------- 4 files changed, 29 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/sudo delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-libs/glib delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/gnome-base/libglade delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/media-sound/alsa-utils diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/sudo b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/sudo deleted file mode 100644 index 992679bc6b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/sudo +++ /dev/null @@ -1,2 +0,0 @@ -PKG_INSTALL_MASK+=" /etc/pam.d/sudo" -INSTALL_MASK+=" /etc/pam.d/sudo" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-libs/glib b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-libs/glib deleted file mode 100644 index e4c0bc402a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-libs/glib +++ /dev/null @@ -1,12 +0,0 @@ -export glib_cv_have_qsort_r=yes - -# The following ac_cv_alignof_* work around an issue in AC_CHECK_ALIGNOF, -# which fails under cross-compilation with newer gcc. -# See http://lists.gnu.org/archive/html/bug-autoconf/2012-09/msg00001.html -# for more details. -# -# TODO(benchan,vapier): Remove the workaround after the AC_CHECK_ALIGNOF -# issue is fixed. -export ac_cv_alignof_guint32=4 -export ac_cv_alignof_guint64=8 -export ac_cv_alignof_unsigned_long=8 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/gnome-base/libglade b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/gnome-base/libglade deleted file mode 100644 index d71cedaa42..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/gnome-base/libglade +++ /dev/null @@ -1,8 +0,0 @@ -# The libglade code is old and uses a pkg-config search which -# does not respect --host, so force it ourselves. -export ac_cv_path_PKG_CONFIG=${PKG_CONFIG} - -# The current version of pango is old and does not build w/out -# the deprecated glib macros, so make sure we undo that when -# building glade. -export CPPFLAGS+=" -UG_DISABLE_DEPRECATED" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/media-sound/alsa-utils b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/media-sound/alsa-utils deleted file mode 100644 index 33acac24ed..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/media-sound/alsa-utils +++ /dev/null @@ -1,7 +0,0 @@ -# ncurses5_config needs to be set for cross compiling on arm -# Version 1.0.26 should use pkg-config for ncurses, so we can -# drop this workaround when we upgrade. -cros_pre_src_configure_ncurses_config() { - [[ $(cros_target) != "board_sysroot" ]] && return 0 - export ncurses5_config=${ROOT}usr/bin/ncurses5-config -}