diff options
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 32 | ||||
-rw-r--r-- | bitbake/lib/layerindexlib/__init__.py | 4 | ||||
-rw-r--r-- | bitbake/lib/layerindexlib/restapi.py | 4 | ||||
-rw-r--r-- | bitbake/lib/layerindexlib/tests/restapi.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/orm/fixtures/oe-core.xml | 12 | ||||
-rw-r--r-- | bitbake/lib/toaster/orm/fixtures/poky.xml | 24 | ||||
-rw-r--r-- | bitbake/lib/toaster/orm/management/commands/lsupdates.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/layerdetails.html | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/package_detail_base.html | 2 |
9 files changed, 42 insertions, 42 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 6978cbfaa0..c20f746f09 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
@@ -826,12 +826,12 @@ class FetcherNoNetworkTest(FetcherTest): | |||
826 | class FetcherNetworkTest(FetcherTest): | 826 | class FetcherNetworkTest(FetcherTest): |
827 | @skipIfNoNetwork() | 827 | @skipIfNoNetwork() |
828 | def test_fetch(self): | 828 | def test_fetch(self): |
829 | fetcher = bb.fetch.Fetch(["http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", "http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.1.tar.gz"], self.d) | 829 | fetcher = bb.fetch.Fetch(["https://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", "https://downloads.yoctoproject.org/releases/bitbake/bitbake-1.1.tar.gz"], self.d) |
830 | fetcher.download() | 830 | fetcher.download() |
831 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749) | 831 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749) |
832 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.1.tar.gz"), 57892) | 832 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.1.tar.gz"), 57892) |
833 | self.d.setVar("BB_NO_NETWORK", "1") | 833 | self.d.setVar("BB_NO_NETWORK", "1") |
834 | fetcher = bb.fetch.Fetch(["http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", "http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.1.tar.gz"], self.d) | 834 | fetcher = bb.fetch.Fetch(["https://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", "https://downloads.yoctoproject.org/releases/bitbake/bitbake-1.1.tar.gz"], self.d) |
835 | fetcher.download() | 835 | fetcher.download() |
836 | fetcher.unpack(self.unpackdir) | 836 | fetcher.unpack(self.unpackdir) |
837 | self.assertEqual(len(os.listdir(self.unpackdir + "/bitbake-1.0/")), 9) | 837 | self.assertEqual(len(os.listdir(self.unpackdir + "/bitbake-1.0/")), 9) |
@@ -839,21 +839,21 @@ class FetcherNetworkTest(FetcherTest): | |||
839 | 839 | ||
840 | @skipIfNoNetwork() | 840 | @skipIfNoNetwork() |
841 | def test_fetch_mirror(self): | 841 | def test_fetch_mirror(self): |
842 | self.d.setVar("MIRRORS", "http://.*/.* http://downloads.yoctoproject.org/releases/bitbake") | 842 | self.d.setVar("MIRRORS", "http://.*/.* https://downloads.yoctoproject.org/releases/bitbake") |
843 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) | 843 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) |
844 | fetcher.download() | 844 | fetcher.download() |
845 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749) | 845 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749) |
846 | 846 | ||
847 | @skipIfNoNetwork() | 847 | @skipIfNoNetwork() |
848 | def test_fetch_mirror_of_mirror(self): | 848 | def test_fetch_mirror_of_mirror(self): |
849 | self.d.setVar("MIRRORS", "http://.*/.* http://invalid2.yoctoproject.org/ \n http://invalid2.yoctoproject.org/.* http://downloads.yoctoproject.org/releases/bitbake") | 849 | self.d.setVar("MIRRORS", "http://.*/.* http://invalid2.yoctoproject.org/ \n http://invalid2.yoctoproject.org/.* https://downloads.yoctoproject.org/releases/bitbake") |
850 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) | 850 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) |
851 | fetcher.download() | 851 | fetcher.download() |
852 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749) | 852 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749) |
853 | 853 | ||
854 | @skipIfNoNetwork() | 854 | @skipIfNoNetwork() |
855 | def test_fetch_file_mirror_of_mirror(self): | 855 | def test_fetch_file_mirror_of_mirror(self): |
856 | self.d.setVar("MIRRORS", "http://.*/.* file:///some1where/ \n file:///some1where/.* file://some2where/ \n file://some2where/.* http://downloads.yoctoproject.org/releases/bitbake") | 856 | self.d.setVar("MIRRORS", "http://.*/.* file:///some1where/ \n file:///some1where/.* file://some2where/ \n file://some2where/.* https://downloads.yoctoproject.org/releases/bitbake") |
857 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) | 857 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) |
858 | os.mkdir(self.dldir + "/some2where") | 858 | os.mkdir(self.dldir + "/some2where") |
859 | fetcher.download() | 859 | fetcher.download() |
@@ -861,20 +861,20 @@ class FetcherNetworkTest(FetcherTest): | |||
861 | 861 | ||
862 | @skipIfNoNetwork() | 862 | @skipIfNoNetwork() |
863 | def test_fetch_premirror(self): | 863 | def test_fetch_premirror(self): |
864 | self.d.setVar("PREMIRRORS", "http://.*/.* http://downloads.yoctoproject.org/releases/bitbake") | 864 | self.d.setVar("PREMIRRORS", "http://.*/.* https://downloads.yoctoproject.org/releases/bitbake") |
865 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) | 865 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) |
866 | fetcher.download() | 866 | fetcher.download() |
867 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749) | 867 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749) |
868 | 868 | ||
869 | @skipIfNoNetwork() | 869 | @skipIfNoNetwork() |
870 | def test_fetch_specify_downloadfilename(self): | 870 | def test_fetch_specify_downloadfilename(self): |
871 | fetcher = bb.fetch.Fetch(["http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz;downloadfilename=bitbake-v1.0.0.tar.gz"], self.d) | 871 | fetcher = bb.fetch.Fetch(["https://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz;downloadfilename=bitbake-v1.0.0.tar.gz"], self.d) |
872 | fetcher.download() | 872 | fetcher.download() |
873 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-v1.0.0.tar.gz"), 57749) | 873 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-v1.0.0.tar.gz"), 57749) |
874 | 874 | ||
875 | @skipIfNoNetwork() | 875 | @skipIfNoNetwork() |
876 | def test_fetch_premirror_specify_downloadfilename_regex_uri(self): | 876 | def test_fetch_premirror_specify_downloadfilename_regex_uri(self): |
877 | self.d.setVar("PREMIRRORS", "http://.*/.* http://downloads.yoctoproject.org/releases/bitbake/") | 877 | self.d.setVar("PREMIRRORS", "http://.*/.* https://downloads.yoctoproject.org/releases/bitbake/") |
878 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz;downloadfilename=bitbake-v1.0.0.tar.gz"], self.d) | 878 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz;downloadfilename=bitbake-v1.0.0.tar.gz"], self.d) |
879 | fetcher.download() | 879 | fetcher.download() |
880 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-v1.0.0.tar.gz"), 57749) | 880 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-v1.0.0.tar.gz"), 57749) |
@@ -882,7 +882,7 @@ class FetcherNetworkTest(FetcherTest): | |||
882 | @skipIfNoNetwork() | 882 | @skipIfNoNetwork() |
883 | # BZ13039 | 883 | # BZ13039 |
884 | def test_fetch_premirror_specify_downloadfilename_specific_uri(self): | 884 | def test_fetch_premirror_specify_downloadfilename_specific_uri(self): |
885 | self.d.setVar("PREMIRRORS", "http://invalid.yoctoproject.org/releases/bitbake http://downloads.yoctoproject.org/releases/bitbake") | 885 | self.d.setVar("PREMIRRORS", "http://invalid.yoctoproject.org/releases/bitbake https://downloads.yoctoproject.org/releases/bitbake") |
886 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz;downloadfilename=bitbake-v1.0.0.tar.gz"], self.d) | 886 | fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz;downloadfilename=bitbake-v1.0.0.tar.gz"], self.d) |
887 | fetcher.download() | 887 | fetcher.download() |
888 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-v1.0.0.tar.gz"), 57749) | 888 | self.assertEqual(os.path.getsize(self.dldir + "/bitbake-v1.0.0.tar.gz"), 57749) |
@@ -1291,10 +1291,10 @@ class FetchLatestVersionTest(FetcherTest): | |||
1291 | # | 1291 | # |
1292 | # packages with versions only in current directory | 1292 | # packages with versions only in current directory |
1293 | # | 1293 | # |
1294 | # http://downloads.yoctoproject.org/releases/eglibc/eglibc-2.18-svnr23787.tar.bz2 | 1294 | # https://downloads.yoctoproject.org/releases/eglibc/eglibc-2.18-svnr23787.tar.bz2 |
1295 | ("eglic", "/releases/eglibc/eglibc-2.18-svnr23787.tar.bz2", "", "") | 1295 | ("eglic", "/releases/eglibc/eglibc-2.18-svnr23787.tar.bz2", "", "") |
1296 | : "2.19", | 1296 | : "2.19", |
1297 | # http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-20120814.tar.bz2 | 1297 | # https://downloads.yoctoproject.org/releases/gnu-config/gnu-config-20120814.tar.bz2 |
1298 | ("gnu-config", "/releases/gnu-config/gnu-config-20120814.tar.bz2", "", "") | 1298 | ("gnu-config", "/releases/gnu-config/gnu-config-20120814.tar.bz2", "", "") |
1299 | : "20120814", | 1299 | : "20120814", |
1300 | # | 1300 | # |
@@ -1357,13 +1357,13 @@ class FetchLatestVersionTest(FetcherTest): | |||
1357 | 1357 | ||
1358 | 1358 | ||
1359 | class FetchCheckStatusTest(FetcherTest): | 1359 | class FetchCheckStatusTest(FetcherTest): |
1360 | test_wget_uris = ["http://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz", | 1360 | test_wget_uris = ["https://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz", |
1361 | "http://downloads.yoctoproject.org/releases/sato/sato-engine-0.2.tar.gz", | 1361 | "https://downloads.yoctoproject.org/releases/sato/sato-engine-0.2.tar.gz", |
1362 | "http://downloads.yoctoproject.org/releases/sato/sato-engine-0.3.tar.gz", | 1362 | "https://downloads.yoctoproject.org/releases/sato/sato-engine-0.3.tar.gz", |
1363 | "https://yoctoproject.org/", | 1363 | "https://yoctoproject.org/", |
1364 | "https://docs.yoctoproject.org", | 1364 | "https://docs.yoctoproject.org", |
1365 | "http://downloads.yoctoproject.org/releases/opkg/opkg-0.1.7.tar.gz", | 1365 | "https://downloads.yoctoproject.org/releases/opkg/opkg-0.1.7.tar.gz", |
1366 | "http://downloads.yoctoproject.org/releases/opkg/opkg-0.3.0.tar.gz", | 1366 | "https://downloads.yoctoproject.org/releases/opkg/opkg-0.3.0.tar.gz", |
1367 | "ftp://sourceware.org/pub/libffi/libffi-1.20.tar.gz", | 1367 | "ftp://sourceware.org/pub/libffi/libffi-1.20.tar.gz", |
1368 | "http://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz", | 1368 | "http://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz", |
1369 | "https://ftp.gnu.org/gnu/chess/gnuchess-5.08.tar.gz", | 1369 | "https://ftp.gnu.org/gnu/chess/gnuchess-5.08.tar.gz", |
diff --git a/bitbake/lib/layerindexlib/__init__.py b/bitbake/lib/layerindexlib/__init__.py index 3159bf2f66..08063c571e 100644 --- a/bitbake/lib/layerindexlib/__init__.py +++ b/bitbake/lib/layerindexlib/__init__.py | |||
@@ -198,7 +198,7 @@ The format of the indexURI: | |||
198 | 198 | ||
199 | For example: | 199 | For example: |
200 | 200 | ||
201 | http://layers.openembedded.org/layerindex/api/;branch=master;desc=OpenEmbedded%20Layer%20Index | 201 | https://layers.openembedded.org/layerindex/api/;branch=master;desc=OpenEmbedded%20Layer%20Index |
202 | cooker:// | 202 | cooker:// |
203 | ''' | 203 | ''' |
204 | if reload: | 204 | if reload: |
@@ -576,7 +576,7 @@ This function is used to implement debugging and provide the user info. | |||
576 | # index['config'] - configuration data for this index | 576 | # index['config'] - configuration data for this index |
577 | # index['branches'] - dictionary of Branch objects, by id number | 577 | # index['branches'] - dictionary of Branch objects, by id number |
578 | # index['layerItems'] - dictionary of layerItem objects, by id number | 578 | # index['layerItems'] - dictionary of layerItem objects, by id number |
579 | # ...etc... (See: http://layers.openembedded.org/layerindex/api/) | 579 | # ...etc... (See: https://layers.openembedded.org/layerindex/api/) |
580 | # | 580 | # |
581 | # The class needs to manage the 'index' entries and allow easily adding | 581 | # The class needs to manage the 'index' entries and allow easily adding |
582 | # of new items, as well as simply loading of the items. | 582 | # of new items, as well as simply loading of the items. |
diff --git a/bitbake/lib/layerindexlib/restapi.py b/bitbake/lib/layerindexlib/restapi.py index 26a1c9674e..81d99b02ea 100644 --- a/bitbake/lib/layerindexlib/restapi.py +++ b/bitbake/lib/layerindexlib/restapi.py | |||
@@ -31,7 +31,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): | |||
31 | The return value is a LayerIndexObj. | 31 | The return value is a LayerIndexObj. |
32 | 32 | ||
33 | url is the url to the rest api of the layer index, such as: | 33 | url is the url to the rest api of the layer index, such as: |
34 | http://layers.openembedded.org/layerindex/api/ | 34 | https://layers.openembedded.org/layerindex/api/ |
35 | 35 | ||
36 | Or a local file... | 36 | Or a local file... |
37 | """ | 37 | """ |
@@ -138,7 +138,7 @@ class RestApiPlugin(layerindexlib.plugin.IndexPlugin): | |||
138 | The return value is a LayerIndexObj. | 138 | The return value is a LayerIndexObj. |
139 | 139 | ||
140 | ud is the parsed url to the rest api of the layer index, such as: | 140 | ud is the parsed url to the rest api of the layer index, such as: |
141 | http://layers.openembedded.org/layerindex/api/ | 141 | https://layers.openembedded.org/layerindex/api/ |
142 | """ | 142 | """ |
143 | 143 | ||
144 | def _get_json_response(apiurl=None, username=None, password=None, retry=True): | 144 | def _get_json_response(apiurl=None, username=None, password=None, retry=True): |
diff --git a/bitbake/lib/layerindexlib/tests/restapi.py b/bitbake/lib/layerindexlib/tests/restapi.py index 33b5c1c4c8..71f0ae8a9d 100644 --- a/bitbake/lib/layerindexlib/tests/restapi.py +++ b/bitbake/lib/layerindexlib/tests/restapi.py | |||
@@ -22,7 +22,7 @@ class LayerIndexWebRestApiTest(LayersTest): | |||
22 | self.assertFalse(os.environ.get("BB_SKIP_NETTESTS") == "yes", msg="BB_SKIP_NETTESTS set, but we tried to test anyway") | 22 | self.assertFalse(os.environ.get("BB_SKIP_NETTESTS") == "yes", msg="BB_SKIP_NETTESTS set, but we tried to test anyway") |
23 | LayersTest.setUp(self) | 23 | LayersTest.setUp(self) |
24 | self.layerindex = layerindexlib.LayerIndex(self.d) | 24 | self.layerindex = layerindexlib.LayerIndex(self.d) |
25 | self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=sumo', load=['layerDependencies']) | 25 | self.layerindex.load_layerindex('https://layers.openembedded.org/layerindex/api/;branch=sumo', load=['layerDependencies']) |
26 | 26 | ||
27 | @skipIfNoNetwork() | 27 | @skipIfNoNetwork() |
28 | def test_layerindex_is_empty(self): | 28 | def test_layerindex_is_empty(self): |
diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml index 026d94869a..b01a337012 100644 --- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml +++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml | |||
@@ -34,7 +34,7 @@ | |||
34 | <field type="CharField" name="description">Openembedded Dunfell</field> | 34 | <field type="CharField" name="description">Openembedded Dunfell</field> |
35 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> | 35 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> |
36 | <field type="CharField" name="branch_name">dunfell</field> | 36 | <field type="CharField" name="branch_name">dunfell</field> |
37 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=dunfell\">OpenEmbedded Dunfell</a> branch.</field> | 37 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=dunfell\">OpenEmbedded Dunfell</a> branch.</field> |
38 | </object> | 38 | </object> |
39 | <object model="orm.release" pk="2"> | 39 | <object model="orm.release" pk="2"> |
40 | <field type="CharField" name="name">local</field> | 40 | <field type="CharField" name="name">local</field> |
@@ -48,14 +48,14 @@ | |||
48 | <field type="CharField" name="description">OpenEmbedded core master</field> | 48 | <field type="CharField" name="description">OpenEmbedded core master</field> |
49 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field> | 49 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field> |
50 | <field type="CharField" name="branch_name">master</field> | 50 | <field type="CharField" name="branch_name">master</field> |
51 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch.</field> | 51 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch.</field> |
52 | </object> | 52 | </object> |
53 | <object model="orm.release" pk="4"> | 53 | <object model="orm.release" pk="4"> |
54 | <field type="CharField" name="name">gatesgarth</field> | 54 | <field type="CharField" name="name">gatesgarth</field> |
55 | <field type="CharField" name="description">Openembedded Gatesgarth</field> | 55 | <field type="CharField" name="description">Openembedded Gatesgarth</field> |
56 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> | 56 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> |
57 | <field type="CharField" name="branch_name">gatesgarth</field> | 57 | <field type="CharField" name="branch_name">gatesgarth</field> |
58 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=gatesgarth\">OpenEmbedded Gatesgarth</a> branch.</field> | 58 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=gatesgarth\">OpenEmbedded Gatesgarth</a> branch.</field> |
59 | </object> | 59 | </object> |
60 | 60 | ||
61 | <!-- Default layers for each release --> | 61 | <!-- Default layers for each release --> |
@@ -81,9 +81,9 @@ | |||
81 | <object model="orm.layer" pk="1"> | 81 | <object model="orm.layer" pk="1"> |
82 | <field type="CharField" name="name">openembedded-core</field> | 82 | <field type="CharField" name="name">openembedded-core</field> |
83 | <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field> | 83 | <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field> |
84 | <field type="CharField" name="vcs_web_url">http://cgit.openembedded.org/openembedded-core</field> | 84 | <field type="CharField" name="vcs_web_url">https://cgit.openembedded.org/openembedded-core</field> |
85 | <field type="CharField" name="vcs_web_tree_base_url">http://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%</field> | 85 | <field type="CharField" name="vcs_web_tree_base_url">https://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%</field> |
86 | <field type="CharField" name="vcs_web_file_base_url">http://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%</field> | 86 | <field type="CharField" name="vcs_web_file_base_url">https://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%</field> |
87 | </object> | 87 | </object> |
88 | <object model="orm.layer_version" pk="1"> | 88 | <object model="orm.layer_version" pk="1"> |
89 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> | 89 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> |
diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml index a468a54c49..363789d624 100644 --- a/bitbake/lib/toaster/orm/fixtures/poky.xml +++ b/bitbake/lib/toaster/orm/fixtures/poky.xml | |||
@@ -39,7 +39,7 @@ | |||
39 | <field type="CharField" name="description">Yocto Project 3.1 "Dunfell"</field> | 39 | <field type="CharField" name="description">Yocto Project 3.1 "Dunfell"</field> |
40 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> | 40 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> |
41 | <field type="CharField" name="branch_name">dunfell</field> | 41 | <field type="CharField" name="branch_name">dunfell</field> |
42 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=dunfell">Yocto Project Dunfell branch</a>.</field> | 42 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=dunfell">Yocto Project Dunfell branch</a>.</field> |
43 | </object> | 43 | </object> |
44 | <object model="orm.release" pk="2"> | 44 | <object model="orm.release" pk="2"> |
45 | <field type="CharField" name="name">local</field> | 45 | <field type="CharField" name="name">local</field> |
@@ -53,14 +53,14 @@ | |||
53 | <field type="CharField" name="description">Yocto Project master</field> | 53 | <field type="CharField" name="description">Yocto Project master</field> |
54 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field> | 54 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field> |
55 | <field type="CharField" name="branch_name">master</field> | 55 | <field type="CharField" name="branch_name">master</field> |
56 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/">Yocto Project Master branch</a>.</field> | 56 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/">Yocto Project Master branch</a>.</field> |
57 | </object> | 57 | </object> |
58 | <object model="orm.release" pk="4"> | 58 | <object model="orm.release" pk="4"> |
59 | <field type="CharField" name="name">gatesgarth</field> | 59 | <field type="CharField" name="name">gatesgarth</field> |
60 | <field type="CharField" name="description">Yocto Project 3.2 "Gatesgarth"</field> | 60 | <field type="CharField" name="description">Yocto Project 3.2 "Gatesgarth"</field> |
61 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> | 61 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> |
62 | <field type="CharField" name="branch_name">gatesgarth</field> | 62 | <field type="CharField" name="branch_name">gatesgarth</field> |
63 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=gatesgarth">Yocto Project Gatesgarth branch</a>.</field> | 63 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=gatesgarth">Yocto Project Gatesgarth branch</a>.</field> |
64 | </object> | 64 | </object> |
65 | 65 | ||
66 | <!-- Default project layers for each release --> | 66 | <!-- Default project layers for each release --> |
@@ -122,9 +122,9 @@ | |||
122 | <field type="CharField" name="name">openembedded-core</field> | 122 | <field type="CharField" name="name">openembedded-core</field> |
123 | <field type="CharField" name="layer_index_url"></field> | 123 | <field type="CharField" name="layer_index_url"></field> |
124 | <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> | 124 | <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> |
125 | <field type="CharField" name="vcs_web_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky</field> | 125 | <field type="CharField" name="vcs_web_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky</field> |
126 | <field type="CharField" name="vcs_web_tree_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 126 | <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
127 | <field type="CharField" name="vcs_web_file_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 127 | <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
128 | </object> | 128 | </object> |
129 | <object model="orm.layer_version" pk="1"> | 129 | <object model="orm.layer_version" pk="1"> |
130 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> | 130 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> |
@@ -160,9 +160,9 @@ | |||
160 | <field type="CharField" name="name">meta-poky</field> | 160 | <field type="CharField" name="name">meta-poky</field> |
161 | <field type="CharField" name="layer_index_url"></field> | 161 | <field type="CharField" name="layer_index_url"></field> |
162 | <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> | 162 | <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> |
163 | <field type="CharField" name="vcs_web_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky</field> | 163 | <field type="CharField" name="vcs_web_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky</field> |
164 | <field type="CharField" name="vcs_web_tree_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 164 | <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
165 | <field type="CharField" name="vcs_web_file_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 165 | <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
166 | </object> | 166 | </object> |
167 | <object model="orm.layer_version" pk="5"> | 167 | <object model="orm.layer_version" pk="5"> |
168 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> | 168 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> |
@@ -198,9 +198,9 @@ | |||
198 | <field type="CharField" name="name">meta-yocto-bsp</field> | 198 | <field type="CharField" name="name">meta-yocto-bsp</field> |
199 | <field type="CharField" name="layer_index_url"></field> | 199 | <field type="CharField" name="layer_index_url"></field> |
200 | <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> | 200 | <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> |
201 | <field type="CharField" name="vcs_web_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky</field> | 201 | <field type="CharField" name="vcs_web_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky</field> |
202 | <field type="CharField" name="vcs_web_tree_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 202 | <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
203 | <field type="CharField" name="vcs_web_file_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 203 | <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
204 | </object> | 204 | </object> |
205 | <object model="orm.layer_version" pk="9"> | 205 | <object model="orm.layer_version" pk="9"> |
206 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> | 206 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> |
diff --git a/bitbake/lib/toaster/orm/management/commands/lsupdates.py b/bitbake/lib/toaster/orm/management/commands/lsupdates.py index 2fbd7be3d2..3b950e6e15 100644 --- a/bitbake/lib/toaster/orm/management/commands/lsupdates.py +++ b/bitbake/lib/toaster/orm/management/commands/lsupdates.py | |||
@@ -21,7 +21,7 @@ import threading | |||
21 | import time | 21 | import time |
22 | logger = logging.getLogger("toaster") | 22 | logger = logging.getLogger("toaster") |
23 | 23 | ||
24 | DEFAULT_LAYERINDEX_SERVER = "http://layers.openembedded.org/layerindex/api/" | 24 | DEFAULT_LAYERINDEX_SERVER = "https://layers.openembedded.org/layerindex/api/" |
25 | 25 | ||
26 | # Add path to bitbake modules for layerindexlib | 26 | # Add path to bitbake modules for layerindexlib |
27 | # lib/toaster/orm/management/commands/lsupdates.py (abspath) | 27 | # lib/toaster/orm/management/commands/lsupdates.py (abspath) |
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 1e26e31c8b..923ca3bfe4 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html | |||
@@ -355,7 +355,7 @@ | |||
355 | {% if layerversion.layer_source == layer_source.TYPE_LAYERINDEX %} | 355 | {% if layerversion.layer_source == layer_source.TYPE_LAYERINDEX %} |
356 | <dt>Layer index</dt> | 356 | <dt>Layer index</dt> |
357 | <dd> | 357 | <dd> |
358 | <a href="http://layers.openembedded.org/layerindex/branch/{{layerversion.release.name}}/layer/{{layerversion.layer.name}}">Layer index {{layerversion.layer.name}}</a> | 358 | <a href="https://layers.openembedded.org/layerindex/branch/{{layerversion.release.name}}/layer/{{layerversion.layer.name}}">Layer index {{layerversion.layer.name}}</a> |
359 | </dd> | 359 | </dd> |
360 | {% endif %} | 360 | {% endif %} |
361 | </dl> | 361 | </dl> |
diff --git a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html index 66f8e7f069..a4fcd2aa42 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html +++ b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html | |||
@@ -127,7 +127,7 @@ | |||
127 | {% comment %} | 127 | {% comment %} |
128 | # Removed per team meeting of 1/29/2014 until | 128 | # Removed per team meeting of 1/29/2014 until |
129 | # decision on index search algorithm | 129 | # decision on index search algorithm |
130 | <a href="http://layers.openembedded.org" target="_blank"> | 130 | <a href="https://layers.openembedded.org" target="_blank"> |
131 | <i class="glyphicon glyphicon-share get-info"></i> | 131 | <i class="glyphicon glyphicon-share get-info"></i> |
132 | </a> | 132 | </a> |
133 | {% endcomment %} | 133 | {% endcomment %} |