diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-09-18 09:58:40 +0200 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-09-23 02:30:19 -0400 |
| commit | e7787cb01be91d3798594687a475d5b085f29ede (patch) | |
| tree | 6b28c8fb4bd614d84861523fb6e0319beb050df1 /recipes-containers/docker/docker-ce_git.bb | |
| parent | b626ea1d49590b1e275d349491d4a6c552b7f20b (diff) | |
| download | meta-virtualization-e7787cb01be91d3798594687a475d5b085f29ede.tar.gz | |
docker-ce: improve hardcoded CC for cross compile
Since commit applied in moby [61a3285 Support cross-compile for arm]
it hardcoded var-CC to support cross-compile for arm
Correct it with "${parameter:-word}" format, it is helpful for user
define toolchains
(Use Default Values. If parameter is unset or null, the expansion of
word is substituted. Otherwise, the value of parameter is substituted.)
https://github.com/moby/moby/commit/61a3285864d3f1b489f48f765b61b2c7bd300372
This fixes a build issue seen when building docker-ce:
exec: "aarch64-linux-gnu-gcc": executable file not found in $PATH
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/docker/docker-ce_git.bb')
| -rw-r--r-- | recipes-containers/docker/docker-ce_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb index a3e27a53..215f1140 100644 --- a/recipes-containers/docker/docker-ce_git.bb +++ b/recipes-containers/docker/docker-ce_git.bb | |||
| @@ -25,6 +25,7 @@ SRC_URI = "\ | |||
| 25 | git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \ | 25 | git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \ |
| 26 | file://0001-libnetwork-use-GO-instead-of-go.patch \ | 26 | file://0001-libnetwork-use-GO-instead-of-go.patch \ |
| 27 | file://docker.init \ | 27 | file://docker.init \ |
| 28 | file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \ | ||
| 28 | " | 29 | " |
| 29 | 30 | ||
| 30 | require docker.inc | 31 | require docker.inc |
