diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-04 10:50:22 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-04 10:50:22 +0000 |
| commit | 1c451e5aaeda97d2c46a78413d12cea60abd6333 (patch) | |
| tree | 0555848c98d322a6927829df68dc670a42f00f29 /gentoo.html | |
| parent | 2021-04-04T10:30:01Z (diff) | |
| download | repos-1c451e5aaeda97d2c46a78413d12cea60abd6333.tar.gz repos-1c451e5aaeda97d2c46a78413d12cea60abd6333.tar.bz2 repos-1c451e5aaeda97d2c46a78413d12cea60abd6333.zip | |
2021-04-04T10:45:01Z
Diffstat (limited to 'gentoo.html')
| -rw-r--r-- | gentoo.html | 94 |
1 files changed, 30 insertions, 64 deletions
diff --git a/gentoo.html b/gentoo.html index 04c40725d4f6..d212acee3cc2 100644 --- a/gentoo.html +++ b/gentoo.html @@ -38,99 +38,65 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gentoo </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gentoo + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> ef740acfab4..42e47c4978b master -> origin/master </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating ef740acfab4..42e47c4978b </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> 697bb0de870..ef740acfab4 master -> origin/master + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating 697bb0de870..ef740acfab4 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> net-analyzer/zabbix/Manifest | 2 + </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Fast-forward + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> net-analyzer/zabbix/zabbix-4.0.30.ebuild | 353 ++++++++++++++++++ </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> games-emulation/mekanix/mekanix-070-r1.ebuild | 19 +- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> net-analyzer/zabbix/zabbix-5.0.10.ebuild | 598 +++++++++++++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> games-engines/nazghul/nazghul-0.7.1-r1.ebuild | 14 +- + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> 3 files changed, 953 insertions(+) </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> .../scummvm-tools/scummvm-tools-2.1.0.ebuild | 5 +- + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> create mode 100644 net-analyzer/zabbix/zabbix-4.0.30.ebuild </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> .../scummvm-tools/scummvm-tools-2.2.0.ebuild | 5 +- + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> create mode 100644 net-analyzer/zabbix/zabbix-5.0.10.ebuild </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> net-analyzer/zabbix/Manifest | 4 +- + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced gentoo </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> .../zabbix/files/zabbix-3.0.30-mysql8.patch | 17 - + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> .../files/zabbix-3.0.31-fix-cve-2020-15803.patch | 83 -- + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild | 354 ------ + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> net-analyzer/zabbix/zabbix-5.2.6.ebuild | 604 +++++++++++ + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> sys-cluster/gmqtt/gmqtt-0.3.0.ebuild | 4 +- -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> www-servers/caddy/Manifest | 155 ++- -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> www-servers/caddy/caddy-2.2.1.ebuild | 991 ----------------- -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> www-servers/caddy/caddy-2.3.0.ebuild | 1143 ++++++++++++++++++++ -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> www-servers/caddy/metadata.xml | 5 +- -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> 14 files changed, 1934 insertions(+), 1469 deletions(-) -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> delete mode 100644 net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> delete mode 100644 net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> delete mode 100644 net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> create mode 100644 net-analyzer/zabbix/zabbix-5.2.6.ebuild -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> delete mode 100644 www-servers/caddy/caddy-2.2.1.ebuild -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> create mode 100644 www-servers/caddy/caddy-2.3.0.ebuild -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced gentoo -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |