2014-07-17 17:31:28 +02:00
|
|
|
From 86a768c5a830220024a56495f18e88bfc21f3aac Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Flavio Castelli <fcastelli@suse.com>
|
|
|
|
|
Date: Wed, 26 Mar 2014 17:50:19 +0100
|
|
|
|
|
Subject: [PATCH 2/2] Stripped dockerinit binary
|
|
|
|
|
|
|
|
|
|
The sha1sum of `dockerinit` is hardcoded into `docker` binary and is
|
|
|
|
|
checked at runtime. OBS strips the debugging symbols from all the
|
|
|
|
|
binaries (and hence also from `dockerinit`). That causes the sha1sum of
|
|
|
|
|
the installed file to be different from the value computed inside of the
|
|
|
|
|
buildroot.
|
|
|
|
|
|
|
|
|
|
This commit strips the debugging symbols from `dockerinit` _before_ the
|
|
|
|
|
`docker` binary is built. Avoiding all the runtime errors.
|
|
|
|
|
---
|
|
|
|
|
hack/make/dynbinary | 1 +
|
|
|
|
|
1 file changed, 1 insertion(+)
|
|
|
|
|
|
2015-02-18 20:36:53 +01:00
|
|
|
Index: docker/project/make/.dockerinit
|
|
|
|
|
===================================================================
|
|
|
|
|
--- docker.orig/project/make/.dockerinit
|
|
|
|
|
+++ docker/project/make/.dockerinit
|
|
|
|
|
@@ -25,5 +25,7 @@ else
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
+/usr/bin/strip -g $DEST/dockerinit-$VERSION
|
|
|
|
|
+
|
|
|
|
|
# sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another
|
|
|
|
|
export DOCKER_INITSHA1="$($sha1sum $DEST/dockerinit-$VERSION | cut -d' ' -f1)"
|
