diff options
-rw-r--r-- | bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst | 10 | ||||
-rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.18.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.16.bb) | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst index 4762d2637a..f357765b77 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst | |||
@@ -439,10 +439,12 @@ This fetcher supports the following parameters: | |||
439 | - *"rev":* The revision to use for the checkout. If :term:`SRCREV` is also set, | 439 | - *"rev":* The revision to use for the checkout. If :term:`SRCREV` is also set, |
440 | this parameter must match its value. | 440 | this parameter must match its value. |
441 | 441 | ||
442 | - *"tag":* Specifies a tag to use for the checkout. To correctly | 442 | - *"tag":* Specifies a tag to use when fetching. To correctly resolve |
443 | resolve tags, BitBake must access the network. For that reason, tags | 443 | tags, BitBake must access the network. If a ``rev`` parameter or |
444 | are often not used. As far as Git is concerned, the "tag" parameter | 444 | :term:`SRCREV` is also specified, network access is not necessary to resolve |
445 | behaves effectively the same as the "rev" parameter. | 445 | the tag and instead, it is verified that they both resolve to the same commit |
446 | SHA at unpack time. The ``tag`` parameter is optional, but strongly | ||
447 | recommended if the checked out revision is a tag. | ||
446 | 448 | ||
447 | - *"subpath":* Limits the checkout to a specific subpath of the tree. | 449 | - *"subpath":* Limits the checkout to a specific subpath of the tree. |
448 | By default, the whole tree is checked out. | 450 | By default, the whole tree is checked out. |
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 077472b8b3..cde1bf3390 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
@@ -1465,7 +1465,7 @@ class FetchLatestVersionTest(FetcherTest): | |||
1465 | # combination version pattern | 1465 | # combination version pattern |
1466 | ("sysprof", "git://git.yoctoproject.org/sysprof.git;protocol=https;branch=master", "cd44ee6644c3641507fb53b8a2a69137f2971219", "", "") | 1466 | ("sysprof", "git://git.yoctoproject.org/sysprof.git;protocol=https;branch=master", "cd44ee6644c3641507fb53b8a2a69137f2971219", "", "") |
1467 | : "1.2.0", | 1467 | : "1.2.0", |
1468 | ("u-boot-mkimage", "git://source.denx.de/u-boot/u-boot.git;branch=master;protocol=https", "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c", "", "") | 1468 | ("u-boot-mkimage", "git://git.yoctoproject.org/bbfetchtests-u-boot.git;branch=master;protocol=https", "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c", "", "") |
1469 | : "2014.01", | 1469 | : "2014.01", |
1470 | # version pattern "yyyymmdd" | 1470 | # version pattern "yyyymmdd" |
1471 | ("mobile-broadband-provider-info", "git://git.yoctoproject.org/mobile-broadband-provider-info.git;protocol=https;branch=master", "4ed19e11c2975105b71b956440acdb25d46a347d", "", "") | 1471 | ("mobile-broadband-provider-info", "git://git.yoctoproject.org/mobile-broadband-provider-info.git;protocol=https;branch=master", "4ed19e11c2975105b71b956440acdb25d46a347d", "", "") |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.16.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.18.bb index 38c81f2372..14c45be432 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.16.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.18.bb | |||
@@ -3,7 +3,7 @@ require xserver-xorg.inc | |||
3 | SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ | 3 | SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ |
4 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ | 4 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ |
5 | " | 5 | " |
6 | SRC_URI[sha256sum] = "b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970" | 6 | SRC_URI[sha256sum] = "c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352" |
7 | 7 | ||
8 | # These extensions are now integrated into the server, so declare the migration | 8 | # These extensions are now integrated into the server, so declare the migration |
9 | # path for in-place upgrades. | 9 | # path for in-place upgrades. |