From 902c9d901770303e2efc86e9a08ae695e0d2dca2 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 21 Feb 2019 17:45:41 +0000 Subject: [PATCH 1/4] chore(metadata): Regenerate cache --- .../md5-cache/sys-apps/{ignition-0.30.0 => ignition-0.31.0} | 4 ++-- .../coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/{ignition-0.30.0 => ignition-0.31.0} (95%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.30.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.31.0 similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.30.0 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.31.0 index a7e14cbd55..02f41ddea1 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.30.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.31.0 @@ -9,6 +9,6 @@ KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 RDEPEND=sys-apps/coreutils sys-apps/gptfdisk sys-apps/shadow sys-apps/systemd sys-fs/btrfs-progs sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs sys-apps/util-linux REQUIRED_USE=go_version_go1_11 -SLOT=0/0.30.0 +SLOT=0/0.31.0 _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac -_md5_=754f88e7081429a8e743808f59fcd965 +_md5_=ef8e704c902a5e16eae3be8840e8742e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 index bed69bf932..59239075df 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 @@ -11,4 +11,4 @@ RDEPEND=sys-apps/coreutils sys-apps/gptfdisk sys-apps/shadow sys-apps/systemd sy REQUIRED_USE=go_version_go1_11 SLOT=0/9999 _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac -_md5_=754f88e7081429a8e743808f59fcd965 +_md5_=ef8e704c902a5e16eae3be8840e8742e From 9a7afdfe7c2342a5da4e10d089cc8deb22b65d19 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 21 Feb 2019 17:46:31 +0000 Subject: [PATCH 2/4] app-emulation/docker-runc: Rework for 18.06.3 --- .../docker-runc/docker-runc-1.0.0_rc5_p22.ebuild | 6 ++---- .../md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild index 628326dbbf..72f5946ba7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild @@ -7,14 +7,12 @@ GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_VERSION="go1.10" # the commit of runc that docker uses. -# see https://github.com/docker/docker-ce/blob/v18.06.2-ce/components/engine/hack/dockerfile/install/runc.installer#L5 +# see https://github.com/docker/docker-ce/blob/v18.06.3-ce/components/engine/hack/dockerfile/install/runc.installer#L4 # Update the patch number when this commit is changed (i.e. the _p in the ebuild). # The patch version is arbitrarily the number of commits since the tag version # specified in the ebuild name. For example: # $ git log --oneline v1.0.0-rc5..${COMMIT_ID} | wc -l COMMIT_ID="a592beb5bc4c4092b1b1bac971afed27687340c5" -# This is the expected commit ID, which ignores the patch in the commit above. -RUNC_COMMIT="69663f0bd4b60df09991c08812a60108003fa340" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -63,7 +61,7 @@ src_compile() { GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ VERSION=1.0.0-rc5+dev.docker-18.06 \ - COMMIT="${RUNC_COMMIT}" + COMMIT="${COMMIT_ID}" } src_install() { diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 index cbd4321d76..5b1c9e9c26 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/opencontainers/runc/archive/a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz -> docker-runc-1.0.0_rc5_p22.tar.gz _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 -_md5_=21335b1e8685fad299934cc6bcc55f93 +_md5_=c1cc0d32b018e3431bb1ec6fb4c4a5b3 From 1da7b728b7760427385ae3bbbd1c5254d868bf3a Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 21 Feb 2019 17:49:58 +0000 Subject: [PATCH 3/4] app-emulation/docker: Bump 18.06.2 to 18.06.3 --- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-18.06.2.ebuild => docker-18.06.3.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 4 ++-- ...unt-labels.patch => docker-18.06.3-fix-mount-labels.patch} | 0 .../app-emulation/{docker-18.06.2 => docker-18.06.3} | 4 ++-- .../metadata/md5-cache/app-emulation/docker-9999 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-18.06.2.ebuild => docker-18.06.3.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/{docker-18.06.2-fix-mount-labels.patch => docker-18.06.3-fix-mount-labels.patch} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{docker-18.06.2 => docker-18.06.3} (93%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest index 31e6e0d319..0621c7576f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest @@ -1 +1 @@ -DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b SHA512 78ab030555501071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f29444407456a3914c263c04a1398dc895586026440f203b50a4 +DIST docker-18.06.3.tar.gz 13672165 BLAKE2B f0f0e78ddfba7fdbc0b28fb3c4f1c1dfb4c6e17124dcf1f6c1515cb4daa9add79589b30ab72a850ce05aef725e23738e6fe9a2124d890ab258179f5736d6ca9c SHA512 ae3afecc2e48f567dd3c2723aff8f035f0f61810b9e2d6c1106da638fbe1f1d081277b71295bc0e26651f35d3bc5e647c6ecf142556b06a2645e54899fe7d17a diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index d824723118..582598e626 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="6d37f41" + DOCKER_GITCOMMIT="d7080c1" SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" @@ -250,7 +250,7 @@ src_compile() { pushd components/cli || die - # Imitating https://github.com/docker/docker-ce/blob/v18.06.2-ce/components/cli/scripts/build/.variables#L7 + # Imitating https://github.com/docker/docker-ce/blob/v18.06.3-ce/components/cli/scripts/build/.variables#L7 CLI_BUILDTIME="$(date -d "@${DOCKER_BUILD_DATE}" --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')" # build cli emake \ diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.2-fix-mount-labels.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.3-fix-mount-labels.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.2-fix-mount-labels.patch rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.3-fix-mount-labels.patch diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.3 similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.3 index 14a62976af..cd60d9166c 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.3 @@ -10,6 +10,6 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 -SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.2-ce.tar.gz -> docker-18.06.2.tar.gz +SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.3-ce.tar.gz -> docker-18.06.3.tar.gz _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 -_md5_=c3a5af7398c78c523941960cf21044c0 +_md5_=a5f40219652669e44312b0e05fa45b1f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 index 7df91cbc94..d1433e6a99 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 @@ -11,4 +11,4 @@ REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=c3a5af7398c78c523941960cf21044c0 +_md5_=a5f40219652669e44312b0e05fa45b1f From ebf67ae9a166a83633f08378d56de57295d7fac7 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 21 Feb 2019 17:50:43 +0000 Subject: [PATCH 4/4] app-torcx/docker: Bump the 18.06 image to 18.06.3 --- .../coreos-overlay/app-torcx/docker/docker-18.06.ebuild | 2 +- .../coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild index 7e7ebd86ba..a2d12f32b1 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild @@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - ~app-emulation/docker-18.06.2 + ~app-emulation/docker-18.06.3 ~app-emulation/containerd-1.1.2 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p22 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 index 929472d7ed..02953dfe59 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 @@ -3,6 +3,6 @@ DESCRIPTION=Packages to be installed in a torcx image for Docker EAPI=2 KEYWORDS=amd64 arm64 LICENSE=GPL-2 -RDEPEND=~app-emulation/docker-18.06.2 ~app-emulation/containerd-1.1.2 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p22 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 +RDEPEND=~app-emulation/docker-18.06.3 ~app-emulation/containerd-1.1.2 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p22 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 SLOT=0 -_md5_=241e7dcf9a37d5a68340b057d5f0c8e6 +_md5_=3db2176202d29e476a0eac4c9c2b0d55