diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-09 01:05:00 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-09 01:05:00 +0000 |
commit | 364c2edf89534322c0a9e93db3cd0ef6742cd961 (patch) | |
tree | 05ba197e25393ad9e509ff31701bee95b4ba7677 /pross.html | |
parent | 2020-12-09T00:30:01Z (diff) | |
download | repos-364c2edf89534322c0a9e93db3cd0ef6742cd961.tar.gz repos-364c2edf89534322c0a9e93db3cd0ef6742cd961.tar.bz2 repos-364c2edf89534322c0a9e93db3cd0ef6742cd961.zip |
2020-12-09T01:00:01Z
Diffstat (limited to 'pross.html')
-rw-r--r-- | pross.html | 76 |
1 files changed, 53 insertions, 23 deletions
diff --git a/pross.html b/pross.html index 92af6066ed06..04c508aa54dd 100644 --- a/pross.html +++ b/pross.html @@ -34,51 +34,81 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pross </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>From https://github.com/Pross/pross-overlay </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> a4f201b..a607e2f master -> origin/master </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing pross + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating a4f201b..a607e2f </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced pross + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> sys-kernel/ck-sources/Manifest | 8 +- </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> sys-kernel/ck-sources/ck-sources-5.9.13.ebuild | 46 ++ </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> ...ctl-and-CONFIG-to-disallow-unprivileged-C.patch | 112 ++-- </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pross + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> ...ix-LL-PRivacy-BLE-device-fails-to-connect.patch | 66 +++ </pre></td></tr> - <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * gnome-base/gnome-control-center-3.36.4-r1: failed sourcing ebuild: inherit requires unknown eclass: gnome3.eclass + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> ...ix-attempting-to-set-RPA-timeout-when-uns.patch | 48 ++ +</pre></td></tr> + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> ...Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch | 35 ++ +</pre></td></tr> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> ..._optimizations_for_gcc_v9.1+_kernel_v5.8+.patch | 641 +++++++++++++++++++++ +</pre></td></tr> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> 7 files changed, 899 insertions(+), 57 deletions(-) +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> create mode 100644 sys-kernel/ck-sources/ck-sources-5.9.13.ebuild +</pre></td></tr> + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> create mode 100644 sys-kernel/ck-sources/files/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch +</pre></td></tr> + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> create mode 100644 sys-kernel/ck-sources/files/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch +</pre></td></tr> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> create mode 100644 sys-kernel/ck-sources/files/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch +</pre></td></tr> + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> create mode 100644 sys-kernel/ck-sources/files/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v5.8+.patch +</pre></td></tr> + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing pross +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced pross +</pre></td></tr> + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pross +</pre></td></tr> + <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * gnome-base/gnome-control-center-3.36.4-r1: failed sourcing ebuild: inherit requires unknown eclass: gnome3.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> |