diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-25 14:32:15 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-25 14:32:15 +0000 |
| commit | 97b2b1a72b7e350a491aebc5693163eed1f24aa0 (patch) | |
| tree | 23a2a2ad2f19debb8c3b021b48ac6422a9e64958 /alxu.html | |
| parent | 2021-01-25T13:00:01Z (diff) | |
| download | repos-97b2b1a72b7e350a491aebc5693163eed1f24aa0.tar.gz repos-97b2b1a72b7e350a491aebc5693163eed1f24aa0.tar.bz2 repos-97b2b1a72b7e350a491aebc5693163eed1f24aa0.zip | |
2021-01-25T14:00:01Z
Diffstat (limited to 'alxu.html')
| -rw-r--r-- | alxu.html | 180 |
1 files changed, 26 insertions, 154 deletions
diff --git a/alxu.html b/alxu.html index a6399e44a9ff..b999268d48ca 100644 --- a/alxu.html +++ b/alxu.html @@ -32,185 +32,57 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync alxu </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <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 + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <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 + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <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 + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <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, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <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 + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>From https://git.alxu.ca/gentoo-overlay </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>From https://git.alxu.ca/gentoo-overlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> b78f8cd..645ca2a master -> origin/master </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> 90e63f0..b78f8cd master -> origin/master + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Updating b78f8cd..645ca2a </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating 90e63f0..b78f8cd + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Fast-forward + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> dev-qt/qtgui/qtgui-5.15.2-r2.ebuild | 1 - </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> dev-java/openj9-openjdk-bin/Manifest | 40 +++-- + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> 1 file changed, 1 deletion(-) </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> ... => openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild} | 3 +- + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing alxu </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> ...d => openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild} | 3 +- + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced alxu </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> dev-java/openj9-openjdk-jre-bin/Manifest | 18 +- + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> ...openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild} | 3 +- + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> ... openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild} | 3 +- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-java/openj9-openjdk/Manifest | 8 +- + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 alxu </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> .../files/openjdk-src-doubledollar.patch | 28 ---- -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> ...23.0.ebuild => openj9-openjdk-11.0.24.0.ebuild} | 4 +- -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> .../openj9-openjdk/openj9-openjdk-11.9999.ebuild | 4 +- -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> ...23.0.ebuild => openj9-openjdk-15.0.24.0.ebuild} | 3 +- -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> .../openj9-openjdk/openj9-openjdk-15.9999.ebuild | 3 +- -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> dev-java/openjdk-bin/Manifest | 10 +- -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> ....0.1_p9.ebuild => openjdk-bin-15.0.2_p7.ebuild} | 4 +- -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> dev-java/openjdk-jre-bin/Manifest | 5 +- -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> ..._p9.ebuild => openjdk-jre-bin-15.0.2_p7.ebuild} | 5 +- -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> dev-java/openjdk/Manifest | 2 +- -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> .../openjdk/files/openjdk-src-doubledollar.patch | 28 ---- -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> ...k-15.0.1_p9.ebuild => openjdk-15.0.2_p7.ebuild} | 1 - -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> dev-qt/qtgui/Manifest | 2 +- -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> dev-qt/qtgui/qtgui-5.15.1-r1.ebuild | 183 --------------------- -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> ...gui-5.15.2-r1.ebuild => qtgui-5.15.2-r2.ebuild} | 10 +- -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> media-video/pipewire-compat/Manifest | 1 + -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> .../pipewire-compat}/metadata.xml | 3 + -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> .../pipewire-compat/pipewire-compat-0.2.7.ebuild | 42 +++++ -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> net-misc/wayvnc/Manifest | 1 - -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> .../notification-daemon-1.ebuild | 30 ---- -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> x11-libs/cairo/Manifest | 1 - -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> x11-libs/cairo/cairo-1.16.0-r5.ebuild | 136 --------------- -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> x11-libs/cairo/cairo-9999.ebuild | 133 --------------- -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> .../files/cairo-1.12.18-disable-test-suite.patch | 15 -- -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> .../cairo/files/cairo-1.16.0-binutils-2.34.patch | 20 --- -</pre></td></tr> - <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> ...one_MM_Var-instead-of-free-when-available.patch | 30 ---- -</pre></td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> .../files/cairo-1.16.0-pdf-add-missing-flush.patch | 29 ---- -</pre></td></tr> - <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> x11-libs/cairo/files/cairo-1.16.0-strings.patch | 19 --- -</pre></td></tr> - <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> .../cairo/files/cairo-respect-fontconfig.patch | 13 -- -</pre></td></tr> - <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> x11-libs/cairo/metadata.xml | 14 -- -</pre></td></tr> - <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> 37 files changed, 122 insertions(+), 735 deletions(-) -</pre></td></tr> - <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> rename dev-java/openj9-openjdk-bin/{openj9-openjdk-bin-11.0.9.11.0.23.0.ebuild => openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild} (98%) -</pre></td></tr> - <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> rename dev-java/openj9-openjdk-bin/{openj9-openjdk-bin-15.0.1.9.0.23.0.ebuild => openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild} (98%) -</pre></td></tr> - <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> rename dev-java/openj9-openjdk-jre-bin/{openj9-openjdk-jre-bin-11.0.9.11.0.23.0.ebuild => openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild} (98%) -</pre></td></tr> - <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> rename dev-java/openj9-openjdk-jre-bin/{openj9-openjdk-jre-bin-15.0.1.9.0.23.0.ebuild => openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild} (98%) -</pre></td></tr> - <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> delete mode 100644 dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch -</pre></td></tr> - <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> rename dev-java/openj9-openjdk/{openj9-openjdk-11.0.23.0.ebuild => openj9-openjdk-11.0.24.0.ebuild} (98%) -</pre></td></tr> - <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> rename dev-java/openj9-openjdk/{openj9-openjdk-15.0.23.0.ebuild => openj9-openjdk-15.0.24.0.ebuild} (98%) -</pre></td></tr> - <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> rename dev-java/openjdk-bin/{openjdk-bin-15.0.1_p9.ebuild => openjdk-bin-15.0.2_p7.ebuild} (97%) -</pre></td></tr> - <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> rename dev-java/openjdk-jre-bin/{openjdk-jre-bin-15.0.1_p9.ebuild => openjdk-jre-bin-15.0.2_p7.ebuild} (96%) -</pre></td></tr> - <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> delete mode 100644 dev-java/openjdk/files/openjdk-src-doubledollar.patch -</pre></td></tr> - <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> rename dev-java/openjdk/{openjdk-15.0.1_p9.ebuild => openjdk-15.0.2_p7.ebuild} (99%) -</pre></td></tr> - <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> delete mode 100644 dev-qt/qtgui/qtgui-5.15.1-r1.ebuild -</pre></td></tr> - <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> rename dev-qt/qtgui/{qtgui-5.15.2-r1.ebuild => qtgui-5.15.2-r2.ebuild} (92%) -</pre></td></tr> - <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> create mode 100644 media-video/pipewire-compat/Manifest -</pre></td></tr> - <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> rename {virtual/notification-daemon => media-video/pipewire-compat}/metadata.xml (62%) -</pre></td></tr> - <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> create mode 100644 media-video/pipewire-compat/pipewire-compat-0.2.7.ebuild -</pre></td></tr> - <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> delete mode 100644 virtual/notification-daemon/notification-daemon-1.ebuild -</pre></td></tr> - <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/Manifest -</pre></td></tr> - <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/cairo-1.16.0-r5.ebuild -</pre></td></tr> - <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/cairo-9999.ebuild -</pre></td></tr> - <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch -</pre></td></tr> - <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch -</pre></td></tr> - <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch -</pre></td></tr> - <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch -</pre></td></tr> - <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/files/cairo-1.16.0-strings.patch -</pre></td></tr> - <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/files/cairo-respect-fontconfig.patch -</pre></td></tr> - <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> delete mode 100644 x11-libs/cairo/metadata.xml -</pre></td></tr> - <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>*** syncing alxu -</pre></td></tr> - <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>*** synced alxu -</pre></td></tr> - <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 alxu -</pre></td></tr> - <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |