From e5cdbe64daa21685e071490de059eea17fcd53ab Mon Sep 17 00:00:00 2001 From: Rune Morling Date: Sat, 20 Apr 2024 16:28:03 +0200 Subject: [PATCH 1/6] xorriso: Rebuild for autobuild Signed-off-by: Rune Morling --- x/xorriso/manifest.x86_64.bin | Bin 533 -> 535 bytes x/xorriso/manifest.x86_64.jsonc | 1 - 2 files changed, 1 deletion(-) diff --git a/x/xorriso/manifest.x86_64.bin b/x/xorriso/manifest.x86_64.bin index 0de1c582c80556b27f3a75a71467d6e01e3283ce..a0d829599a7d9bd666f554d6296fa56284ce1336 100644 GIT binary patch delta 506 zcmV98k1!(FhE* zTGS{SggOCwQJ*cPXX;S2qN)L0NuOfxN3NK1%bQ=xIo#;perDU|U2`Yj%CbBgd!qN8 zJa=Lap<5}smH0)siR>SH=d>SPL#y()A(;=3j;&n&;}MN-6QZQID^d-^FbKM^{x|9n z=t4o8eE)KjUw?)gx3kwx$tBCLK`fT$ztY#W#MMIg`Ym67%g%?_WVw^SCAQy8xvHty zKRXLLCz6Nn5uPdO{*k0dL6ZJBb18c|fnFSSqDN71XozS&+eGw471@(rvEd^@NYfCK z^MV4@Qc(uU@8Bc-!8D0Sqa#Bd15JQfI_xJ8F(^<(WOGni2XQP=A;zSxwgVbL_EpY& zX_E71-X5Wd8}tLPf)C75Y4RbHrh-9&mm`*E@euOYUYlLCf=X2|HIAT)V$=Z;#}70Z wOozAH5OF`HR1vxt1}rxX#>isi@-4zs=?1|f7I*AKEwCa*Bum000sI0RaLiwJ-f(9s*qs0LEKY zCGd3ItPYz_RLg#rL^q#OE;5y|A{uVpmBd;f9R@t#jiaXt8D&lYMgT?t%dn}P+?T%{ z&=cwJAa-?h8*A}TlgY3#maC~fmgKp|UL?t4IX*Dz2?48tpbPX@d--cj5I6BsH`Hx339#8p~&Le$?|KE=V|^ceO*s%Ep)H{^7VgqKEx)=o%}7c{pQM9 zUB&(xlOlQe9zj)~E9oAZCP-nD{`gVVjZ4|n3Dn|fMS2tkhlYsevrR~lRI!0JSZoMQ zFv>KH??$W1tBUOP2*MC~-hUgs#p5kt9wb1xa0P2N^)M zYi;T*-Q^ACXh9Drw&HqaOh|+s0LCDR<5&!-d_8zFZ|D{gx+67uaT=LvR}F@?uwV)LYv&69 diff --git a/x/xorriso/manifest.x86_64.jsonc b/x/xorriso/manifest.x86_64.jsonc index b5065554..e535ffc3 100644 --- a/x/xorriso/manifest.x86_64.jsonc +++ b/x/xorriso/manifest.x86_64.jsonc @@ -3,7 +3,6 @@ "manifest-version": "0.2", "packages": { "xorriso": { - "build-depends": [], "depends": [ "interpreter(/usr/lib/ld-linux-x86-64.so.2(x86_64))", "soname(libc.so.6(x86_64))" From 2399a1e35462c5c57c3e9b407220169ac7a1756d Mon Sep 17 00:00:00 2001 From: Rune Morling Date: Sat, 20 Apr 2024 16:30:24 +0200 Subject: [PATCH 2/6] font-cantarell: Rebuild for autobuild Signed-off-by: Rune Morling --- f/font-cantarell/manifest.x86_64.bin | Bin 307 -> 310 bytes f/font-cantarell/manifest.x86_64.jsonc | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/f/font-cantarell/manifest.x86_64.bin b/f/font-cantarell/manifest.x86_64.bin index d64e451a7795fe2e7708488ebb167a52ec81784e..d93f0ddfd6245a4c5a8b37cca8bddfea435133e3 100644 GIT binary patch delta 280 zcmV+z0q6d+0=5E>Cx7+;0000000C@u75-U~EzzX_000XB0RaLiwJ-f(Yyf2k0J6<2 zAOLrDL^+_YmD)^ZNFybE0)A;1*l^i*$)W?ioTCzGq|a1lm==y`Oe)VN^ryJ8YpqCa z&8+LfU@m9vuW*OqjQ_Xp?3-s_D?4M+WG~m6PYA^6sO9cRU4M%BRI0Eea^8p=SBN{~ zSs^`jy1VdNjz+9u<0*4TP4q{2>i;3QdUUr<3O5}wC?nU2I`cPpq+%IaE~vl24GX{z ziHSv#P%O!x;D>Kpyf9aYRk>RE2RP$@79fyJM8|PBAsl6g*DC&m#Hm;&0S*O6;n5+ug29}*N9v49UYcvyH+Oxl);Xgjd%?zZJ|0a|E`N6@>Ji1IQJoFZx=V56 zI&o**)%le+9o~5@_|aT#*0XV^<)$3yk?_-h2euj=dfhiOO|z*{Fa-7Gaq!3g2_;0S zm>vVC5`Y&DFZ{=(BqEWKN5QNAo=5M@b!JwsR(k|o@jnnC(89Wo0gA-PiuYs=ok%l- b;(l^h84KjntPbwki?sxi#O=wrx0x#g Date: Sat, 20 Apr 2024 16:32:07 +0200 Subject: [PATCH 3/6] modemmanager: Rebuild for autobuild Signed-off-by: Rune Morling --- m/modemmanager/manifest.x86_64.bin | Bin 1487 -> 1492 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/m/modemmanager/manifest.x86_64.bin b/m/modemmanager/manifest.x86_64.bin index c0afccd506f1a3dbe310e285a679c9cc03297999..95999bc804d5259f63e96469388da6f41b01124d 100644 GIT binary patch delta 1471 zcmV;w1wi`G3)BmcCx5>H0000001Whf$@H4rRU>x*003M70RaLiwJ-f(^b4&W04A)6 zGC*_M!!QiPFbu;mjK(5GE8BxooF0itr<6_q-wXLcsu)IH8!XgkQU(p!P*t+*Z(|2} z0D%B@0PpVYDJ`tpx{WIlvbr$v*S5?O_Qu@)^7k@bvl@T`^>*=h@EhpPW zUbBPlwsh?63aNfTXtK~M8S!@@_0h-g|XG7O%vg?Nn@I( z5DH1iZJ>lgCM7E(kA2-|U)ILl2Fr+xZoBqLhU@59OE+Q05%yyz`(`&kK5h#;QC}_a z1DtOkKb^4MR;=pJ>oLtP-TL&7f!W!1Xw_Kr{i@cF*?)h0%0-l-ul~IkFV$znoGl^h zyKP)OQa}vls7m~u8qa4P;t5~%D$lEe`izurT7lF!k~Y4h%VDvF@o)M(JK)$Z)c4E*4QrV<3I+uqcQ_!(yk?E`c{fv1)AOPqpLHRnNr-PRJa0yTsi?Yi z(+Cn;hkt`WY4+eEWLs!m84xI=9~*-)j%7cod^tFRHd`3`Y)svaBCL8oXl*-2Rr96r z#?CPD@1q}Ktk}51%l)-peaF{V%*GIdwxd7jF9CqTs6kOOGea`cq^OV%phRShXmgUt z7|(DZ1VKbV8RL|Ikw5|oL;{JN2QW>R3Ygg}GJgq^*d_ZmWf;cC7{M|LDKVc%EVAt* znLcl_9G8W|v+?bm>Bw z@_P%WqhMRoOo#{N$XezChrXZ)h560AFA_eWQlq)2xY^FNIzZR34pD3;<{LYoTdlt zN)%@EN2CR+=0n2gDTFW#wf(a5=?82bimGz_W@(llWDXjtb0t)%#3Ii)yjR5Uh9MG} z%)>+o*Nc{LVR^zHhWe_%y2N9*@FHt&Ab*s-xE=ooK!;W}pw4X#fBK00001wEzGB00003WStw2y!9y*kpKVyBme;c0)HsA zFa2O-0$mLNw$?`<0GA$@Mxx~lF0^K!)?eu3pl+8mx%$8Go*$(Ltj#Gt06hRe09$Vw ze*^cpyTgn#sNdEM?(Hv!G5!Spm{2~Hipd|Ppxl6PgGVfh#Jc3`0wDebNr1Y*(L-hUu}1i$zzxWe7tdeA;psY&=*mUf0Uq_%bw;tlEc zd#kX+Czw?z!XyWE1#M`p45ocEO<#f^s(A0C9Pu{xp@|i<+JmWX9j+Sn{9y3KwP9>& zW5zLVIvIZnuQ(hC-Q=Va=NaGDi7!OU*y8XO1x|X}5nkRIQSa!AyNWF47=LwMdVlMa zPLQ5ku1?8m)zPZP2+U!iiT-3{-r zr5G0;4&jH?4h-6);KE1(P&kop+1Q&PQ3K_I<|zH%2&%&xmAt$#Chgs8$PwNT2@Ygw Z(j7d5gHfK~q40?etVrhVKANRjHwKCWx$OV| delta 1466 zcmV;r1x5PQ3(pIXCx5sA0000001TrkTVzRj;p*xD003M70RaLiwJ-f(qYHH%0G2F? zF;G?7Ff%hVGcz-@D%PxRP7X?OdL%+Rr7R$dAW?(oA^O#9!@^J_mqGOeY=}kgAp?8> zfdF;@AaB;PjP+GqTZfJGQSo`D8q219HtTz)RkZ)XIUTm@pns;qQqm-cST?I_t3_^5 z)7xIN96RLoYM&3223XDLJJb)EM*5oc`qW`-^~ozGpD;;)ZG42hgouckv;k1qFarc; zz&s|8XX-F1fEBRH)uV4tjy{(Ik-35<>dEhl!x^#Hzr`d1MpD2g zj%k`cDkh)Sq4N2loV0)%@?~B1NIBFxTuK`3%9K+!8p958Z1UZQkNsO@dz*CV&(^mw zPBA{>Nw5AsD=M=EE9&y{pSNSzmd!KoS`?N0SrpQ1y?>(Ap~xLN)u2gDN8Q?t7}|0| zN{$lLyYkb97Vlpi(dKsIm#+4E`5f))%IjjzmT*o2h9EJ5IQi|!depBnAU$O|?mI^M zRq^3wQ?uhP#6yOmoMj=7cYp!mpyL`MK@v5+8-tFsmx>#f*L3JC`>4$VV+?w|URsg# z6I9trz<&-HSV4ipoT3PdiOBU?md4`|O@|zMGaVASr0(@^^y;<#Tk_AgBls$o?$yd| zH7a`Td=~PRaqFf-84L2$ce%A3_5RB*B>xM&%COz*fW4?8QDbI^WTZ(^AsvuJWQ=HZ zqSzpdK`_Dy2qZ)x5h9@kB7sD@11K3**#{O$=6{zjnIv4=UMLE!6r~ayiA-8li(TYT zaXF@2We{+^iY4yl-)o?&DRvnp4{$#4|HBz0G=V1+el#(zHy9}|&12x>=e1@jRAG;y}Z%nA5=F>^yGA=1lE57IK!jDWFGKa`!D&iYc*D8T zy;a!Z6wE3lg(3%a6>Vs33|6Dw|9vw}U&0O73;(fut?GxjLv$oDLRR}wb?b1|D(eR8 z2?=Mhqs21DFpfv_hxpa$K;{0ntDV?^}oTTR3)XI>Bq2!evnl@UO*k zqR?Pt^CC>82cS6giIqlrEHnNRng8OUk$?^`P55^seqF3z>}8XTNx<1P Date: Sat, 20 Apr 2024 16:33:27 +0200 Subject: [PATCH 4/6] font-noto-emoji: Rebuild for autobuild Signed-off-by: Rune Morling --- f/font-noto-emoji/manifest.x86_64.bin | Bin 415 -> 420 bytes f/font-noto-emoji/manifest.x86_64.jsonc | 5 +---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/f/font-noto-emoji/manifest.x86_64.bin b/f/font-noto-emoji/manifest.x86_64.bin index fe1b22e833ab27d27a9ad646dd4e05463f70b089..edaa70a6c95fe3b7ba96cc83c1193f918a93d895 100644 GIT binary patch delta 390 zcmV;10eSwP1Ed3xCx2uB0000000K1C&NXo)One>y000UA0RaLiwJ-f(Gy&BL0A>|K z9{}4nCsHb-OCt(3iCqD7G_rgTQjE0Z+5dBeDSDOyI{-HTIRMtTzOlj|IS3qYbK2iS zj19PP!I&@^7h?f7EC75+@PV1xa-m2pj0w2F%sf%9l9|8P?0>6oi~*Rz%mK~SnX=xZ z?%%P(e(Rq1-RRn^rH&TfzA{dhTdyB>-!BX8X;Rrzv!CCt((|sc@9f97IjKF=0iRbr z@L_~6L7gEkSG~)zZd-p%vieFox9-g;{Wghg>(sUW3Mchcu5CI)Xt+A#N3}XzCA;tL zXDeKhRI*P;#DAEA4--i_cW$C`O>+9WpWI}kx!!-rSb-r1e%!B;Le~6Nvggz;>Kk7GW-xPe)m)t? z>nrO1tyS1>-SfVyd7O3BnuWKo)TYX<*AKhzmW8%7scaeT=eMi$yesTG`|)iqYX7ti z9P3-dhZ=n8X$*0>>RnEC+xkbT>MQBo+TTCDIi=s0$+k{C_E$Kmhw_+d41wY5)IJ*P zY?SQ2yAP9Wf_il}AiflAh+IiIcP@hRn3cZnCl`reuJ_;ZRp5u=alc9mRr5>9o-uvfS;5_^o*Ubo4y893Ic8DQviZi-P_+HR%k f1tiLIhOr!>1&#)&uCj9rVz3|_U~n??US^;SO=-Dc diff --git a/f/font-noto-emoji/manifest.x86_64.jsonc b/f/font-noto-emoji/manifest.x86_64.jsonc index 070e66b7..44c17e1b 100644 --- a/f/font-noto-emoji/manifest.x86_64.jsonc +++ b/f/font-noto-emoji/manifest.x86_64.jsonc @@ -3,13 +3,10 @@ "manifest-version": "0.2", "packages": { "font-noto-emoji": { - "build-depends": [], - "depends": [], "files": [ "/usr/share/fonts/truetype/noto/NotoColorEmoji.ttf" ], - "name": "font-noto-emoji", - "provides": [] + "name": "font-noto-emoji" } }, "source-name": "font-noto-emoji", From 7d0fc29ca6962be59d3978bbf55e14446301e508 Mon Sep 17 00:00:00 2001 From: Rune Morling Date: Wed, 1 May 2024 00:12:10 +0200 Subject: [PATCH 5/6] Treewide: Break cycles with autobuild.yaml configs Note that I don't get the same cycles on each run of autobuild. Sometimes cycles are broken correctly, sometimes they are not. Signed-off-by: Rune Morling --- b/brotli/autobuild.yaml | 4 ++++ c/cairo/autobuild.yaml | 4 ++++ c/cryptsetup/autobuild.yaml | 1 + g/glib2/autobuild.yaml | 1 + h/harfbuzz/autobuild.yaml | 3 +++ l/libtiff/autobuild.yaml | 3 +++ p/polkit/autobuild.yaml | 1 + s/systemd/autobuild.yaml | 1 + .../autobuild_templates/autobuild-ignore-accountsservice.yaml | 3 +++ 9 files changed, 21 insertions(+) create mode 100644 b/brotli/autobuild.yaml create mode 100644 c/cairo/autobuild.yaml create mode 120000 c/cryptsetup/autobuild.yaml create mode 120000 g/glib2/autobuild.yaml create mode 100644 h/harfbuzz/autobuild.yaml create mode 100644 l/libtiff/autobuild.yaml create mode 120000 p/polkit/autobuild.yaml create mode 120000 s/systemd/autobuild.yaml create mode 100644 tools/autobuild_templates/autobuild-ignore-accountsservice.yaml diff --git a/b/brotli/autobuild.yaml b/b/brotli/autobuild.yaml new file mode 100644 index 00000000..0be7653a --- /dev/null +++ b/b/brotli/autobuild.yaml @@ -0,0 +1,4 @@ +solver: + ignore: + - libcap #: { auxdep: "It doesn't make sense for libcap-ng to induce a rebuild of brotli"} + - cryptsetup #: { auxdep: "It doesn't make sense for cryptsetup to induce a rebuild of brotli"} diff --git a/c/cairo/autobuild.yaml b/c/cairo/autobuild.yaml new file mode 100644 index 00000000..ece4aa92 --- /dev/null +++ b/c/cairo/autobuild.yaml @@ -0,0 +1,4 @@ +solver: + ignore: + - fontconfig #: { auxdep: "It doesn't make sense for fontconfig to induce a rebuild of cairo" } + - freetype #: { auxdep: "It doesn't make sense for freetype to induce a rebuild of cairo"} diff --git a/c/cryptsetup/autobuild.yaml b/c/cryptsetup/autobuild.yaml new file mode 120000 index 00000000..f18cdb87 --- /dev/null +++ b/c/cryptsetup/autobuild.yaml @@ -0,0 +1 @@ +../../tools/autobuild_templates/autobuild-ignore-accountsservice.yaml \ No newline at end of file diff --git a/g/glib2/autobuild.yaml b/g/glib2/autobuild.yaml new file mode 120000 index 00000000..f18cdb87 --- /dev/null +++ b/g/glib2/autobuild.yaml @@ -0,0 +1 @@ +../../tools/autobuild_templates/autobuild-ignore-accountsservice.yaml \ No newline at end of file diff --git a/h/harfbuzz/autobuild.yaml b/h/harfbuzz/autobuild.yaml new file mode 100644 index 00000000..4c1437b3 --- /dev/null +++ b/h/harfbuzz/autobuild.yaml @@ -0,0 +1,3 @@ +solver: + ignore: + - freetype #: { auxdep: "It doesn't make sense for freetype to induce a rebuild of harfbuzz"} diff --git a/l/libtiff/autobuild.yaml b/l/libtiff/autobuild.yaml new file mode 100644 index 00000000..29036b6a --- /dev/null +++ b/l/libtiff/autobuild.yaml @@ -0,0 +1,3 @@ +solver: + ignore: + - libwebp #: { auxdep: "It doesn't make sense for libwebp to induce a rebuild of libtiff"} diff --git a/p/polkit/autobuild.yaml b/p/polkit/autobuild.yaml new file mode 120000 index 00000000..f18cdb87 --- /dev/null +++ b/p/polkit/autobuild.yaml @@ -0,0 +1 @@ +../../tools/autobuild_templates/autobuild-ignore-accountsservice.yaml \ No newline at end of file diff --git a/s/systemd/autobuild.yaml b/s/systemd/autobuild.yaml new file mode 120000 index 00000000..f18cdb87 --- /dev/null +++ b/s/systemd/autobuild.yaml @@ -0,0 +1 @@ +../../tools/autobuild_templates/autobuild-ignore-accountsservice.yaml \ No newline at end of file diff --git a/tools/autobuild_templates/autobuild-ignore-accountsservice.yaml b/tools/autobuild_templates/autobuild-ignore-accountsservice.yaml new file mode 100644 index 00000000..0eb2a407 --- /dev/null +++ b/tools/autobuild_templates/autobuild-ignore-accountsservice.yaml @@ -0,0 +1,3 @@ +solver: + ignore: + - accountsservice #: { auxdep: "It doesn't make sense for accountsservice to induce a rebuild of this"} From d63d301ba16c9e797d2fcf60d153f8f3146f6b46 Mon Sep 17 00:00:00 2001 From: Rune Morling Date: Thu, 16 May 2024 18:40:40 +0200 Subject: [PATCH 6/6] p11-kit: Ignore accountsservice in rebuild solver Signed-off-by: Rune Morling --- p/p11-kit/autobuild.yaml | 1 + 1 file changed, 1 insertion(+) create mode 120000 p/p11-kit/autobuild.yaml diff --git a/p/p11-kit/autobuild.yaml b/p/p11-kit/autobuild.yaml new file mode 120000 index 00000000..f18cdb87 --- /dev/null +++ b/p/p11-kit/autobuild.yaml @@ -0,0 +1 @@ +../../tools/autobuild_templates/autobuild-ignore-accountsservice.yaml \ No newline at end of file