From c8896e79e9e81f1131233a98ba0ef094c62af36e Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 1 Aug 2014 17:29:07 -0700 Subject: [PATCH] profiles: disable static binaries Left over from some odd behaviors of the ChromeOS build systems. --- .../profiles/coreos/base/package.use | 38 ------------------- .../coreos/targets/generic/package.use | 3 +- .../profiles/coreos/targets/sdk/package.use | 6 --- 3 files changed, 1 insertion(+), 46 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index d63a0dcc2e..e51504f3a2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -21,54 +21,16 @@ media-libs/gd png media-libs/libmtp -crypt # We don't want any driver/hw rendering on the host media-sound/alsa-utils -libsamplerate minimal -net-misc/curl ares static-libs sci-geosciences/gpsd -cxx -# verity and other packages link statically with libuuid. -sys-apps/util-linux -perl static-libs -sys-boot/grub grub_platforms_pc grub_platforms_efi-64 grub_platforms_coreboot static sys-devel/gettext -git -# Build emulation statically so that we can execute it within a chroot and -# still find the shared libraries. -net-misc/dhcpcd -crash -# Building qemu-kvm with static libraries and X/sdl does not work right now, -# with the likely problem in libsdl-1.2.13-r1 from upstream. Previously, -# this comment was here: -# build kvm with X and sdl so we have an option of running it with local -# display without VNC app-emulation/qemu aio caps curl jpeg ncurses png python seccomp threads uuid vhost-net virtfs vnc xattr qemu_softmmu_targets_x86_64 -dev-libs/libaio static-libs -cross-armv7a-cros-linux-gnueabi/gcc hardfp -cross-armv6j-cros-linux-gnueabi/gcc hardfp -thumb -# pciutils is required by flashrom / mosys which is required to be statically -# compiled to reduce dependency during auto update. -sys-apps/pciutils static-libs -# xz-utils includes liblzma, which is picked by bmpblk_utility (vboot_reference) -# and may be executed outside chroot. -app-arch/xz-utils static-libs -app-emulation/xen-tools -ocaml -hvm -xend -pygrub -qemu -flask -screen -doc amd64 - -=sys-libs/gdbm-1.8.3-r4 berkdb ->=sys-libs/libseccomp-1.0.1 static-libs -=app-text/ghostscript-gpl-9.05-r1 cups -=coreos-base/cros-devutils-0.0.1-r516 cros_host -=sys-libs/libcap-ng-0.6.6 static-libs ->=sys-libs/ncurses-5.9-r2 static-libs ->=media-libs/libjpeg-turbo-1.2.1 static-libs ->=dev-libs/openssl-1.0.1c static-libs -=x11-libs/cairo-1.10.2-r3 X -=media-libs/libpng-1.5.13-r1 static-libs ->=virtual/jpeg-0 static-libs ->=media-libs/libjpeg-turbo-1.2.0-r1 static-libs sys-apps/gptfdisk -icu # for profile migration dev-libs/apr-util -gdbm sys-libs/gdbm berkdb -# TODO: disable most static things -sys-libs/zlib static-libs - dev-vcs/git -perl -iconv net-analyzer/nmap ncat -lua diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index 2738000830..0f5b66f60e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -19,11 +19,10 @@ sys-apps/busybox -pam -selinux sys-apps/dbus -X -systemd sys-apps/smartmontools minimal sys-block/parted device-mapper -sys-fs/lvm2 -lvm1 -readline -static +sys-fs/lvm2 -lvm1 -readline sys-fs/squashfs lzo sys-libs/ncurses minimal sys-libs/pam -berkdb -sys-libs/zlib static-libs sys-libs/gdbm berkdb diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use index 25c20a0b33..6a1aa5217e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use @@ -1,9 +1,3 @@ -# TODO: remove static stuff -app-arch/bzip2 static-libs -app-arch/pbzip2 static -app-arch/pigz static -dev-libs/glib static-libs - coreos-base/update_engine delta_generator sys-apps/flashrom dediprog ft2232_spi serprog