Skip to contentSkip to conversation

docker-ce: improve hardcoded CC for cross compile

PATCH In review Stefan Agner 2 participants 8 messages Sep 18, 2019 – Sep 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 docker-ce: improve hardcoded CC for cross compile

From: Stefan Agner <[email protected]>

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

---
 recipes-containers/docker/docker-ce_git.bb    |  1 +
 ...dcoded-CC-on-cross-compile-docker-ce.patch | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 recipes-containers/docker/files/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch
recipes-containers/docker/docker-ce_git.bb +1 -0
index a3e27a5..215f114 100644
@@ -25,6 +25,7 @@ SRC_URI = "\
 	git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
 	file://0001-libnetwork-use-GO-instead-of-go.patch \
 	file://docker.init \
+	file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \
 	"
 
 require docker.inc
recipes-containers/docker/files/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch new file +61 -0

61 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 2/2 docker-ce: update to v19.03.2

From: Stefan Agner <[email protected]>

Bump the git hashes to Docker CE v19.03.2.

---
Changes in v2:
- Bump to v19.03.2 final release
- Drop docker (non-ce) recipe patch as that recipe can not be bumped to a Docker stable patch release

 recipes-containers/docker/docker-ce_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-containers/docker/docker-ce_git.bb +2 -2
index 215f114..52b146d 100644
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV_docker = "2416d7f930859912c883f964b1cee6909635f951"
+SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
 SRC_URI = "\
 	git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3-ce"
+DOCKER_VERSION = "19.03.2-ce"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 PACKAGES =+ "${PN}-contrib"
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH v2 2/2] docker-ce: update to v19.03.2

Quoted 11 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Bump the git hashes to Docker CE v19.03.2.

---
Changes in v2:
- Bump to v19.03.2 final release
- Drop docker (non-ce) recipe patch as that recipe can not be bumped to a Docker stable patch release

Ack'd. I'll take care of the moby recipe shortly. I've pulled this in for testing.

Bruce

Quoted 34 lines
 recipes-containers/docker/docker-ce_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-containers/docker/docker-ce_git.bb +2 -3
index 215f114..52b146d 100644
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV_docker = "2416d7f930859912c883f964b1cee6909635f951"
+SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
 SRC_URI = "\
        git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3-ce"
+DOCKER_VERSION = "19.03.2-ce"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#3 lore raw

Re: [PATCH v2 2/2] docker-ce: update to v19.03.2

Quoted 13 lines · Bruce Ashfield
Quoted 11 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Bump the git hashes to Docker CE v19.03.2.

---
Changes in v2:
- Bump to v19.03.2 final release
- Drop docker (non-ce) recipe patch as that recipe can not be bumped to a Docker stable patch release

Quoted 2 lines

Ack'd. I'll take care of the moby recipe shortly. I've pulled this in for testing.

Thx. Just FYI, this recipe currently does not build. So it would be nice to have this fixed soon.

--
Stefan

Quoted 37 lines

Bruce

Quoted 34 lines
 recipes-containers/docker/docker-ce_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-containers/docker/docker-ce_git.bb +2 -3
index 215f114..52b146d 100644
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV_docker = "2416d7f930859912c883f964b1cee6909635f951"
+SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
 SRC_URI = "\
        git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3-ce"
+DOCKER_VERSION = "19.03.2-ce"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

#4 lore raw

Re: [PATCH v2 2/2] docker-ce: update to v19.03.2

Quoted 12 lines · Stefan Agner
Quoted 11 lines · Bruce Ashfield
Quoted 10 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Bump the git hashes to Docker CE v19.03.2.

---
Changes in v2:
- Bump to v19.03.2 final release
- Drop docker (non-ce) recipe patch as that recipe can not be bumped to

Quoted 9 lines

a

Quoted 4 lines
Quoted 1 line

Docker stable patch release

Ack'd. I'll take care of the moby recipe shortly. I've pulled this in for testing.

Thx. Just FYI, this recipe currently does not build. So it would be nice to have this fixed soon.

Yup. I've been seeing the issue as well, but the 5.2 kernel intro to oe-core has preempted some things for the last little while.

I have the virtual/docker and moby switch pretty much done, so it'll all be fixed up shortly.

Bruce

Quoted 44 lines

--
Stefan

Quoted 8 lines

Bruce

Review

Quoted 5 lines
 recipes-containers/docker/docker-ce_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/recipes-containers/docker/docker-ce_git.bb

Quoted 7 lines
Quoted 7 lines

index 215f114..52b146d 100644

recipes-containers/docker/docker-ce_git.bb +0 -0
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
Quoted 5 lines

recipes-containers/docker/docker-ce_git.bb DESCRIPTION = "Linux container runtime \

Quoted 5 lines
recipes-containers/docker/docker-ce_git.bb +1 -1
-SRCREV_docker = "2416d7f930859912c883f964b1cee6909635f951"
+SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
 SRC_URI = "\
        git://github.com/docker/docker-ce.git;branch=19.03;name=docker

\

Quoted 17 lines
Quoted 17 lines
recipes-containers/docker/docker-ce_git.bb +1 -2
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3-ce"
+DOCKER_VERSION = "19.03.2-ce"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
#5 lore raw

Re: [PATCH v2 2/2] docker-ce: update to v19.03.2

Quoted 22 lines · Bruce Ashfield
Quoted 18 lines · Stefan Agner
Quoted 11 lines · Bruce Ashfield
Quoted 10 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Bump the git hashes to Docker CE v19.03.2.

---
Changes in v2:
- Bump to v19.03.2 final release
- Drop docker (non-ce) recipe patch as that recipe can not be bumped

to a

Quoted 4 lines
Quoted 1 line

Docker stable patch release

Ack'd. I'll take care of the moby recipe shortly. I've pulled this in for testing.

Quoted 8 lines
Quoted 3 lines

Thx. Just FYI, this recipe currently does not build. So it would be nice to have this fixed soon.

Yup. I've been seeing the issue as well, but the 5.2 kernel intro to oe-core has preempted some things for the last little while.

Actually, I take that back.

What configuration are you using that the current docker (non-ce) recipe isn't building ?

The build error that I was dealing with was due to my SRCREV bumps and other fixing, but when I do a build of docker on an unmodified master branch, I have no issues.

Bruce

Quoted 59 lines

I have the virtual/docker and moby switch pretty much done, so it'll all be fixed up shortly.

Bruce

Quoted 38 lines

--
Stefan

Quoted 8 lines

Bruce

Review

Quoted 5 lines
 recipes-containers/docker/docker-ce_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/recipes-containers/docker/docker-ce_git.bb

Quoted 7 lines
Quoted 7 lines

index 215f114..52b146d 100644

recipes-containers/docker/docker-ce_git.bb +0 -0
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
Quoted 5 lines

recipes-containers/docker/docker-ce_git.bb DESCRIPTION = "Linux container runtime \

Quoted 5 lines
recipes-containers/docker/docker-ce_git.bb +1 -1
-SRCREV_docker = "2416d7f930859912c883f964b1cee6909635f951"
+SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
 SRC_URI = "\
        git://github.com/docker/docker-ce.git;branch=19.03;name=docker

\

Quoted 12 lines
Quoted 12 lines
recipes-containers/docker/docker-ce_git.bb +1 -2
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3-ce"
+DOCKER_VERSION = "19.03.2-ce"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

Quoted 6 lines
Quoted 5 lines
Quoted 5 lines

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
#6 lore raw

Re: [PATCH v2 2/2] docker-ce: update to v19.03.2

Quoted 16 lines · Bruce Ashfield

On Fri, Sep 20, 2019 at 11:28 PM Bruce Ashfield <[email protected]> wrote:

Quoted 13 lines · Bruce Ashfield
Quoted 11 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Bump the git hashes to Docker CE v19.03.2.

---
Changes in v2:
- Bump to v19.03.2 final release
- Drop docker (non-ce) recipe patch as that recipe can not be bumped to a Docker stable patch release

Quoted 7 lines
Quoted 2 lines

Ack'd. I'll take care of the moby recipe shortly. I've pulled this in for testing.

Thx. Just FYI, this recipe currently does not build. So it would be nice to have this fixed soon.

Yup. I've been seeing the issue as well, but the 5.2 kernel intro to oe-core has preempted some things for the last little while.

Actually, I take that back.

What configuration are you using that the current docker (non-ce) recipe isn't building ?

The non-ce recipe builds fine for me too. I was referring to this (docker-ce) recipe. Patch 1/2 makes it build again.

Best regards,
Stefan

Quoted 42 lines

The build error that I was dealing with was due to my SRCREV bumps and other fixing, but when I do a build of docker on an unmodified master branch, I have no issues.

Bruce

I have the virtual/docker and moby switch pretty much done, so it'll all be fixed up shortly.

Bruce
--
Stefan

Quoted 32 lines

Bruce

Quoted 29 lines

recipes-containers/docker/docker-ce_git.bb [1] | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
recipes-containers/docker/docker-ce_git.bb [1] +0 -0
index 215f114..52b146d 100644
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
 subtle and/or glaring issues. \

"

recipes-containers/docker/docker-ce_git.bb [1] +1 -1
-SRCREV_docker = "2416d7f930859912c883f964b1cee6909635f951"
+SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"

SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381" SRC_URI = "\
git://github.com/docker/docker-ce.git;branch=19.03;name=docker [2] \

recipes-containers/docker/docker-ce_git.bb [1] +0 -0
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
 

S = "${WORKDIR}/git"

recipes-containers/docker/docker-ce_git.bb [1] +1 -1
-DOCKER_VERSION = "19.03.0-rc3-ce"
+DOCKER_VERSION = "19.03.2-ce"

PV = "${DOCKER_VERSION}+git${SRCREV_docker}"

PACKAGES =+ "${PN}-contrib"
--
2.20.1

Quoted 8 lines
Quoted 5 lines
Quoted 5 lines

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 2 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Links:
------
[1] http://docker-ce_git.bb
[2] http://github.com/docker/docker-ce.git;branch=19.03;name=docker

#7 lore raw

Re: [PATCH v2 2/2] docker-ce: update to v19.03.2

Quoted 40 lines · Stefan Agner

On 2019-09-21 05:35, Bruce Ashfield wrote:

Quoted 22 lines · Bruce Ashfield
Quoted 18 lines · Stefan Agner
Quoted 11 lines · Bruce Ashfield
Quoted 10 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Bump the git hashes to Docker CE v19.03.2.

---
Changes in v2:
- Bump to v19.03.2 final release
- Drop docker (non-ce) recipe patch as that recipe can not be bumped

to a

Quoted 4 lines
Quoted 1 line

Docker stable patch release

Ack'd. I'll take care of the moby recipe shortly. I've pulled this in for testing.

Quoted 8 lines
Quoted 2 lines

Thx. Just FYI, this recipe currently does not build. So it would be nice to have this fixed soon.

Yup. I've been seeing the issue as well, but the 5.2 kernel intro to oe-core has preempted some things for the last little while.

Actually, I take that back.

Quoted 8 lines

What configuration are you using that the current docker (non-ce) recipe isn't building ?

The non-ce recipe builds fine for me too. I was referring to this (docker-ce) recipe. Patch 1/2 makes it build again.

ahaha! Sorry about that.

Yes, I'll push that fix this weekend, while I sort out the last details on the other parts.

Bruce

Quoted 78 lines

Best regards,
Stefan

The build error that I was dealing with was due to my SRCREV bumps and other fixing, but when I do a build of docker on an unmodified master branch, I have no issues.

Bruce

Quoted 44 lines

I have the virtual/docker and moby switch pretty much done, so it'll all be fixed up shortly.

Bruce

Quoted 38 lines

--
Stefan

Quoted 8 lines

Bruce

Review

Quoted 5 lines
 recipes-containers/docker/docker-ce_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/recipes-containers/docker/docker-ce_git.bb

Quoted 7 lines
Quoted 7 lines

index 215f114..52b146d 100644

recipes-containers/docker/docker-ce_git.bb +0 -0
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
Quoted 5 lines

recipes-containers/docker/docker-ce_git.bb DESCRIPTION = "Linux container runtime \

Quoted 5 lines
recipes-containers/docker/docker-ce_git.bb +1 -1
-SRCREV_docker = "2416d7f930859912c883f964b1cee6909635f951"
+SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
 SRC_URI = "\
        git://

github.com/docker/docker-ce.git;branch=19.03;name=docker \

Quoted 12 lines
Quoted 12 lines
recipes-containers/docker/docker-ce_git.bb +1 -2
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3-ce"
+DOCKER_VERSION = "19.03.2-ce"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II