[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/, general-concepts/manifest/
commit: dbc3fda4b0ca7be794e0aeea1ca3c775313cf86f Author: Sam James gentoo org> AuthorDate: Thu Oct 26 23:35:47 2023 + Commit: Sam James gentoo org> CommitDate: Sun Oct 29 20:22:51 2023 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=dbc3fda4 general-concepts: discuss concerns with regenerating existing distfile entries In a discussion with Eli Schwartz, I realised the devmanual doesn't currently explicitly state best practice. In general-concepts/mirrors, link to the new Manifest regeneration section and shift some text around into that new section too (and adjust the text slightly while at it). Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/devmanual/pull/318 Signed-off-by: Sam James gentoo.org> general-concepts/manifest/text.xml | 36 general-concepts/mirrors/text.xml | 9 ++--- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/general-concepts/manifest/text.xml b/general-concepts/manifest/text.xml index 19ea5c3..bee1651 100644 --- a/general-concepts/manifest/text.xml +++ b/general-concepts/manifest/text.xml @@ -39,6 +39,42 @@ action from developers. + + +Updating Manifest files + + + +Updating existing entries within a manifest must be done with care. Upstream +changing the tarball in-place without a new filename could be an innocent +respin of the tarball, or it could indicate either the previous or the new +tarball is malicious. + + + +Developers should diff the old and new versions of the distfile, comparing +the two, and note the differences in the commit message updating the +Manifest to indicate both what happened (if any context is known) and +also what differences between the two distfiles have been ascertained. + + + +Please note that if upstream made any changes affecting the built +package or it had substantial differences, you need to also bump the ebuild's +revision. Finally, remember to remove the ebuilds that are associated with the +old distfile, or regenerate their checksums in Manifest, if there +are any. This is necessary because these ebuilds will cause checksum +mismatch errors as the checksum recorded in the manifest file no +longer matches the computed checksum of the fetched distfile. + + + +Special care is also required with regard to + +mirrors. + + + diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 6b4993e..f1ce1bb 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -68,13 +68,8 @@ fetch and start distributing the new version. -Please note that if upstream made any changes affecting the built -package, you need to also bump the ebuild's revision. Finally, -remember to remove the ebuilds that are associated with the old -distfile, or regenerate their checksums in Manifest, if there -are any. This is necessary because these ebuilds will cause checksum -mismatch errors as the checksum recorded in the Manifest file no -longer matches the computed checksum of the fetched distfile. +Updating an existing distfile is generally cause for concern and must be done +with care, see .
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: a7574212eac4741e41f07bf443273d08feff50c6 Author: Joonas Niilola gentoo org> AuthorDate: Tue Sep 28 12:40:45 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Oct 10 10:18:29 2021 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a7574212 general-concepts/mirrors: update info about mirror://gentoo - add a clearer note about chmod'ing your distfile, - make it very clear that d.g.o:/space/distfiles-local is not accessible anymore, and show the current way of hosting your own distfiles, - wrap the document source at 80 chars. Signed-off-by: Joonas Niilola gentoo.org> Closes: https://github.com/gentoo/devmanual/pull/253 general-concepts/mirrors/text.xml | 36 +--- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 61b8618..c39c385 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -42,8 +42,8 @@ This should not be used in new ebuilds. There is also RESTRICT="fetch", which prevents Portage from trying to fetch anything manually. The -pkg_nofetch function will be called if any SRC_URI components cannot be -found. This should only be used if a license requires it. +pkg_nofetch function will be called if any SRC_URI components +cannot be found. This should only be used if a license requires it. @@ -100,15 +100,16 @@ devspace. -Previous policy was to use mirror://gentoo directly, but this is now deprecated, as that -wouldn't allow to have long-term availability and traceability of the source files, which might be a -requirement of the license. +Previous policy was to use mirror://gentoo directly, but this is now +prohibited, as that wouldn't allow to have long-term availability and +traceability of the source files, which might be a requirement of the license. -When you upload the file to dev.gentoo.org:~/public_html, you must ensure that it, and its -parent directories, are world-readable. An example SRC_URI referencing -a distfile mirrored this way is as follows: +When you upload the distfile to dev.gentoo.org:~/public_html, ensure that +your file and its parent directories have the correct permissions, so they're +accessible. An example SRC_URI referencing a distfile mirrored this way +is as follows: @@ -119,25 +120,14 @@ SRC_URI="https://dev.gentoo.org/~myname/distfiles/${P}.tar.gz"; where myname refers to the username of the developer. - - - - - -Gentoo Mirrors - - -To manually upload a file to mirror://gentoo, scp it to -dev.gentoo.org:/space/distfiles-local. The file should appear -on the mirrors within four hours (note that this is less -frequent than ). - If the upstream download location for a package uses a non-standard TCP port -(anything other than 21, 80 or 443), you must manually mirror the files. Not -doing so can cause all kinds of problems with strict firewalls. +(anything other than 21, 80 or 443), you must manually mirror the files. +Not doing so can cause all kinds of problems with strict firewalls. + +
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 9d410cf4d056d17e050f32d895aeae5a129c7062 Author: Thomas Deutschmann whissi de> AuthorDate: Mon Oct 7 13:30:54 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Dec 18 21:55:30 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9d410cf4 general-concepts/mirrors: Clearify that any component in SRC_URI gets mirrored Clearify that any component in SRC_URI gets mirrored, even those already hosted in other Gentoo locations, for example files uploaded to developer's space at dev.gentoo.org. Closes: https://github.com/gentoo/devmanual/pull/111 Signed-off-by: Thomas Deutschmann whissi.de> Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index c6570b0..ac6edfb 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -9,8 +9,9 @@ Packages will automatically have their SRC_URI components mirrored onto -Gentoo mirrors. When fetching, Portage checks Gentoo mirrors first before -trying the original upstream location. +Gentoo mirrors, including components hosted in other Gentoo locations like developer's +space at dev.gentoo.org, see below. When fetching, package manager checks +Gentoo mirrors first before trying the original upstream location.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 245e64720a5eb089d29d91487eb5a9fe84c05af9 Author: Göktürk Yüksek gentoo org> AuthorDate: Wed Dec 18 21:54:30 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Dec 18 21:55:55 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=245e6472 general-concepts/mirrors: post-merge enhancements Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index ac6edfb..9319012 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -9,8 +9,9 @@ Packages will automatically have their SRC_URI components mirrored onto -Gentoo mirrors, including components hosted in other Gentoo locations like developer's -space at dev.gentoo.org, see below. When fetching, package manager checks +Gentoo mirrors, including those hosted on the official Gentoo +Infrastructure (i.e. developer space at dev.gentoo.org). When +fetching, package manager checks Gentoo mirrors first before trying the original upstream location.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/, /, general-concepts/emerge-and-ebuild/, ...
commit: 19719233d088e05f43ee783ec989c4db24218b3f Author: Ulrich Müller gentoo org> AuthorDate: Tue Dec 10 07:21:58 2019 + Commit: Ulrich Müller gentoo org> CommitDate: Tue Dec 10 08:46:36 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=19719233 devbook.xsl: Change figure caption into an attribute. As discussed in #gentoo-qa. This also follows the description in the devbook guide. Change all uses in the document. Signed-off-by: Ulrich Müller gentoo.org> devbook.xsl | 4 +++- general-concepts/autotools/text.xml | 6 +++--- general-concepts/emerge-and-ebuild/text.xml | 3 +-- general-concepts/git-to-rsync/text.xml | 5 ++--- general-concepts/mirrors/text.xml | 5 ++--- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/devbook.xsl b/devbook.xsl index b3a14cc..cadd975 100644 --- a/devbook.xsl +++ b/devbook.xsl @@ -188,7 +188,9 @@ - + + + diff --git a/general-concepts/autotools/text.xml b/general-concepts/autotools/text.xml index 8be8d34..fc21a7c 100644 --- a/general-concepts/autotools/text.xml +++ b/general-concepts/autotools/text.xml @@ -42,9 +42,9 @@ together with a few relatively simple upstream-supplied input files, are used to create the build system for a package. - -A basic overview of how the main autotools components fit together. - + In a simple setup: diff --git a/general-concepts/emerge-and-ebuild/text.xml b/general-concepts/emerge-and-ebuild/text.xml index 73c97e9..d96d5b0 100644 --- a/general-concepts/emerge-and-ebuild/text.xml +++ b/general-concepts/emerge-and-ebuild/text.xml @@ -5,8 +5,7 @@ - - + The emerge program is a high level wrapper for ebuild.sh that handles diff --git a/general-concepts/git-to-rsync/text.xml b/general-concepts/git-to-rsync/text.xml index b7a2c8e..354c555 100644 --- a/general-concepts/git-to-rsync/text.xml +++ b/general-concepts/git-to-rsync/text.xml @@ -29,9 +29,8 @@ - - Diagram showing Git to RSYNC Propagation - + The emerge-websync snapshot is made daily from the staging box. diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 37e05e3..c6570b0 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -142,9 +142,8 @@ doing so can cause all kinds of problems with strict firewalls. Mirroring Process - -Diagram showing the mirroring process. - +
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: f706f2b0eed3e03f6e4d74f8416373e12697ce50 Author: Ulrich Müller gentoo org> AuthorDate: Thu Nov 21 14:34:01 2019 + Commit: Ulrich Müller gentoo org> CommitDate: Tue Nov 26 13:39:49 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=f706f2b0 general-concepts/mirrors: Clarify that files must be distributable. It makes no sense to require that files are distributable only by the Gentoo Foundation; they should be freely distributable by anyone. Closes: https://bugs.gentoo.org/700888 Signed-off-by: Ulrich Müller gentoo.org> general-concepts/mirrors/text.xml | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 703b705..37e05e3 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -88,11 +88,13 @@ Infrastructure project's Distfile Mirroring System page. Suitable Download Hosts -If you have to host a source file (patch or tarball) yourself, as long as it is suitable to be -distributed by Gentoo Foundation (by license and legality), you're suggested to use your developer's -space at dev.gentoo.org. Since external overlays may depend on your patches/tarballs, using the -dev space at dev.gentoo.org keeps the distfiles at a stable and reliable infrastructure. If you -retire, other developers can take over your distfiles and place them into their own devspace. +If you have to host a source file (patch or tarball) yourself, as long as it +can be freely distributed (by license and legality), you're suggested to use +your developer's space at dev.gentoo.org. Since external overlays may +depend on your patches/tarballs, using the dev space at dev.gentoo.org +keeps the distfiles at a stable and reliable infrastructure. If you retire, +other developers can take over your distfiles and place them into their own +devspace.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 988392156daae34427906e98609d1dd1fe4970a5 Author: Göktürk Yüksek gentoo org> AuthorDate: Wed Oct 16 20:12:24 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Tue Oct 29 20:46:07 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=98839215 general-concepts/mirrors: improve bad upstream distfile rename text If an upstream updates a distfile in a way that requires an ebuild revision bump, remind readers to remove the ebuilds associated with the old distfile. This is necessary because the Manifest entry for the old tarball has its checksum changed due to upstream and cause checksum mismatches during merges. Closes: https://github.com/gentoo/devmanual.gentoo.org/pull/112 Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index f5553fa..703b705 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -66,8 +66,13 @@ fetch and start distributing the new version. -Please note that if upstream made any changes affecting the built package, -you need to also bump the ebuild's revision. +Please note that if upstream made any changes affecting the built +package, you need to also bump the ebuild's revision. Finally, +remember to remove the ebuilds that are associated with the old +distfile, or regenerate their checksums in Manifest, if there +are any. This is necessary because these ebuilds will cause checksum +mismatch errors as the checksum recorded in the Manifest file no +longer matches the computed checksum of the fetched distfile.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 9ef8d4d65e699f16788d5a7b6b71e5cad418e885 Author: Michał Górny gentoo org> AuthorDate: Sun Oct 6 07:50:55 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Oct 16 19:53:21 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9ef8d4d6 general-concepts/mirrors: Discourage RESTRICT=primaryuri There is no real argument for using it, so just discourage it instead of trying to find justification to use it. Acked-by: Michael Orlitzky gentoo.org> Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 97e9ac2..7cc6b76 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -33,9 +33,8 @@ certain files; files will still be downloaded from the original locations. The RESTRICT="primaryuri" setting causes Portage to try -original locations first, and then fall back to mirrors if necessary this -is sometimes useful if approximate download counts are needed, or if upstream -have a reliable mirror setup. +original locations first, and then fall back to mirrors if necessary. +This should not be used in new ebuilds.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: bd81725dea981cddc3e890f0117a5bf88e2b3f47 Author: Göktürk Yüksek gentoo org> AuthorDate: Wed Oct 16 20:11:07 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Oct 16 20:11:07 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bd81725d general-concepts/mirrors: clarify 'myname' in devspace URI example Clarify that 'myname' in the example devspace URI refers to the username of the developer. Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 4 1 file changed, 4 insertions(+) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 6cbb53d..f5553fa 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -106,6 +106,10 @@ a distfile mirrored this way is as follows: SRC_URI="https://dev.gentoo.org/~myname/distfiles/${P}.tar.gz"; + +where myname refers to the username of the developer. + +
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 41eef2b0c72c3509412b0d8c6487e1745a69794e Author: Göktürk Yüksek gentoo org> AuthorDate: Wed Oct 16 20:10:35 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Oct 16 20:10:35 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=41eef2b0 general-concepts/mirrors: remove extra whitespace Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 11dd040..6cbb53d 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -98,8 +98,8 @@ requirement of the license. When you upload the file to dev.gentoo.org:~/public_html, you must ensure that it, and its -parent directories, are world-readable. An example SRC_URI referencing -a distfile mirrored this way follows: +parent directories, are world-readable. An example SRC_URI referencing +a distfile mirrored this way is as follows:
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 0bf78da53c2e86d5a27067e4838ebc8c647778dd Author: Michał Górny gentoo org> AuthorDate: Sun Oct 6 08:00:56 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Oct 16 19:53:45 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=0bf78da5 general-concepts/mirrors: Update link to Infra project page Acked-by: Michael Orlitzky gentoo.org> Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 24dc188..214fbe4 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -72,8 +72,8 @@ you need to also bump the ebuild's revision. More general information about the internals of mirroring can be found on https://www.gentoo.org/proj/en/infrastructure/mirrors/overview-distfile.xml";>infrastructure's -pages. +link="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Distfile_Mirroring_System";> +Infrastructure project's Distfile Mirroring System page.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 3c24f9dfdfd76d2ea0ca3b7015afaa62b43cff99 Author: Michał Górny gentoo org> AuthorDate: Sun Oct 6 07:59:33 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Oct 16 19:53:37 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=3c24f9df general-concepts/mirrors: Update the method of replacing files The modern method of replacing repackaged distfiles is to rename them using SRC_URI arrows, not do some mirror-replacement voodoo. Acked-by: Michael Orlitzky gentoo.org> Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 28 ++-- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 7cc6b76..24dc188 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -50,16 +50,24 @@ found. This should only be used if a license requires it. Replacing Automatically Mirrored Files -On rare occasions you may need to replace a file that is already mirrored. In this case proceed as -follows: - - Put a copy of the new distfile on dev.gentoo.org into /space/distfiles-local - commit the new manifest to the git tree - wait - -After a few hours a cron job on dev.gentoo.org will fetch the file and replace the version on the -mirrors. The file will be automatically removed from /space/distfiles-local after approximately two -weeks. +On rare occasions you may need to replace a file that is already mirrored. +This is usually the case when upstream remakes a release package. If this +is necessary, please use SRC_URI arrow to rename the file. For example: + + + +# upstream updated the distfile in place, so make it .r1 +SRC_URI="https://example.com/badupstream/${P}.tar.gz -> ${P}.r1.tar.gz" + + + +Since Gentoo mirrors operate using local distfile names, they will automatically +fetch and start distributing the new version. + + + +Please note that if upstream made any changes affecting the built package, +you need to also bump the ebuild's revision.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 10c4cea8a800f9f921ca2dc3f6ea9303eea76861 Author: Göktürk Yüksek gentoo org> AuthorDate: Wed Oct 16 20:04:34 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Oct 16 20:04:34 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=10c4cea8 general-concepts/mirrors: rework the bad upstream distfile renaming example If a distfile rename is necessary to cope with an upstream updating a versioned distfile in place, suggest the format of '_MMDD' instead of '.r*'. The rationale is that the '.r*' format may confuse readers with the Gentoo ebuild revision format '-r*', for which there is no necessary correlation. The timestamp format also has the added bonus of quickly being able to tell when the distfile rename took place, assuming the developer used the proper date for it. Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 42fef3f..11dd040 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -56,8 +56,8 @@ is necessary, please use SRC_URI arrow to rename the file. For example: -# upstream updated the distfile in place, so make it .r1 -SRC_URI="https://example.com/badupstream/${P}.tar.gz -> ${P}.r1.tar.gz" +# upstream updated the distfile in place, so suffix it with _MMDD +SRC_URI="https://example.com/badupstream/${P}.tar.gz -> ${P}_20191016.tar.gz"
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: aba7d5fcc1ab3120e028195fdd800ef667d1d361 Author: Michał Górny gentoo org> AuthorDate: Sun Oct 6 08:06:28 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Oct 16 19:53:56 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=aba7d5fc general-concepts/mirrors: Provide an example for d.g.o mirroring Acked-by: Michael Orlitzky gentoo.org> Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Göktürk Yüksek gentoo.org> general-concepts/mirrors/text.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 214fbe4..42fef3f 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -98,8 +98,14 @@ requirement of the license. When you upload the file to dev.gentoo.org:~/public_html, you must ensure that it, and its -parent directories, are world-readable. +parent directories, are world-readable. An example SRC_URI referencing +a distfile mirrored this way follows: + + +SRC_URI="https://dev.gentoo.org/~myname/distfiles/${P}.tar.gz"; + +
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: dd95c04ba6b989014afb52ce30260373cbaa928b Author: Michael Orlitzky gentoo org> AuthorDate: Sat Oct 28 01:44:10 2017 + Commit: Brian Evans gentoo org> CommitDate: Tue Mar 19 17:02:04 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=dd95c04b general-concepts/mirrors: link to the third-party mirror documentation. If you're looking for information on the "mirror://" pseudo-protocol, you might try the page titled "Mirrors". This commit adds a link to that page, pointing to the newly-written third-party mirror documentation. Signed-off-by: Michael Orlitzky gentoo.org> Signed-off-by: Brian Evans gentoo.org> general-concepts/mirrors/text.xml | 12 1 file changed, 12 insertions(+) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index c3b6ba7..97e9ac2 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -124,5 +124,17 @@ Diagram showing the mirroring process. + + Third-party mirrors + + + Usage of third-party mirrors and the mirror:// + pseudo-protocol is described in the SRC_URI + variable documentation. + + + +
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: b2594e940d56a89c40b21c6642bc53a424a37134 Author: Göktürk Yüksek gentoo org> AuthorDate: Thu Jun 16 22:33:49 2016 + Commit: Göktürk Yüksek gentoo org> CommitDate: Thu Jun 16 22:33:49 2016 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=b2594e94 general-concepts/mirrors: remove manual chmod ug+rw on mirrored files #314183 Per Bug 314183 comment 3, remove the mention of chmod ug+rw on files uploaded to dev.g.o for mirroring purposes. Gentoo-Bug: https://bugs.gentoo.org/314183 general-concepts/mirrors/text.xml | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 6e3386a..c3b6ba7 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -103,10 +103,9 @@ parent directories, are world-readable. To manually upload a file to mirror://gentoo, scp it to -dev.gentoo.org:/space/distfiles-local. You must ensure that the permissions -are set to ug+rw manually. The file should appear on the mirrors within four -hours (note that this is less frequent than -). +dev.gentoo.org:/space/distfiles-local. The file should appear +on the mirrors within four hours (note that this is less +frequent than ). If the upstream download location for a package uses a non-standard TCP port (anything other than 21, 80 or 443), you must manually mirror the files. Not
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 8b0d2e55eedbc42716fca8de2b76b6aa1d91cdb3 Author: Gokturk Yuksek binghamton edu> AuthorDate: Thu Feb 4 00:57:44 2016 + Commit: Ulrich Müller gentoo org> CommitDate: Fri Feb 5 12:58:21 2016 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8b0d2e55 general-concepts/git-to-rsync/diagram: update the description for git #558642 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558642 Signed-off-by: Gokturk Yuksek binghamton.edu> general-concepts/mirrors/diagram.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general-concepts/mirrors/diagram.svg b/general-concepts/mirrors/diagram.svg index 0af1f1c..b807e5a 100644 --- a/general-concepts/mirrors/diagram.svg +++ b/general-concepts/mirrors/diagram.svg @@ -52,7 +52,7 @@ CVS to RSYNC Propagation + id="desc1548">Git to RSYNC Propagation
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/
commit: 961a3db2fee2658c95f55dc38e0a37a97057c4c8 Author: Gokturk Yuksek binghamton edu> AuthorDate: Thu Feb 4 00:57:30 2016 + Commit: Ulrich Müller gentoo org> CommitDate: Fri Feb 5 12:58:18 2016 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=961a3db2 general-concepts/mirrors: substitute "CVS" with "the git tree" #558642 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558642 Signed-off-by: Gokturk Yuksek binghamton.edu> general-concepts/mirrors/text.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index e860988..6e3386a 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -55,7 +55,7 @@ On rare occasions you may need to replace a file that is already mirrored. In t follows: Put a copy of the new distfile on dev.gentoo.org into /space/distfiles-local - commit the new manifest to CVS + commit the new manifest to the git tree wait After a few hours a cron job on dev.gentoo.org will fetch the file and replace the version on the
[gentoo-commits] proj/devmanual:master commit in: general-concepts/mirrors/, general-concepts/cvs-to-rsync/, general-concepts/, ...
commit: 8c1cb7c99809541c4782055a1591155f5e7749a2 Author: Johannes Huber gentoo org> AuthorDate: Mon Aug 17 15:01:39 2015 + Commit: Justin Lecher gentoo org> CommitDate: Tue Aug 18 11:59:27 2015 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8c1cb7c9 Replace cvs to rsync with git to rsync Due to git migration. general-concepts/{cvs-to-rsync => git-to-rsync}/diagram.svg | 4 ++-- general-concepts/{cvs-to-rsync => git-to-rsync}/text.xml| 12 ++-- general-concepts/mirrors/text.xml | 2 +- general-concepts/text.xml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/general-concepts/cvs-to-rsync/diagram.svg b/general-concepts/git-to-rsync/diagram.svg similarity index 98% rename from general-concepts/cvs-to-rsync/diagram.svg rename to general-concepts/git-to-rsync/diagram.svg index ed31af7..8cf7414 100644 --- a/general-concepts/cvs-to-rsync/diagram.svg +++ b/general-concepts/git-to-rsync/diagram.svg @@ -1,5 +1,5 @@ -http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> http://www.w3.org/2000/svg"; version="1.1"> CVS to RSYNC Propagation @@ -31,7 +31,7 @@ -CVS +Git Remote diff --git a/general-concepts/cvs-to-rsync/text.xml b/general-concepts/git-to-rsync/text.xml similarity index 50% rename from general-concepts/cvs-to-rsync/text.xml rename to general-concepts/git-to-rsync/text.xml index 9a379e6..7cef764 100644 --- a/general-concepts/cvs-to-rsync/text.xml +++ b/general-concepts/git-to-rsync/text.xml @@ -1,7 +1,7 @@ - + -CVS to RSYNC +Git to RSYNC @@ -11,10 +11,10 @@ -Developer commits to CVS. +Developer commits to local Git clone and pushes to central remote Git epository. Commits and pushes are signed using Git mechanisms based on GPG. -Staging box syncs from CVS and generates the metadata cache. +Staging box syncs from central Git repository, generates the metadata cache, ChangeLogs and signed Manifests from Git history. rsync1 syncs from the staging box. @@ -27,8 +27,8 @@ - - Diagram showing CVS to RSYNC Propagation + + Diagram showing Git to RSYNC Propagation diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 7a804d9..8d81d44 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -106,7 +106,7 @@ To manually upload a file to mirror://gentoo, scp it to dev.gentoo.org:/space/distfiles-local. You must ensure that the permissions are set to ug+rw manually. The file should appear on the mirrors within four hours (note that this is less frequent than -). +). If the upstream download location for a package uses a non-standard TCP port (anything other than 21, 80 or 443), you must manually mirror the files. Not diff --git a/general-concepts/text.xml b/general-concepts/text.xml index 108fe00..c8c2b90 100644 --- a/general-concepts/text.xml +++ b/general-concepts/text.xml @@ -21,7 +21,7 @@ writing ebuilds or working with the Portage tree. - +