summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-03-22 18:06:51 +0800
committerchrome-bot <chrome-bot@chromium.org>2019-03-28 14:14:01 -0700
commit72fbc0760e581ce637dd4936118c29c2f855d95c (patch)
tree2660972d4de6c55a5c86b7c9b89d7dd4c61d8518
parent3d8d93b1e2688b703b55cf471a737e44baf3f144 (diff)
downloadvboot-72fbc0760e581ce637dd4936118c29c2f855d95c.tar.gz
vboot: remove tinyhostlib from Makefile
vboot Makefile contains a target library called libtinyvboot_host.a, and claims it is used by autoupdate installer since it must sometimes be a 32-bit executable. (See CL:44442.) As far as I can tell, this lib is no longer used, and we can safely remove it: (1) I don't see any mention of this file in any repo's git history: $ repo list | sed -e 's@ :.*@@' | while read dir; do ( cd $dir; out=`git --no-pager log --no-renames -p -Svboot_host | grep tinyvboot_host`; [ -z "$out" ] || echo "$dir\n$out" ); done; src/platform/vboot_reference +TINYHOSTLIB = ${BUILD}/libtinyvboot_host.a (2) The library doesn't get installed in vboot_reference's ebuild. BUG=b:124141368, chromium:440078 TEST=build vboot_reference BRANCH=none Change-Id: I0ff41f0596f911ac1d969bfabcdaab7fc2c883f7 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/1535459 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Joel Kitching <kitching@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org>
-rw-r--r--Makefile35
1 files changed, 0 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index 47918c95..0061a01d 100644
--- a/Makefile
+++ b/Makefile
@@ -551,29 +551,6 @@ HOSTLIB_SRCS = \
HOSTLIB_OBJS = ${HOSTLIB_SRCS:%.c=${BUILD}/%.o}
ALL_OBJS += ${HOSTLIB_OBJS}
-# Sigh. For historical reasons, the autoupdate installer must sometimes be a
-# 32-bit executable, even when everything else is 64-bit. But it only needs a
-# few functions, so let's just build those.
-TINYHOSTLIB = ${BUILD}/libtinyvboot_host.a
-
-TINYHOSTLIB_SRCS = \
- cgpt/cgpt_add.c \
- cgpt/cgpt_boot.c \
- cgpt/cgpt_common.c \
- cgpt/cgpt_create.c \
- cgpt/cgpt_prioritize.c \
- firmware/2lib/2crc8.c \
- firmware/lib/cgptlib/cgptlib_internal.c \
- firmware/lib/cgptlib/crc32.c \
- firmware/lib/gpt_misc.c \
- firmware/lib/utility_string.c \
- firmware/stub/vboot_api_stub.c \
- firmware/stub/vboot_api_stub_disk.c \
- futility/dump_kernel_config_lib.c \
- host/lib/extract_vmlinuz.c
-
-TINYHOSTLIB_OBJS = ${TINYHOSTLIB_SRCS:%.c=${BUILD}/%.o}
-
# ----------------------------------------------------------------------------
# Now for the userspace binaries
@@ -1047,18 +1024,6 @@ ${HOSTLIB}: ${HOSTLIB_OBJS}
@${PRINTF} " AR $(subst ${BUILD}/,,$@)\n"
${Q}ar qc $@ $^
-
-# Ugh. This is a very cut-down version of HOSTLIB just for the installer.
-.PHONY: tinyhostlib
-tinyhostlib: ${TINYHOSTLIB}
- ${Q}cp -f ${TINYHOSTLIB} ${HOSTLIB}
-
-${TINYHOSTLIB}: ${TINYHOSTLIB_OBJS}
- @${PRINTF} " RM $(subst ${BUILD}/,,$@)\n"
- ${Q}rm -f $@
- @${PRINTF} " AR $(subst ${BUILD}/,,$@)\n"
- ${Q}ar qc $@ $^
-
.PHONY: headers_install
headers_install:
@${PRINTF} " INSTALL HEADERS\n"