mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
vboot_reference: build all the tools
This expands the build to include more things that are useful on chromebooks, like `crossystem`
This commit is contained in:
parent
376516f335
commit
7ccad2a4f2
2 changed files with 38 additions and 8 deletions
|
@ -17,17 +17,17 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildPhase = ''
|
||||
patches = [ ./dont_static_link.patch ];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs scripts
|
||||
make -j''${NIX_BUILD_CORES:-1} \
|
||||
`pwd`/build/cgpt/cgpt \
|
||||
`pwd`/build/futility/futility
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp build/cgpt/cgpt $out/bin
|
||||
cp build/futility/futility $out/bin
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/vboot
|
||||
cp -r tests/devkeys* $out/share/vboot/
|
||||
'';
|
||||
|
|
30
pkgs/tools/system/vboot_reference/dont_static_link.patch
Normal file
30
pkgs/tools/system/vboot_reference/dont_static_link.patch
Normal file
|
@ -0,0 +1,30 @@
|
|||
---
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2
|
||||
# Link tests for external repos
|
||||
${BUILD}/host/linktest/extern: ${HOSTLIB}
|
||||
${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
|
||||
-${BUILD}/host/linktest/extern: LDLIBS += -static
|
||||
+#${BUILD}/host/linktest/extern: LDLIBS += -static
|
||||
TEST_OBJS += ${BUILD}/host/linktest/extern.o
|
||||
|
||||
.PHONY: hostlib
|
||||
@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL
|
||||
${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
|
||||
|
||||
# Utilities for auto-update toolkits must be statically linked.
|
||||
-${UTIL_BINS_STATIC}: LDFLAGS += -static
|
||||
+${UTIL_BINS_STATIC}:
|
||||
|
||||
|
||||
.PHONY: utils
|
||||
@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
|
||||
|
||||
${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
|
||||
@${PRINTF} " LD $(subst ${BUILD}/,,$@)\n"
|
||||
- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
|
||||
+ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
|
||||
|
||||
${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS}
|
||||
${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB}
|
Loading…
Reference in a new issue