From f8e6944b29f7c3056d94e635d7372c8297313423 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 30 Oct 2019 15:35:02 +0100 Subject: [PATCH 01/12] Adjust submodule branches Change-Id: Ib27a2145631136383c6f580f9a6497cf78215eff --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..21e63f9c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.6 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.6 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.6 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.6 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.6 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.6 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.6 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.6 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.6 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.6 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.6 status = addon From 5426991bfae27631af0a7919661714e2e607b2bc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Nov 2019 09:11:47 +0100 Subject: [PATCH 02/12] Update submodules on '5.12.6' in qt/qt5 Change-Id: I8956dd80e96d7444f18986f50d9d557f514a8b43 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 968be8e9..b77712dd 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 968be8e9ee0851d401d302621eccc1de415ec243 +Subproject commit b77712dd95adb6644e9af3bf98a2a6ebc5a52ec4 diff --git a/qtactiveqt b/qtactiveqt index 53a70236..7dd17c58 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 53a70236417ddc9e8c6ca61c1922d42f9957d866 +Subproject commit 7dd17c586ab559415936e677b6b0814ec81f42e8 diff --git a/qtandroidextras b/qtandroidextras index 43c9c18c..2a5a86ee 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 43c9c18c7452fbae249d77f897dfad0bac7f984d +Subproject commit 2a5a86ee4a8af250c4aca26f3e376ac117c0d58d diff --git a/qtbase b/qtbase index f7d44cc6..1930af19 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f7d44cc6da02a7e386ebe826bd278e83ce3e324a +Subproject commit 1930af194c10d530f52d60be029ffe70892dedaa diff --git a/qtcanvas3d b/qtcanvas3d index 73671479..51e8dc59 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 7367147993766f6386502b6ca007432518af3004 +Subproject commit 51e8dc59d87463f32dab0e401e9ae17615c7b790 diff --git a/qtcharts b/qtcharts index 1a20ea26..969fc5bf 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1a20ea269d7a8b1779e8e172e5f640f16e9d7169 +Subproject commit 969fc5bf94e8e0e6cd86c79c38e11074de235273 diff --git a/qtconnectivity b/qtconnectivity index 5d3f494e..33f5988e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5d3f494e70db4aaba7356d27ad5e1e861b3a4341 +Subproject commit 33f5988eadf1b748d75deec8bc12afc1d47ea52f diff --git a/qtdatavis3d b/qtdatavis3d index 5d95f3f3..2b753d7c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 5d95f3f3716e300748c147e18ae3aecf971857ce +Subproject commit 2b753d7caa9f780d6a76829db516e3fb859c3353 diff --git a/qtdeclarative b/qtdeclarative index da74e8fb..3230bc54 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit da74e8fbb91b680d7783daa1595baa3ecc92cb2e +Subproject commit 3230bc549c16a075c72653f3dc468a2c36cdd86a diff --git a/qtdoc b/qtdoc index 143e36e0..d29777f6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 143e36e0fc4c5ef9782a7dc25fd91625d09029a2 +Subproject commit d29777f66ca7861abeb15778243918af8d630c12 diff --git a/qtgamepad b/qtgamepad index c18416a4..39b7df80 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c18416a4c7e62e1febc6f7a3cf4733dd79e7d6ce +Subproject commit 39b7df80c9b58dffc7a6e9e68b99e1b9f78ed2e0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 16229f68..7ce8cd84 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 16229f68be2c3ad67761c951348bbc5635b6a192 +Subproject commit 7ce8cd84f7f8ce8d0377019f7087b2352b5626e7 diff --git a/qtimageformats b/qtimageformats index 2adadf25..598e1db3 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2adadf2561e9b475a7f24f782200d5a703e8129a +Subproject commit 598e1db3a082d2bb473571c6ae3359e0c687c63b diff --git a/qtlocation b/qtlocation index 181f1de8..ad359c55 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 181f1de815d2f4b32430f798da255c98dd7859ae +Subproject commit ad359c55d36f39c7f243bee8960d490772bfe84e diff --git a/qtmacextras b/qtmacextras index 2115e10d..3ac09b97 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 2115e10d3ab475ce49fe7c95b8293547be33caf8 +Subproject commit 3ac09b971a940b05ebd42f99f84b3ad9990bebc4 diff --git a/qtmultimedia b/qtmultimedia index 9e96fe2c..53a507b3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9e96fe2cbf79a44039de0edcc854050d84b87588 +Subproject commit 53a507b30befc40a4d06a1620e85bb4a5b1bf40a diff --git a/qtnetworkauth b/qtnetworkauth index c277c9b3..ecdeaac3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c277c9b3a22db7007a863079dbf500e06824f238 +Subproject commit ecdeaac31d2cdebda5d7b06a0224fd34649a7375 diff --git a/qtpurchasing b/qtpurchasing index fe396bc6..ceb003e0 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit fe396bc6f8e5b024bdc71a5fc252e1a35ac780e9 +Subproject commit ceb003e074cdbb6f2429dd3f4ddcf995382d199e diff --git a/qtqa b/qtqa index 075ed07c..b9a30637 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 075ed07cbaef3da2be5a2f75739020f5ed15f893 +Subproject commit b9a306372a17a22e1907bbd5911f819d4911bb87 diff --git a/qtquickcontrols b/qtquickcontrols index 3735082b..8f8d9b70 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3735082bb7fc171b491edc371b807e55c11c02f2 +Subproject commit 8f8d9b7015cd05e936d560f097cbce42eb375de9 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9d9ba61a..ed92154c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9d9ba61a7503047e8417a52e3799f51e76067df8 +Subproject commit ed92154c712b0e54caa5baa72d832d7f8286307f diff --git a/qtremoteobjects b/qtremoteobjects index 03d62a73..76d6a138 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 03d62a73c252d7c23b619eb160568acc61d6b9ea +Subproject commit 76d6a13889514b03a1878e19b56eb1e6f17d1b90 diff --git a/qtrepotools b/qtrepotools index a51db43b..0028759f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a51db43b580f774c64275cd3e1e0c707de2a04a4 +Subproject commit 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d94 diff --git a/qtscript b/qtscript index f07f14c4..c2e02e86 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit f07f14c42524f63abf6598647815cea9607e37cf +Subproject commit c2e02e863c3867f5d038731f429cc3a03f3cc3bc diff --git a/qtscxml b/qtscxml index 839a6b0f..9ed16e46 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 839a6b0f9799d2d93b5edae7fb761a4cba755a83 +Subproject commit 9ed16e4621ae705947d5e04ade450f1859ef86c5 diff --git a/qtsensors b/qtsensors index 52822ce6..8fd13b71 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 52822ce6115e10d9161e01f838210c27835b3b1e +Subproject commit 8fd13b71e50d0935af69e70f1961ac8194cb6fb3 diff --git a/qtserialbus b/qtserialbus index e993a7f1..4347caec 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e993a7f1f24303b4b1274b8b0d5e747bc00b9dce +Subproject commit 4347caecbd0b2d02074a033eabf7d114ad7ca5f6 diff --git a/qtserialport b/qtserialport index 8311d60d..f3bf6e0c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8311d60d627dabcf5f74be9e50b4b7d6aedcd5e7 +Subproject commit f3bf6e0cc9c7b8c9d1ef249cf8043c465d7e8186 diff --git a/qtspeech b/qtspeech index cbf37ef4..099aaa9d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit cbf37ef4536fdea8d14aa3db33f4a062da8c9716 +Subproject commit 099aaa9df347e00ef121f959fa8fb6e1c0910a33 diff --git a/qtsvg b/qtsvg index 3394d292..f8eb5228 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 3394d29226541d4b802dca4c8ef7b8817849743c +Subproject commit f8eb5228da5805161701477682489baf9d5028ea diff --git a/qttools b/qttools index 647a9f29..c4988ca2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 647a9f29035add2b50ac510f0ddc06cb34122435 +Subproject commit c4988ca21346752e601df8a6b2cef3ee10c062f0 diff --git a/qttranslations b/qttranslations index 00556e09..d80d31a2 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 00556e09790b83b3a2a83020b900e07829eaa0a4 +Subproject commit d80d31a2d4bd94a4a97dd532a126f04d1a4dfc2d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6074356c..73259adb 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6074356c2c84044b65134bd6186171d513703306 +Subproject commit 73259adb59f15dab266504f5444c99a6e06a7f32 diff --git a/qtwayland b/qtwayland index 45859d75..44fbe562 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 45859d7521074a4921b8459eb0a6e2cc71b9dd5a +Subproject commit 44fbe562b544119a9d23a72c3d577d2946c72162 diff --git a/qtwebchannel b/qtwebchannel index 2b2a24e3..253123ab 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 2b2a24e3a62d1204b9c13c0ae5e1bb4453e02a61 +Subproject commit 253123ab5bd345053c4b1359c0fda9359a4e16b2 diff --git a/qtwebengine b/qtwebengine index 15b7a434..f6ff5b17 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 15b7a43417e6ae2a3922010524881405ef6b7474 +Subproject commit f6ff5b17edfcd72c1536b46d8db1c9a30f70a6ba diff --git a/qtwebglplugin b/qtwebglplugin index 04d5b05b..560f3c6f 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 04d5b05b184fa7b1c8f89462bfc4b31cd43860dd +Subproject commit 560f3c6f9a5e199f88be2f111e1ee5fa19948d57 diff --git a/qtwebsockets b/qtwebsockets index f35c72e7..fd324911 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f35c72e71124c7077b5192944cf9b57966a258bc +Subproject commit fd324911025d49b8b3d89a155ce38e3228edfd33 diff --git a/qtwebview b/qtwebview index f2123e65..bc7e946f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f2123e656868dd1f4869080afa02e4d865b4911e +Subproject commit bc7e946f0e823be99de7834a2784c22d5ae2d628 diff --git a/qtwinextras b/qtwinextras index 553d8468..09ed2f46 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 553d8468ebbf456355ad280fd3b2c742b38c1d57 +Subproject commit 09ed2f46fb51ec508bd1c5836d2a1884246e9d09 diff --git a/qtx11extras b/qtx11extras index da2acfc8..547506f9 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit da2acfc8266fc771d409a728fa8450a01a042c9c +Subproject commit 547506f904a2ba72d56c2c61c2c24adea91bdd25 diff --git a/qtxmlpatterns b/qtxmlpatterns index 47aed17d..e74c6fee 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 47aed17df4cde1a8bfb487ce6452b2b3634e2402 +Subproject commit e74c6fee102c228da060f3899610e4449bc1851a From 4a39410fae8ebc92e5ae02b301dcec842bdd15e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 9 Nov 2019 18:47:39 +0000 Subject: [PATCH 03/12] Update submodules on '5.12.6' in qt5 Change-Id: I3e49c6d83f5952869d0722674c83cf8db836ec8c Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 1930af19..f0b93f7a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1930af194c10d530f52d60be029ffe70892dedaa +Subproject commit f0b93f7a4b4281c5470280eb36b7c0ef5948a921 diff --git a/qtdeclarative b/qtdeclarative index 3230bc54..179c4b68 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3230bc549c16a075c72653f3dc468a2c36cdd86a +Subproject commit 179c4b689d1a7b9e9edb71ddf545dc237bca6704 diff --git a/qtdoc b/qtdoc index d29777f6..5c4b2eb4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d29777f66ca7861abeb15778243918af8d630c12 +Subproject commit 5c4b2eb41483bb6827f1e38d23eb11e2d60e8d6c diff --git a/qtimageformats b/qtimageformats index 598e1db3..dad286f1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 598e1db3a082d2bb473571c6ae3359e0c687c63b +Subproject commit dad286f15b75f36f37d4523ac86696e5133e58cb diff --git a/qtwayland b/qtwayland index 44fbe562..b28b121f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 44fbe562b544119a9d23a72c3d577d2946c72162 +Subproject commit b28b121f05caba25da9544b31059832e0a492eef diff --git a/qtwebchannel b/qtwebchannel index 253123ab..77af92de 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 253123ab5bd345053c4b1359c0fda9359a4e16b2 +Subproject commit 77af92deffa9aeb8a5f85f1e73c3f110d24f7f40 diff --git a/qtwebengine b/qtwebengine index f6ff5b17..636b32c7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f6ff5b17edfcd72c1536b46d8db1c9a30f70a6ba +Subproject commit 636b32c7f22c96e9562270219cedca52d5203737 From f3757051ddb65f933239b20a5bbea61510a6a9e8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 18 Nov 2019 12:56:26 +0200 Subject: [PATCH 04/12] Workaround broken local apt mirror for Ubuntu 16.04 Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: I736b0c9627399839d713ec637cab9403a368601f Reviewed-by: Jukka Jokiniva (cherry picked from commit b0fb9bbc72ab560f9f338693e92f84f79add82be) Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh index bfbb6a8e..909e4288 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh @@ -44,6 +44,9 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai sudo systemctl disable $service done +# Stop fetching the dep-11 metadata, since our mirrors do not handle them well +sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + installPackages+=(git) installPackages+=(p7zip-full) installPackages+=(expect) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index f2eb6e60..da6d3f5a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -44,6 +44,9 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai sudo systemctl disable $service done +# Stop fetching the dep-11 metadata, since our mirrors do not handle them well +sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + # aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) for i in $(seq 10); do echo attempting to remove aptdaemon From 47e7ec95abab600c5ec1cdd5ab148ca26350308b Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 13 Nov 2019 19:55:51 +0100 Subject: [PATCH 05/12] Workaround broken local apt mirror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d Reviewed-by: Tony Sarajärvi (cherry picked from commit ef7481b9cd514d0e3d73c5211193d1d100acfe74) Reviewed-by: Jukka Jokiniva Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index c85c989d..32995dd8 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -46,6 +46,10 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse From 2cd2ec8723c312e6437fc3caf6963c4f0591d29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 30 Oct 2019 09:30:46 +0000 Subject: [PATCH 06/12] Change local Ubuntu repo mirror in provisioning The old mirror host Qt company used to sync their local mirror from, stopped syncing from Ubuntu in October 2018. The mirror mechanism was changed so that in the future if addresses change, we don't have to touch the provisioning scripts as the address is more general. Also a duplicate entry was removed. Task-number: QTQAINFRA-3279 Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6 Reviewed-by: Heikki Halmet (cherry picked from commit 5b77e74a5e66be1b0b529ad872d2d80457ef4a84) Reviewed-by: Liang Qi (cherry picked from commit 439fbad1c9b80522435ecaceba96a394aaea5bdb) --- .../qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 16 ++++++++-------- .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 9 ++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index da6d3f5a..226b1ebf 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -165,14 +165,14 @@ installPackages+=(dkms) installPackages+=(python-pypdf2) sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial main restricted universe multiverse +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-updates main restricted universe multiverse +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-backports main restricted universe +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-security main restricted universe multiverse +deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial main restricted universe multiverse +deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-updates main restricted universe multiverse +deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-backports main restricted universe +deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ xenial-security main restricted universe multiverse EOC echo "Running update for apt" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 32995dd8..59df5a6b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -51,11 +51,10 @@ function set_internal_repo { sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-updates main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-backports main restricted universe - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-security main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse EOC } From fcf4ccab367faea7692ceecd02f802e62d8638a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 31 Oct 2019 13:32:28 +0000 Subject: [PATCH 07/12] Remove more of update notifiers Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911 Reviewed-by: Heikki Halmet (cherry picked from commit 2eab420e807d5fa4e39d4437879b9a35a2cdc88e) (cherry picked from commit 7285bbee64b24f7aef86fa109334448f1ddbf49b) --- coin/provisioning/common/linux/remove-update_notifier.sh | 2 +- .../02-remove-update_notifier.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-remove-update_notifier.sh diff --git a/coin/provisioning/common/linux/remove-update_notifier.sh b/coin/provisioning/common/linux/remove-update_notifier.sh index 152d7fa8..4ee32d61 100755 --- a/coin/provisioning/common/linux/remove-update_notifier.sh +++ b/coin/provisioning/common/linux/remove-update_notifier.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -sudo apt -q -y remove update-notifier update-manager +sudo apt -q -y remove update-notifier update-manager python3-distupgrade python3-update-manager ubuntu-release-upgrader-core update-manager-core diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-remove-update_notifier.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-remove-update_notifier.sh new file mode 100755 index 00000000..55c6ce79 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-remove-update_notifier.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove-update_notifier.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh" From 8ed03772f79b47675428ae4b9d24af79ef188bc3 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 11 Sep 2019 19:24:25 +0200 Subject: [PATCH 08/12] Refactor DownloadURL.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Auto-detects and verifies all kinds of hashes, not only SHA1. Hash verification is now an autonomous function. If the file is found at the destination, skip redownloading it if the hash is OK. Runs on POSIX sh, not requiring bash. Retain compatibility with previous version. Change-Id: I9930336030aa776f49dc460fe766f3e831700255 Reviewed-by: Tony Sarajärvi (cherry picked from commit c0fce7a3b37db53289ffd1e44c58f0bfc0601229) Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/DownloadURL.sh | 84 ++++++++++++++------ 1 file changed, 61 insertions(+), 23 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 996c99da..da6d772f 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -1,8 +1,8 @@ -#!/usr/bin/env bash +#!/bin/sh ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,31 +33,69 @@ ## ############################################################################# + # A helper script used for downloading a file from a URL or an alternative -# URL. Also the SHA1 is checked for the file. Target filename should also -# be given. -# -# If called directly from another script, it will exit the parent script -# as well, if not called in its own subshell with parentheses. +# URL. Also the SHA is checked for the file (SHA algorithm is autodetected +# based on the SHA length). Target filename should also be given. -set -ex +############################ BOILERPLATE ############################### +command -v sha1sum >/dev/null || alias sha1sum='shasum -a 1' +command -v sha256sum >/dev/null || alias sha256sum='shasum -a 256' +command -v sha384sum >/dev/null || alias sha384sum='shasum -a 384' +command -v sha512sum >/dev/null || alias sha512sum='shasum -a 512' +######################################################################## -function DownloadURL { - url=$1 - url_alt=$2 - expectedSha1=$3 - targetFile=$4 - echo "Downloading from primary URL '$url'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || { - echo "Failed to download '$url' multiple times" - echo "Downloading from alternative URL '$url_alt'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; } - } +VerifyHash () { + file=$1 + expectedHash=$2 - echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" > "$targetFile.sha1" - sha1sum --check "$targetFile.sha1" - rm -f "$targetFile.sha1" + if [ ! -f "$file" ] + then return 2 # file does not exist + fi + + + hashLength="$(echo "$expectedHash" | wc -c | sed 's/ *//g')" + # Use backticks because of bug with bash-3 (default on macOS), + # caused when there are unbalanced parentheses inside $() + # shellcheck disable=SC2006 + hash=`case "$hashLength" in + 41) sha1sum "$file" ;; + 65) sha256sum "$file" ;; + 97) sha384sum "$file" ;; + 129) sha512sum "$file" ;; + *) echo "FATAL! Unknown hash length: $hashLength" 1>&2 && exit 1 ;; + esac | cut -d ' ' -f 1` + + if [ ! "$expectedHash" = "$hash" ] + then + echo "FAIL! wrong file hash: $file $hash" 1>&2 + return 1 + fi + echo "OK verified integrity of: $file" } +# Check if file already exists and is good, otherwise download it +DownloadURL () { + url=$1 + url2=$2 + expectedHash=$3 + targetFile=$4 + + if VerifyHash "$targetFile" "$expectedHash" + then + echo "Skipping download, found and validated existing file: $targetFile" + else + echo "Downloading from primary URL: $url" + if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" + then + echo "FAIL! to download, trying alternative URL: $url2" 1>&2 + if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url2" + then + echo 'FAIL! to download even from alternative url' 1>&2 + return 1 + fi + fi + VerifyHash "$targetFile" "$expectedHash" + fi +} From 2217a2db89be1b74849585f6ad14a7212d35e0f2 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 20 Sep 2019 13:00:12 +0200 Subject: [PATCH 09/12] DownloadURL now works with either wget or curl The reason is that Ubuntu does not have curl at the very beginning of provisioning scripts, and also does not have the repositories configured in order to install it. Change-Id: Ia485c1672f894bc800f199b742d238b2945938e5 Reviewed-by: Heikki Halmet (cherry picked from commit 4e3a0f79fbe8bea7915b267e132ba1e0d4b67733) --- coin/provisioning/common/unix/DownloadURL.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index da6d772f..0579451f 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -46,6 +46,15 @@ command -v sha512sum >/dev/null || alias sha512sum='shasum -a 512' ######################################################################## +Download () { + url="$1" + targetFile="$2" + + command -v curl >/dev/null \ + && curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" \ + || wget --tries 5 -O "$targetFile" "$url" +} + VerifyHash () { file=$1 expectedHash=$2 @@ -87,10 +96,10 @@ DownloadURL () { echo "Skipping download, found and validated existing file: $targetFile" else echo "Downloading from primary URL: $url" - if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" + if ! Download "$url" "$targetFile" then echo "FAIL! to download, trying alternative URL: $url2" 1>&2 - if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url2" + if ! Download "$url" "$targetFile" then echo 'FAIL! to download even from alternative url' 1>&2 return 1 From 1f1832b5da305ccc5b863ebb6264af0766e91071 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 11 Oct 2019 11:30:38 +0200 Subject: [PATCH 10/12] Fix for DownloadURL to try alternative URL Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4 Reviewed-by: Heikki Halmet (cherry picked from commit 518e114dc71fb58d175a15afb282ac7f6dff6adc) --- coin/provisioning/common/unix/DownloadURL.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 0579451f..ac1fd971 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -99,9 +99,9 @@ DownloadURL () { if ! Download "$url" "$targetFile" then echo "FAIL! to download, trying alternative URL: $url2" 1>&2 - if ! Download "$url" "$targetFile" + if ! Download "$url2" "$targetFile" then - echo 'FAIL! to download even from alternative url' 1>&2 + echo 'FAIL! to download even from alternative URL' 1>&2 return 1 fi fi From 74195b12e6863821f133295288e955cfa3d932c9 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 12:09:12 +0100 Subject: [PATCH 11/12] DownloadURL last argument (targetFile) is now optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928 Reviewed-by: Tony Sarajärvi (cherry picked from commit 6cc2215b8ce6da477cf23f01ff5b88c0d12c2b88) Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/DownloadURL.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index ac1fd971..5bafc33d 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -89,7 +89,14 @@ DownloadURL () { url=$1 url2=$2 expectedHash=$3 - targetFile=$4 + # Optional argument $4: destination filename + if [ x"$4" = x ] + then + # defaults to the last component of $url + targetFile=$(echo $url | sed 's|^.*/||') + else + targetFile=$4 + fi if VerifyHash "$targetFile" "$expectedHash" then From 255e87ea249a503ee7136e34d9845a0d2c59447e Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 12:45:45 +0100 Subject: [PATCH 12/12] Docker installation: do not depend on external repositories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also updated the docker-compose binary to the latest one. Task-number: QTQAINFRA-3279 Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386 Reviewed-by: Tony Sarajärvi (cherry picked from commit a270bcdb6beb34d7590378899805391cfcfe7091) Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/docker.sh | 37 ++++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 16af0a0a..466cb7b8 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -35,18 +35,37 @@ set -ex -# Download and install the docker engine. -sudo apt-get install curl -y -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -sudo apt-get update -sudo apt-get install docker-ce -y + +. $(dirname "$0")/../../common/unix/DownloadURL.sh + + +localRepo=http://ci-files01-hki.intra.qt.io/input/docker +upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64 + +echo ' + f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb + ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb + 09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb +' \ + | xargs -n2 | while read sha f +do + DownloadURL $localRepo/$f $upstreamRepo/$f $sha +done + +sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb +rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb + sudo usermod -a -G docker $USER sudo docker info -# Download and install the docker-compose extension. -sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose -sudo chmod +x /usr/local/bin/docker-compose +# Download and install the docker-compose extension from https://github.com/docker/compose/releases +f=docker-compose-$(uname -s)-$(uname -m) +DownloadURL \ + $localRepo/$f \ + https://github.com/docker/compose/releases/download/1.24.1/$f \ + cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a +sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose +rm ./docker-compose* # Start testserver provisioning source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh"