mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-08 13:46:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #825 from marineam/fix

Browse Source 
update_engine: fix using delta_generator from update.zip
This commit is contained in:
Michael Marineau 2014-08-27 23:01:45 -07:00
commit 5a377b1416
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r402.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r403.ebuild vendored
View File

11
sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild vendored
View File

@ -12,7 +12,7 @@ else
KEYWORDS="amd64 arm x86"
fi
inherit toolchain-funcs cros-debug cros-workon scons-utils systemd
inherit flag-o-matic toolchain-funcs cros-debug cros-workon scons-utils systemd
DESCRIPTION="Chrome OS Update Engine"
HOMEPAGE="http://www.chromium.org/"
@ -46,6 +46,15 @@ DEPEND="coreos-base/system_api
${RDEPEND}"
src_compile() {
# Disable PIE when building for the SDK, this works around a bug that
# breaks using delta_generator from the update.zip bundle.
# https://code.google.com/p/chromium/issues/detail?id=394508
# https://code.google.com/p/chromium/issues/detail?id=394241
if use cros_host; then
append-flags -nopie
append-ldflags -nopie
fi
tc-export CC CXX AR RANLIB LD NM PKG_CONFIG
cros-debug-add-NDEBUG
export CCFLAGS="$CFLAGS"