Merge remote-tracking branch 'upstream/master' into master

This commit is contained in:
Andreas Westman Dorcsak 2020-10-07 17:08:32 +02:00
commit 99751565a2
6 changed files with 23 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# Contributing # Contributing
## How to contribute ## How to contribute
@ -89,7 +89,11 @@ sync-type = git
sync-uri = git@gitlab.com:src_prepare/src_prepare-overlay.git sync-uri = git@gitlab.com:src_prepare/src_prepare-overlay.git
sync-user = <your_user_developer>:portage sync-user = <your_user_developer>:portage
``` ```
If you dont have write access to the cloned branch yet use "sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git" instead. If you don't have write access to the cloned branch yet use "sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git" instead.
If you lock your SSH key with a password autosyncing may fail.
To evade that use "auto-sync = no" and pull the changes manually (or using a different tool other than 'emerge --sync' or 'eix-sync').
Either way, remember that if you pull with a user different than <your_user_developer> the sync will fail (because that user likely won't have the SSH keys).
### Sync the overlay ### Sync the overlay
As root As root

View File

@ -1,5 +1,9 @@
# CONTRIBUTORS:
# Consider using the example given in CONTRIBUTING.md
# https://gitlab.com/src_prepare/src_prepare-overlay/-/blob/master/CONTRIBUTING.md#add-the-overlay-to-the-system
[src_prepare-overlay] [src_prepare-overlay]
location = /var/db/repos/src_prepare-overlay
sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git
sync-type = git
auto-sync = yes auto-sync = yes
location = /var/db/repos/src_prepare-overlay
sync-type = git
sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git

View File

@ -1,9 +1,12 @@
eapis-banned = 0 1 2 3
eapis-deprecated = 0 1 2 3 4 5
masters = gentoo masters = gentoo
sign-commits = true
sign-manifests = false cache-formats = md5-dict
thin-manifests = true
manifest-hashes = BLAKE2B SHA512 manifest-hashes = BLAKE2B SHA512
manifest-required-hashes = BLAKE2B manifest-required-hashes = BLAKE2B
profile-formats = portage-2 profile-set profile-formats = portage-2 profile-set
sign-commits = true
sign-manifests = false
thin-manifests = true
update-changelog = false
eapis-banned = 0 1 2 3 4 5

1
src_prepare-overlay.conf Symbolic link
View File

@ -0,0 +1 @@
examples/repos.conf/src_prepare-overlay.conf

View File

@ -1,2 +1,2 @@
DIST brave-bin-1.12.76.zip 105336169 BLAKE2B 71bd0cab3074a3e1a32e8fe1df3774323ac9d7265f1e87b80291e0131ea7f32952efc815669f54a6c011dec0198a975450015617fde446025d76c2c6967e1808 SHA512 e5484b39b8263de51b86f8597833d35a8647c0cd9649867566ac38285e4ecf25cb5d0bbb70559e314724940aea6bea3b987fa7611d2056d117b1c5a102763725
DIST brave-bin-1.12.77.zip 105335718 BLAKE2B ceb862da4a37251ed1f0d3b78fbe98d2a5c8e548b9beabbfb623c7d39f9429fac95b425c1b8f70ed9ac652991912165fe5aaee3493006b128345b6c069cb2ede SHA512 85156f38d743061ec28e49ff52bc63d74801e0181dfc22fbedfc3cf3450189f035360395dc8369c2742188011421e4c41dcc29f0b23f4772a666e9bf132ce433 DIST brave-bin-1.12.77.zip 105335718 BLAKE2B ceb862da4a37251ed1f0d3b78fbe98d2a5c8e548b9beabbfb623c7d39f9429fac95b425c1b8f70ed9ac652991912165fe5aaee3493006b128345b6c069cb2ede SHA512 85156f38d743061ec28e49ff52bc63d74801e0181dfc22fbedfc3cf3450189f035360395dc8369c2742188011421e4c41dcc29f0b23f4772a666e9bf132ce433
DIST brave-bin-1.12.78.zip 105406124 BLAKE2B 2eefa972fccad821564b06a877a185eea0107600dd1c45e0bd91b04af15ba446502e41f4f1b758c0cd22e0889518f325a2756d284a33992a4212ae96897359bd SHA512 046ca3f163e364c60bacd3692a37b3cd5db5542d3320dc4fc3ff0a4685d356fcd8dedff89201633b4035b3e3a0d94226bf2328882d085972c7a91615feca34f0