33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
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(+)
|
||
|
|
||
|
diff --git a/hack/make/dynbinary b/hack/make/dynbinary
|
||
|
index 75cffe3..0143a9c 100644
|
||
|
--- a/hack/make/dynbinary
|
||
|
+++ b/hack/make/dynbinary
|
||
|
@@ -15,6 +15,7 @@ if [ -z "$DOCKER_CLIENTONLY" ]; then
|
||
|
./dockerinit
|
||
|
echo "Created binary: $DEST/dockerinit-$VERSION"
|
||
|
ln -sf "dockerinit-$VERSION" "$DEST/dockerinit"
|
||
|
+ /usr/bin/strip -g $DEST/dockerinit
|
||
|
|
||
|
hash_files "$DEST/dockerinit-$VERSION"
|
||
|
|
||
|
--
|
||
|
1.8.4.5
|
||
|
|