Attachment 828465 Details for Bug 1026545 – dockerinit build process fix

[patch] dockerinit build process fix

build-dockerinit.patch (text/plain), 1.29 KB, created by dan-fedora on 2013-11-25 01:52:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dan-fedora

Created: 2013-11-25 01:52:05 UTC

Size: 1.29 KB

patch

obsolete

>--- docker-io.spec.orig	2013-11-23 13:02:51.000000000 -0600
>+++ docker-io.spec	2013-11-24 19:44:46.989408335 -0600
>@@ -2,6 +2,9 @@
> %bcond_without  systemd
> %endif
> 
>+# modifying the dockerinit binary breaks the SHA1 sum check by docker
>+%global __os_install_post %{_rpmconfigdir}/brp-compress
>+
> #debuginfo not supported with Go
> %global debug_package %{nil}
> %global gopath  %{_datadir}/gocode
>@@ -11,7 +14,7 @@
> 
> Name:           docker-io
> Version:        0.7
>-Release:        0.19.rc7%{?dist}
>+Release:        0.20.rc7%{?dist}
> Summary:        Automates deployment of containerized applications
> License:        ASL 2.0
> 
>@@ -77,11 +80,12 @@
> # tamper with their magic
> export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.IAMSTATIC true"
> export BUILDFLAGS="-tags netgo"
>-go build -v -a -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS github.com/dotcloud/docker/docker
> go build -v -a -ldflags \
>   "$LDFLAGS -linkmode external -extldflags '-lpthread -static -Wl,--unresolved-symbols=ignore-in-object-files' $LDFLAGS_STATIC" \
>   $BUILDFLAGS \
>   github.com/dotcloud/docker/dockerinit
>+export DOCKER_INITSHA1="$(sha1sum dockerinit | cut -d' ' -f1)"
>+go build -v -a -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS github.com/dotcloud/docker/docker
> 
> popd
>

Actions: View | Diff

Attachments on bug 1026545: 828465