summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.html')
-rw-r--r--gentoo.html106
1 files changed, 55 insertions, 51 deletions
diff --git a/gentoo.html b/gentoo.html
index ebbba1d9028..4c6b1468989 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -40,107 +40,111 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
</pre></td></tr>
- <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
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
</pre></td></tr>
- <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
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <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
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <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,
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <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
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> 5e4cda23b8f..e2121d2dc1f master -&gt; origin/master
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating 5e4cda23b8f..e2121d2dc1f
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> e2121d2dc1f..f7e6c2c119d master -&gt; origin/master
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating e2121d2dc1f..f7e6c2c119d
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> app-portage/euses/euses-2.6.0.ebuild | 2 +-
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Fast-forward
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild | 2 +-
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-db/pg_activity/Manifest | 1 +
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-python/multidict/multidict-5.0.0.ebuild | 2 +-
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-db/pg_activity/pg_activity-1.6.2.ebuild | 24 ++++++
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-python/pyserial/Manifest | 1 +
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> media-gfx/geeqie/geeqie-1.5.1-r1.ebuild | 96 ++++++++++++++++++++++
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-python/pyserial/pyserial-3.5.ebuild | 34 +++++++++++
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> media-gfx/geeqie/geeqie-9999.ebuild | 8 +-
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> dev-python/python3-lxc/Manifest | 1 -
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> profiles/package.mask | 1 +
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> dev-python/python3-lxc/python3-lxc-3.0.2.ebuild | 22 -------
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> sys-kernel/git-sources/Manifest | 1 +
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> dev-python/python3-lxc/python3-lxc-3.0.4.ebuild | 2 +-
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> sys-kernel/git-sources/git-sources-5.10_rc5.ebuild | 40 +++++++++
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-python/wsproto/Manifest | 1 +
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> sys-kernel/vanilla-sources/Manifest | 14 ++--
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> dev-python/wsproto/wsproto-1.0.0.ebuild | 20 +++++++
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> ....207.ebuild =&gt; vanilla-sources-4.14.208.ebuild} | 0
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> dev-python/yarl/yarl-1.6.2.ebuild | 2 +-
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> ....158.ebuild =&gt; vanilla-sources-4.19.159.ebuild} | 0
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> dev-util/ninja/ninja-1.10.1.ebuild | 2 +-
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> .../vanilla-sources/vanilla-sources-4.4.244.ebuild | 16 ----
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild | 2 +-
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> ....4.78.ebuild =&gt; vanilla-sources-4.4.245.ebuild} | 0
</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> .../netkit-telnetd/netkit-telnetd-0.17-r12.ebuild | 2 +-
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> .../vanilla-sources/vanilla-sources-4.9.244.ebuild | 16 ----
</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> sci-libs/cln/cln-1.3.6.ebuild | 2 +-
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> ....8.18.ebuild =&gt; vanilla-sources-4.9.245.ebuild} | 0
</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> sys-apps/sysvinit/sysvinit-2.97.ebuild | 2 +-
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> ...-5.9.9.ebuild =&gt; vanilla-sources-5.4.79.ebuild} | 0
</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> sys-cluster/libqb/libqb-2.0.1.ebuild | 2 +-
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> .../vanilla-sources/vanilla-sources-5.9.10.ebuild | 16 ++++
</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> sys-kernel/pf-sources/Manifest | 1 +
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> 16 files changed, 190 insertions(+), 43 deletions(-)
</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> sys-kernel/pf-sources/pf-sources-5.9_p5.ebuild | 67 ++++++++++++++++++++++
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> create mode 100644 dev-db/pg_activity/pg_activity-1.6.2.ebuild
</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild | 2 +-
+ <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> create mode 100644 media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> sys-libs/libseccomp/libseccomp-2.4.4.ebuild | 2 +-
+ <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> create mode 100644 sys-kernel/git-sources/git-sources-5.10_rc5.ebuild
</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> x11-terms/terminator/terminator-2.0.1.ebuild | 2 +-
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> rename sys-kernel/vanilla-sources/{vanilla-sources-4.14.207.ebuild =&gt; vanilla-sources-4.14.208.ebuild} (100%)
</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> 22 files changed, 138 insertions(+), 37 deletions(-)
+ <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> rename sys-kernel/vanilla-sources/{vanilla-sources-4.19.158.ebuild =&gt; vanilla-sources-4.19.159.ebuild} (100%)
</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> create mode 100644 dev-python/pyserial/pyserial-3.5.ebuild
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> delete mode 100644 sys-kernel/vanilla-sources/vanilla-sources-4.4.244.ebuild
</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> delete mode 100644 dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
+ <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> rename sys-kernel/vanilla-sources/{vanilla-sources-5.4.78.ebuild =&gt; vanilla-sources-4.4.245.ebuild} (100%)
</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> create mode 100644 dev-python/wsproto/wsproto-1.0.0.ebuild
+ <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> delete mode 100644 sys-kernel/vanilla-sources/vanilla-sources-4.9.244.ebuild
</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> create mode 100644 sys-kernel/pf-sources/pf-sources-5.9_p5.ebuild
+ <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> rename sys-kernel/vanilla-sources/{vanilla-sources-5.8.18.ebuild =&gt; vanilla-sources-4.9.245.ebuild} (100%)
</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** syncing gentoo
+ <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> rename sys-kernel/vanilla-sources/{vanilla-sources-5.9.9.ebuild =&gt; vanilla-sources-5.4.79.ebuild} (100%)
</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>*** synced gentoo
+ <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> create mode 100644 sys-kernel/vanilla-sources/vanilla-sources-5.9.10.ebuild
</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** syncing gentoo
</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** synced gentoo
</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
+ <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
+</pre></td></tr>
+ <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>