From 1bb5ad98ab900d345506cae5c0de270945179844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Fri, 25 Mar 2022 15:09:07 +0100 Subject: [PATCH] Refactor all PPA sources to overcome apt-key deprecation (#3560) --- .../appgroups/programming/packages | 1 + .../apt/githubcli-archive-keyring.source | 1 + .../apt/githubcli-archive-keyring.source.gpg | Bin 0 -> 1795 bytes config/desktop/bionic/appgroups/3dsupport | 1 - config/desktop/bionic/appgroups/browsers | 1 - config/desktop/bionic/appgroups/desktop_tools | 1 - config/desktop/bionic/appgroups/programming | 1 - .../buster/appgroups/desktop_tools/packages | 1 - .../3dsupport/sources/apt/oibaf.source | 2 +- .../3dsupport/sources/apt/oibaf.source.gpg | Bin 0 -> 5934 bytes .../desktop/focal/appgroups/browsers/packages | 2 +- .../sources/apt/chromium-browser.source | 2 +- .../sources/apt/chromium-browser.source.gpg | Bin 0 -> 365 bytes .../browsers/sources/apt/mozilla-team.source | 1 + .../sources/apt/mozilla-team.source.gpg | Bin 0 -> 7058 bytes .../emulators/sources/apt/box64.source | 1 - .../emulators/sources/apt/box64.source.gpg | 51 ----------------- .../programming/sources/apt/vscodium.source | 2 +- .../sources/apt/vscodium.source.gpg | Bin 3135 -> 2256 bytes config/desktop/impish/appgroups | 1 - config/desktop/jammy/appgroups | 1 - .../environments/gnome/config_base/packages | 7 +-- .../architectures/amd64/_config/desktop/focal | 1 + .../amd64/_config/desktop/hirsute | 1 + .../amd64/_config/desktop/impish | 1 + .../environments/_all_environments/packages | 1 + .../sources/apt/chrome.source | 1 + .../sources/apt/chrome.source.gpg | Bin 0 -> 9024 bytes .../environments/_all_environments}/only_for | 0 .../environments/_all_environments}/packages | 0 .../sources/apt/box64.source | 1 + .../sources/apt/box64.source.gpg | Bin 0 -> 2255 bytes lib/desktop.sh | 53 ++++++++++-------- 33 files changed, 47 insertions(+), 89 deletions(-) create mode 100644 config/desktop/_all_distributions/appgroups/programming/packages create mode 100644 config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source create mode 100644 config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source.gpg delete mode 120000 config/desktop/bionic/appgroups/3dsupport delete mode 120000 config/desktop/bionic/appgroups/browsers delete mode 120000 config/desktop/bionic/appgroups/desktop_tools delete mode 120000 config/desktop/bionic/appgroups/programming create mode 100644 config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source.gpg create mode 100644 config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source.gpg create mode 100644 config/desktop/focal/appgroups/browsers/sources/apt/mozilla-team.source create mode 100644 config/desktop/focal/appgroups/browsers/sources/apt/mozilla-team.source.gpg delete mode 100644 config/desktop/focal/appgroups/emulators/sources/apt/box64.source delete mode 100644 config/desktop/focal/appgroups/emulators/sources/apt/box64.source.gpg delete mode 120000 config/desktop/impish/appgroups delete mode 120000 config/desktop/jammy/appgroups create mode 120000 config/optional/architectures/amd64/_config/desktop/focal create mode 120000 config/optional/architectures/amd64/_config/desktop/hirsute create mode 120000 config/optional/architectures/amd64/_config/desktop/impish create mode 100644 config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages create mode 100644 config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source create mode 100644 config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source.gpg rename config/{desktop/focal/appgroups/emulators => optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments}/only_for (100%) rename config/{desktop/focal/appgroups/emulators => optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments}/packages (100%) create mode 100644 config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source create mode 100644 config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source.gpg diff --git a/config/desktop/_all_distributions/appgroups/programming/packages b/config/desktop/_all_distributions/appgroups/programming/packages new file mode 100644 index 0000000000..7f8d49f470 --- /dev/null +++ b/config/desktop/_all_distributions/appgroups/programming/packages @@ -0,0 +1 @@ +gh diff --git a/config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source b/config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source new file mode 100644 index 0000000000..b1cc6ecc77 --- /dev/null +++ b/config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/githubcli-archive-keyring.source.gpg] https://cli.github.com/packages stable main diff --git a/config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source.gpg b/config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source.gpg new file mode 100644 index 0000000000000000000000000000000000000000..ce02b812e5c2df973f8d4a7372cf4f7dac2d3d81 GIT binary patch literal 1795 zcmajeX*e4Q8VB$s1c`)(Zi=W-)2JiPwjv0LyN-&WI;!p?#I=G>Rf3|9I_7bWsH3z7 zqlOZ7rOv9fvQ?$D>Pk_=#936awmY-)?0(z#+xtBK|EKr;6$7(`Juma3fiS>F=0B+g z#hV3_n(<*^16_mv)cl#~TF&L2+JQsNKXAkjoTqbl8Ep_>IM|UGh6$dOe zs8X8C6f>(B@joB@wYMxp&%nB$+UVc9-+d12e`#Qrg#R={cq!Xe5Py+bCM8KsjQ;Od*#=@cD%yz zy<3A&?X$TH)|2DKKmQ0EoPHs@i}cw#_2t=xm}rT;qP=+D$k52)Na}65OQ9~72f1V$ zQ~kiwEzXC&)vFR)-9~;EiW%8p|)+T3D+3t?*?6?Y( z&9SZFA6|Vd@_UJny3D67i|Ul$lp&Fz@>TZ2lvo&SOv_vYur2Wp@N3bNGtqiX&jj3S ztb2#XqlDG8{ zMf+&_hKCaV69@enPX~?(O9P<*0#Zp>qe{_Lph#;&o7cSHmLO)@qlp_}(7#U&LJ5H( zLVbY%usB3a6eRLDC`3#gB#ZQMe)M%*xMEnYu`DEYU zIJrHenavHkE>k^#%p&YKUhH%5Xhb?1aiyD?DOt(uS)e^29K;MIG>)6?9!rDB z0k_L(gS* z1$(RxJN-opM5h60BRF9rIgjNUjEjgX8+ z5rELQp8&M~*D5ZxC?`CZ=3l50kPQ3JRQbY_-TDEuJFn2dVN!*X}u!d-+kx&{<4 zRu?l=KO1Lj3=+zx1DuM??nilqU&7zbs{X-;tQR@Ggu3DgtsN;g$Ur*uC8XL@ID+}( zv*$P+^8IL(%^4Tgq+Uf6tRd+U!*Gb-X#|lnLJOD_$e$p#c^=!bm=wYllqT5zPNSormx@KK=EZ_^gZ2CoQ{Vd&sPMz zs%66l-1>wLd4Z!Jx#p$lwe#t)iOA%0E9^Q$;a;f;7*c9>U=;rh7d0fc|F*9o1sz79 z%*GcmPF7|e|D6z|cK;@)13}}@IhbymVUXfUh`vMHNQp_ciw6XI$KVgV<8*gs%W_b2g3a*&HD4 z#OI@bl%D44^0b1Ci%H{^d6CkEz-atgoo9J}SWO3Z3Cn!rhWS6-V1IJ^Usjig#g84X z>O>@oZW|b_f(Z(iX@1ZX8}io=+;wE1#%31%)O1+9O{}$W8%8kaB_7O z43n{Et;=6`eI??HLleB7R7ZYRyZ|xd?f|V$ciFXnaXlt_q)Nym)$s{h6!o6RS@QYj z;6Z=|av(rJ_SoKXV7RU|A4yw*^fkqeFk^0~mMs%V(>IcH%xal3#$-ZN-Mr0(Fd}!o z>o$T#^r3|GrG4;LNme3#!vjU zzhngXYGSS*jo0MWduji!Eh0B*!U;Bz2c;}6-*@?HtLmp4`({dxS#u{L{f$#bD(Kyo zYP*0sH_Di|%+$P*3v#+;_g?0HdA^@6nvDd-d*+XO2Go|g297Co9ILKimLaYcr1Tu) zqap~epiuf3s&}e*Yq?vBinIx>K~lnMRIfgHkgXJF-P?OK5|i95IHg2uJ*n%+&O1x@ Vq3;xM{p)VR8fciw*Mont`WIgEFnRz0 literal 0 HcmV?d00001 diff --git a/config/desktop/bionic/appgroups/3dsupport b/config/desktop/bionic/appgroups/3dsupport deleted file mode 120000 index 2fc4a221a8..0000000000 --- a/config/desktop/bionic/appgroups/3dsupport +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/3dsupport \ No newline at end of file diff --git a/config/desktop/bionic/appgroups/browsers b/config/desktop/bionic/appgroups/browsers deleted file mode 120000 index 5814826a6e..0000000000 --- a/config/desktop/bionic/appgroups/browsers +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/browsers \ No newline at end of file diff --git a/config/desktop/bionic/appgroups/desktop_tools b/config/desktop/bionic/appgroups/desktop_tools deleted file mode 120000 index 9135d28584..0000000000 --- a/config/desktop/bionic/appgroups/desktop_tools +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/desktop_tools \ No newline at end of file diff --git a/config/desktop/bionic/appgroups/programming b/config/desktop/bionic/appgroups/programming deleted file mode 120000 index 0f5ee0d7c9..0000000000 --- a/config/desktop/bionic/appgroups/programming +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/programming \ No newline at end of file diff --git a/config/desktop/buster/appgroups/desktop_tools/packages b/config/desktop/buster/appgroups/desktop_tools/packages index cde6570ce2..23f24bfd41 100644 --- a/config/desktop/buster/appgroups/desktop_tools/packages +++ b/config/desktop/buster/appgroups/desktop_tools/packages @@ -2,4 +2,3 @@ bleachbit fbi gparted kazam -system-monitoring-center diff --git a/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source b/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source index 2e6ad7c703..af14428936 100644 --- a/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source +++ b/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source @@ -1 +1 @@ -ppa:oibaf/graphics-drivers \ No newline at end of file +deb [signed-by=/usr/share/keyrings/oibaf.source.gpg] https://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ focal main diff --git a/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source.gpg b/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source.gpg new file mode 100644 index 0000000000000000000000000000000000000000..b5a8ebbf68cee1e03552ce2cb35fb2287b68fbe0 GIT binary patch literal 5934 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 literal 0 HcmV?d00001 diff --git a/config/desktop/focal/appgroups/browsers/packages b/config/desktop/focal/appgroups/browsers/packages index 6821f1236d..54092e05ef 100644 --- a/config/desktop/focal/appgroups/browsers/packages +++ b/config/desktop/focal/appgroups/browsers/packages @@ -1,2 +1,2 @@ chromium-browser -firefox +firefox-esr diff --git a/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source b/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source index 428bf8018b..3e9095c4dc 100644 --- a/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source +++ b/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source @@ -1 +1 @@ -ppa:saiarcot895/chromium-dev +deb [signed-by=/usr/share/keyrings/chromium-browser.source.gpg] https://ppa.launchpadcontent.net/saiarcot895/chromium-dev/ubuntu/ focal main diff --git a/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source.gpg b/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source.gpg new file mode 100644 index 0000000000000000000000000000000000000000..95cf6bbd3345b3c727616983f6fa65b7f6d92208 GIT binary patch literal 365 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 AxBvhE literal 0 HcmV?d00001 diff --git a/config/desktop/focal/appgroups/emulators/sources/apt/box64.source b/config/desktop/focal/appgroups/emulators/sources/apt/box64.source deleted file mode 100644 index 20af820d04..0000000000 --- a/config/desktop/focal/appgroups/emulators/sources/apt/box64.source +++ /dev/null @@ -1 +0,0 @@ -deb http://ryanfortner.github.io/box64-debs/debian ./ diff --git a/config/desktop/focal/appgroups/emulators/sources/apt/box64.source.gpg b/config/desktop/focal/appgroups/emulators/sources/apt/box64.source.gpg deleted file mode 100644 index 56b6eb1bca..0000000000 --- a/config/desktop/focal/appgroups/emulators/sources/apt/box64.source.gpg +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=yWSi ------END PGP PUBLIC KEY BLOCK----- diff --git a/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source b/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source index 0eb625d27d..84e3a3ac6f 100644 --- a/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source +++ b/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source @@ -1 +1 @@ -deb http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main +deb [signed-by=/usr/share/keyrings/vscodium.source.gpg] http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main diff --git a/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source.gpg b/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source.gpg index d4fb5f708a58a955a84f709149cac35e90154139..97a235ec8ba84669369cbea57f76abca6af09690 100644 GIT binary patch literal 2256 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 diff --git a/config/desktop/impish/appgroups b/config/desktop/impish/appgroups deleted file mode 120000 index 97784daa05..0000000000 --- a/config/desktop/impish/appgroups +++ /dev/null @@ -1 +0,0 @@ -../focal/appgroups \ No newline at end of file diff --git a/config/desktop/jammy/appgroups b/config/desktop/jammy/appgroups deleted file mode 120000 index 97784daa05..0000000000 --- a/config/desktop/jammy/appgroups +++ /dev/null @@ -1 +0,0 @@ -../focal/appgroups \ No newline at end of file diff --git a/config/desktop/jammy/environments/gnome/config_base/packages b/config/desktop/jammy/environments/gnome/config_base/packages index f83331dd2a..ba8b31f093 100644 --- a/config/desktop/jammy/environments/gnome/config_base/packages +++ b/config/desktop/jammy/environments/gnome/config_base/packages @@ -33,7 +33,7 @@ gir1.2-graphene-1.0 gir1.2-gweather-3.0 gir1.2-ibus-1.0 gir1.2-json-1.0 -gir1.2-mutter-8 +gir1.2-mutter-10 gir1.2-nm-1.0 gir1.2-nma-1.0 gir1.2-polkit-1.0 @@ -54,7 +54,6 @@ gnome-settings-daemon-common gnome-shell gnome-shell-common gnome-shell-extension-appindicator -gnome-shell-extension-trash gnome-system-monitor gvfs-backends hunspell-en-us @@ -111,12 +110,12 @@ libgweather-common libgxps2 libibus-1.0-5 libical3 -libidn11 +libidn12 libijs-0.35 libimobiledevice6 libjavascriptcoregtk-4.0-18 libjbig2dec0 -libmutter-8-0 +libmutter-10-0 libnautilus-extension1a libnma0 libnotify-bin diff --git a/config/optional/architectures/amd64/_config/desktop/focal b/config/optional/architectures/amd64/_config/desktop/focal new file mode 120000 index 0000000000..c17ec919b5 --- /dev/null +++ b/config/optional/architectures/amd64/_config/desktop/focal @@ -0,0 +1 @@ +jammy \ No newline at end of file diff --git a/config/optional/architectures/amd64/_config/desktop/hirsute b/config/optional/architectures/amd64/_config/desktop/hirsute new file mode 120000 index 0000000000..c17ec919b5 --- /dev/null +++ b/config/optional/architectures/amd64/_config/desktop/hirsute @@ -0,0 +1 @@ +jammy \ No newline at end of file diff --git a/config/optional/architectures/amd64/_config/desktop/impish b/config/optional/architectures/amd64/_config/desktop/impish new file mode 120000 index 0000000000..c17ec919b5 --- /dev/null +++ b/config/optional/architectures/amd64/_config/desktop/impish @@ -0,0 +1 @@ +jammy \ No newline at end of file diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages b/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages new file mode 100644 index 0000000000..bb868be8a4 --- /dev/null +++ b/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages @@ -0,0 +1 @@ +chrome diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source b/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source new file mode 100644 index 0000000000..36f050054d --- /dev/null +++ b/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/chrome.source.gpg arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source.gpg b/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source.gpg new file mode 100644 index 0000000000000000000000000000000000000000..acdb00db55c946dffc3836808dcca7b3ce99fa1a GIT binary patch literal 9024 zcma)>V~nOzm|(xM?Jm2^wr$(CZQHhOciFaWcDc*$!gkFhyR-9SXMf)(H}_3W&dHNE z1E>&GqoPiiCLU<(P{S-B-=7WOvtQZbGs~9>aONS& z3U1Rm1O=r3t}Qy{{Rs8@`s2s3wl1Cc@JNYDJc$P+#{^y(pnk{V9@?!pi z=hB0KI!u*umQ0WeSp>0U0J`D=jgoNRIHI9J#wlppPQ+QVJPBIFA1*seE}JxM61^SX zF@^1URsk;G?GxLpboZU)>(Ug_>+r!o2~=eEdiVk41Eo@3dmYgX>C3+gt&VAuvwnEKH)WBBy9JD$1ShA@p@;b8&gM%OHa{w`i7tqk57|uaiZ1Xo zDM?pv@Rzihot>Gr2{nO)tr0DOw1usUJAu4`k(Gg&34xM@nXQGb8G)3E2LZSB_YsZ# ze;zr}Seba(7&tkbIP#nQ#|5-Tb~e1>MxZE2zyM-kY!Gl5C`bqpU{Ew*NDxqTU=Sc+ zJRo2Ue=uNCG*>@hEFb_h6k+o@c3Uk> zVzBf&y%kr!R@I~;m0wFY5hoQ)&-6KNzBp61%l48Y8a#RgSdUb@4z{4JX!;WaytXCAxg$g!Vk!YsAJLzGfRon zYxQ-#m4)(%O6?>dPFPJ|Sw9-qQj2D%Sn5!DP_?WKro_lt9HByC_Z#F90qoSp8lH2-;JPah%yGVX#2hVMc(Q-x2KQ&< z*&|X|3!$cbqu99~)ITUD@Y`0Nlb_X0dTpjZ&EY*t-|^de#FE-XCBE*!TIp~yZz^V< zcwu25RpYEcj?ElX(pP+&&Vv&lU>N1@z*0;COme&=lOQ@z-63!~Hutc(9YZBghp-@3 zt40*^<592$6FJ(C%^K{{teU-+hYR>?=6@B1rz8=R#ad6SblzQ)yLA)Kj5ZuaNUq+T zy%HUV^OP%)Fg8+wQo8Y5#jF45tznby1Q7|B0LATb;KXpK!`yB1+ zhe3aqa*^u%%WxqyrybrFARA6$E8raU7ptDP#G%M+8*KW!qG-lHwA5gu7l9A~9hyDz zZH-_-JSs~9a;XS3lg5`ZK&1OBdCmNkno4+G398)z44@bAW)*N~H+s>q`XtLqN$6Ji z^uMozy(sKXl!=$h_Xq%qE%Y`dll z`WtQbzn}TDID{l-CC(p{vdX%JFW-dWpiEIBg1vQxBWzz4*lpnZ?-3TEuAkUz*=k z4sb0;NID#{{INT|^Xj}V^*`@kK=tvU~E|lysZkmx@F{_;L zJWtbf*YPe%;9PNYnP7W3cjej6Iv)O{!SH(PS!^t5=|XyGeFpl{y6iT>u5>0f&sAw; zOO?$7@12(juS&kTE7a_FM>O_}2XchON3>3hKlPlE<4>bLPRGS=k-c+oF6D6zIe8x1 zQ<7PgZpAF1bblN*PNZU|x;Ah#Q!WQpfwWyx*_AV@K~p9wJgirt03ZPYfPN|eryc)O zjz9k|J39SuJqoxuo7*{BID1h1|5-8um>m=a2pB*F2K)`%|B)p)8YD0jG|Yd|8aQH^( zf{46v^Sxm~J8qXejdXR@BH0;c2wP>}=>Di~7?sr3bTNK%=bpUozv4MI<;nX{7*#%I zyu+b(jJwc66&|ef+8K$=;0xz1w>U|`F7{F?@ z711}YdEA=-GvusH^!p8s7AmY7{d>j{-Gs!GH@;Q>oU^6tY%E!0wMf!awCsyOvYmU( zYvEC&RF;M%$nlWbVbN6yWFt+uxyN@)kv|mHC@s*;$E1Sr1(`FyS)gae$N!uw(u(Xc zSIU*k!KL4*^gQ^UwGZK_Rlz;kWKh?IEEjeEuV^d$U0_{VPXq>C3rxo~wY6p*ni~pl zJ(g7xPoRA#CdHT#p`Yeka&GGn81=Jq4Bk@Vh!B(lHl28*!P6Vi_YcwJuxB|U(sqzY z?&8Cta8Xdif35@nM-E(z-+vWd<1Qdig9%G>tU~WH^h4fVNWnHcY)IJ^kV_G){d0XQ z#BnmgWnAWs_oomvOXdG{&+Yd;3}Vz=46UaiCt`qH@~2&_FEFrL%HK@%cR8X`>ML>y zfIKUlMO*GAhizF?L#>-o4Uc@3!?^DjtHH*M{S#&t-5Ny5##;c`i*X-Eqo(KPlx($q zwR2PZzL5?OaxSXNcm+vBl-uQvwt#vpSkCDVg+La@Ar+^B1!V!ua1pUr%Z(XX#SZm- zbHe4+$6ES13TW0mqG1lS;QRW(B{Vw7``aGMC{>TRVs4#o_arp1_W=_oUmty7h~P8w zTlwakZazMX-#*WP(x-?+tEZ?)g`}PcVeLXysU4%p%awQ9O{|!G;7eHoQpTF) z3LY=a)X2f}-yDNNjf+zH1tipc;RbnpJJ$6?^p+Pyd>1*(eWyCy0C-}3WG<=zY`ftN zby%$zf684A7e(=45TB5P64?BnDriLa$%@gTv&Ej-G^8FS2(aZs$VuVixuz68Ts@O3 zzA&IM;}e>LEF)L>is&KF@|OE`6Hz&r{Dfh#9Dy%=G3h81z2pZBkWR>Zy7$A{H5ro# zVa(hxvxi9uPIqU9&vvh<@?q7<^vbp>Gu!rQ85q0cEsz(;vmn}E`b`m!p@rlDMG^NE z(-hp>f2_zo{YrcTj+WyiU8Ib&Z^sYI!`!1|)&t=vhO|2dGNN9C%J0-3v)lsG(GQ_- zng6~#;HtM`o88?yWivOOaJ_!Y`WmKjCC1@-EHyTGz@kSAzbrUr=U`3h!z!d+- zWBob=pjiKAz9IfM^9>(LT9=YBT(g1z8N!zUeVy}PFR7n$d<6TzQZ$+waA|5cVNHwS zIm}*lz<&V!E3N}Nz;BBr2<`4-rs1c^xnEldIqQ7PX+0)kAfK0a;e}BAyxhEPd92=a zc-Q>*l0$nxECfAG5LXK#T2{=BB=`?SQM0`SSV_^D+o{(@m%!dKAaA>SSa+FH#m|B* zO)>Pb(#QHcdL+MenC=_Zj3UWoDeejJoi} z>eHSDj5}J9&C5*kY8trm3qFYV$!-mQm<;ZkVS`Vv{Jz`k<#RDg)^+9J1W%$!8eYww zXF{8PP-{#^Q!mXmo@wo^LFUYWE3tTjaA~`C>$tI6`Uiq)A9zovM?Ifj!nS2ZB5a9{LTGOP!w6^;m8O0v zWt!Hj+3G=K6ge%vP%`XtCghCO|d`MsK{&ug1n(qA5S4XeKY6 z4ri;9)3^0i1j%Bc%4!c|S!P-b;Bh$)*b(|zx8{lIr*bTBNOSv!2qX5xCnd3Pgl83Z zMIIveNQM?*^sW<`PrNP5Sgkej$LWh5+BqS^ShQs5eEvT28&Ahh%9JRVJRi?zDhidS zl)+kXux&xOCb$*U6=b zvvkItt!G8)y*G(Zkb(q*#>|iY0QxH<6ojwtyn0wq%oh4UHzArz54>X>>15-rvZ{yq z2#QLG(L#5HVGIZcMk|UlZ0`G%5Pk*~dBs9yg|y+5=~Ib}y(fdowoHQlivFZ33U)qCm{CdVaU z7z_rUVEJRdjRs4-h%IeSq6u3qhr}c@(`vqq1=P$DE5q(waua!rYQ_LT<7~ILFDsKZ z5E`D9=bYG4Q`ig3{DP(Y0cU)NlZyyUF=3qWl|AQj5IPvsZF^Hgpb`OA{L^osVe!{) ztz$V;FMtcj6HBFHjp9H!pTw43gRRU!l%RPoRIp(F}PbghTi0cmdDW6N(0FPw^unv@dS zK}g=8S8DtK6rhg3KzJsbGwE+1HuQ3GGL_=kc1ZCC&?uKL0$t*$jx3jz;oX zdG>0|K@^U3()Bq=p7?25Nq|AoBR~$|!g>ESzP~u!qJ>0}drd4gxEf8)_!NQuSu@U@ z&$3+2zn2edPrlTY69L*PQcGBHBCRqbN>C_Pdn-r>JzrHd~H`iU`Lv| zWVyg+?jA8Uq>T$SDbPrqIuyWh-lgY?H4T4qXOx zw}vs&YugrPQ0rsLYgZ6QP_2TawnBfA{Z1EWG^V_oEWGv1cFx%j;u;W@VjaChw)-!_ z&|;xhyK8)lZCwy+iC}fIbV=jz9N)@`w-fn8qJEsIS8a zYd&Xi4xG=45dE}&!z}yd60nXC^RPk0H8aCQF+eHfg(C;h;8&i`#N*adTH&wG=VU+) z1<7PnVkT))JcAkRVl3e{1$G%@L*(L=?`CG^=^$4H0$ruIs+7BMQP646YUfJ##tgRa zyh+c~^K;j?AMfqW%V(p`>LgUqfMYADt4SV`s-#RKNqY}d|Lx*0ou_5kz;zWy&Z08b zBaQ^FdZ$28lNTM)q#%PqYq3A(X-ul<2k+Fg#PDh`QCreWccsFXIeLu{7ZwMr)LI!B zqnH-f?ojiE46u{)+KTEN&Qc-bM}O_3!^SyBYV4WOv2nda?AXnEo!d~iVM)(WUriTh`ah{72t@}r;vdGTQHWk4RAM#H)ZBR)(${+4vIy-gDNxSeR2*k zYAiSPxTyja?-kweSD+G)!U-W%CFTwOjEl({+C8g4%DDi_;mZyc+XP9u_2rzuv_dHmX!3HP1A zCm9z`&D=SncujODWWPtm;RnzDA-2e;JP#U^pvfilL;SXZKSjk4WMuYt2Z?PgCCwzd z82f6f?wW(VPhd%mx5z&mk#b55PCi1XPkSRcFEw&sVS%z1Xn3~fd@&$dX^`$((vv6= ztjqMWM8*0YxAcD?vpeh-Ur)0S=wL;>X#AG2vAFK?Rb)^`n^3I&vO_uvpRoEPKzDqJH?$ot}d`MctqmQ&v)GJ!@DsyttRE^moJY5df zq@^?&Whg6?lCMLxnnOLf_Q?xrm}zK2uPYYl5C?1f>V!tYMsnP_CTE(GM(ZX?MWbykXKR@to?i~K3YoqBAgiR zj<7(hRLsy+o@}|cy)&aVM}=;Q3`v9#Qpe`6ht8^UW)V0$vtl@nn7TDh6W|CEQP5Ze z8G=%+*2#KJe5qVlhcn-t9n zA`jnh(&w%;Hp5Jc)48E4gHod8M0mFP;%+R!Dk^C!Y8fNi$TxeT)eRQm?mndb=s04@ zSE3x+n6FeSvUuY880n8Qw{>tU47UbK&LA<8JUkdD1YBc~WQMI5k?CPS3@@EV=4DK0 zb2Y@!iZVZm!cPa6{XQB^^(DUO7{?y7)QXG07NvZ7S^p&~kl)+NHx~botU!KmE8jEU zS#j?+5#w&^Mw#YE_)@04SY&}5bz3x^%FR&^Q~GrQ1_7JX`P&` zo}+_OHQ;7aEOVa5OS1~;hbWqiZ@eMMEb;QkR69%L{H}lXn2v#oY4`fs;`f)Q{QYBT z4KAe-m~smn>u5*IM^JkuLaZ6YG@~>&f&uT#?qYXVH+?A_L;49jB*o`f)5I2^Y_fmICH$fHJe}jlyYRjwVOxnL%^s@r!@jBxEt(xkPs!HYTt1 z&p3Z1aff?x8TS|YdRF=yQU^x3KK8bKwz#^&d4iS2wyXXqG&quaSA8brPX0=*wK%uk zNZC9R*ASXEB^QTYgun-dDw}#5yqSH4%|$CerCb7giYfSs*ze?r&a!`?r#Cyya2s7%HH2uZLj@VlSWGw&f~| z%46n?rN2on2tA!rvWPKTNwHVk%!@X1h@g`Q`)*F8(b zqg@JD3hJ^}b&*}Z)z7cf9k35W;Rt~oQLY!fH8Fa@Wh;qT=83s#dG*4Lsi;w5itt}O zO?eOOB-p+~aXeuqDcRf=xR@XBwsRe^u82IjbVj)q-7dE;zDP9YoFnilka^S^1x~TP z^H<_|O}Ca|mtC>yMCkm$j{~(gZSQMk^t}YM6yaVOuY16yJROR!n|5r;qxx7@ZS23N zI1VL=xmzzE+0aDl)B7xlC^4{fEpzZmvvc)dKo7qnjqW+Y1qf}mxo=lU~%>NVJMQ$I9r&l~>q zPr3B?!h*6mW>TfKFiv{Ok58ARFDJtijj&HI;?;x+3Zofmw?6|u4oQH=I(DMU}Wgi;B*Z9Y6l!40> z%ICP>)udA&ZA%ln-fp6_Un}@(2L3Lxwvym+;AW~o`*tco_U(}JUeVX$)w!-Ai&AuT zBI-~FjI35ajG`H!SWdlP_ywNeCuV{U+VQ9qd)2>&4?ikpDdUtA7NSA9)npu7>U&-}8@C)f1}*d7TS zV2Xh9g+vksE1(R3s*THtOhB$uejRi13kP=mYkvhZu&Lj98M~`u;*T^qC63kWtje<( zVijGW`9-J^Dc5=mlTzR%v`GB)px`TypZH^F23PtkWU_ifkG{X5Lu7|tLH~CNs=&7#KU0lP3 z{ekl2FmO2&%?e9a#Ojw(CULc%UZvxw%zli_PSe%4vxGzNjduAwTdB}|MX&wrNrS{9 zS12hH+kel>Hx~a>R=#Jxvm)E*(^%9N6%`1D@TCYRMxvD8p1xwm1IH3ABw=rj{7&v| z`{@=*aFBv|V*kvBo@|w`7*rENws_li-AOjOtbTh4B>g&m#h`YGkcZJ(YT-{fy$ZI* zc)8ZUCqhv~a1dNCUFA=L>`H_&l=Td#BekQ5X)?NKoPlf__38`qB8~?cbo>=a@==z! zzeVnGuh19+%#p)5z5?G-X`+qrynZz{&TS22>yd*@c}D^LQBQabf6YOBp>@T-FZ%<_ z=Vs3~DjPL)4RP>mr-3Cs+(=SV|Jmhydo5uZM8*bOKUFO-nwoWQiyW2#&S6`})T;n| z2eKZtTl^XI5=?Z+sw|jonR$AlE`Ma95G3XVP&))W^G-U#*c$N*jkeeU=VAk;6QXUi zkTA*~TeRulgUv7v1Y32)3V>vCP*&``$}omWK`a+0Hg7OUh<3934R=%;7y*~_5I+vA z|K69^<--$s@3*Q^TtXbfnvF~vc@!bEVaA5={7EhkXMJ-p{LyP5l2oUI3B%uuo6Io` zjZ>PkW%{1Cgtj0mVQk{ef63c5$}b$*Gwg%RF)n~-al(N}Rern3nV8H@#B38P=Qkkv z4(a@};FQ7#mtCwm$aFguZoZjE%X}xl%?%JFBQtTfFb83J1cQNHY|HD(l@{>kc68CZ zx!LZ9&f25`JSau(Bm zv&IAkqegtmYou&TD~PA|#(-+a-b0uEsyLX#+9VR+Zpn&4KNtZ6ZBcAq%p3R2)&|<* z>4{?CdYk{F894I?r!dU{M!+9`g5U+gZ>woP1*vfxQg4R4o5Uq7E&#GI!g&p~>vg#f zI25l|YUknFH>|Gz1ccAfod=xxle5V#;kA;=jJg=@#^6M@nwC~$n5=ytt@cxHPr>a1 z*w>S5R;p@S4o%6q`LOUeL_ag4iH1y!DVu$C(W1xt>MF0D5AT}x$mda+-E*Agkd#p) Y<7{+(-Dpk!o?NydT^uyO8A|Q{0-*Qf$^ZZW literal 0 HcmV?d00001 diff --git a/config/desktop/focal/appgroups/emulators/only_for b/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/only_for similarity index 100% rename from config/desktop/focal/appgroups/emulators/only_for rename to config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/only_for diff --git a/config/desktop/focal/appgroups/emulators/packages b/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/packages similarity index 100% rename from config/desktop/focal/appgroups/emulators/packages rename to config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/packages diff --git a/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source b/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source new file mode 100644 index 0000000000..a0a890a961 --- /dev/null +++ b/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/box64.source.gpg] http://ryanfortner.github.io/box64-debs/debian ./ diff --git a/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source.gpg b/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source.gpg new file mode 100644 index 0000000000000000000000000000000000000000..2cd6f76da6279122b7688f88e3d4536ad7f6ef6c GIT binary patch literal 2255 zcmV;=2r&1V0u2OU>sU|$5CFm+Qd1qi{;AasC55nwJZ)mXV0U*jf;Ey(*rN^ZnPUmR z&U5o?JGbMOlPDsQxCv9sj3l@%tVrBy3YyQ2!>v3@CkN2r#b@Wb?O+k?JwY`#y6tGH z`VG?2^N=AAw^T>*r(C03g`~yDm`2=zdhEq62OtTqUZMc->kjskURgtN?ZL?93AlEw zqgaKH8YsN*9w3fOku6BT1~HtQ?&d?GKvGMwVvq8P_F<@+Zn9Oz$Q{xqd3qb_X2mxD zLtw~p)D8_NYW-@Vxu@Hrh;r&~RciUrVlN}bi<5?CIOmS9{#SH{ zogZ9wR-p+rYdruF0RRECBT{)`ZXiZ)a&&HGav(f#X>Mh7ZDnL>VL)eXVQFkGV{dIf zi2_ap69EbUI2IuU-Ylz+Qn$&??{GE5za|9uQn(tWA=B2+r}k%eV#xQs?Usk@G}<~S@;(}DAdPRM=C zM%+|kNEL$IHDR{JvVw*lnNJ@O)F40;d8xVCpr4};+fjRfdw>9KLVQV?L){F%u-`yP zLrhb#*MHy|Fyj@8cI&y^i3Xxfb2+s0lFs{;o){0_&M?tQ=#t*Hx#p7eiBOrU6(%6E z#tW$|;BtbZS7DI;JLW)A@y5EklE^&qPzF8&1nlx*!U8I?qB9he<^X)i3SrzNj$XI; zzw|Hi198i>mvB`o+@iY*5TCP18Kc*uy@@A2i_lmscg)tZOQh;I7bRv%G>wbHwgpux za!Ra^6mNOf2S|LZ{?Y2xD0gnmy9^)T;|W{is4PtipTA$N*p`J!sUwN@QlOvT%ZcUCq9*LwgKk`+tWJ)~ z((=RzB~7wNe7tGc+3YaoBTJq|ZaZZ=V!@~jOG8Ms&^51Aq1`q7tfvLuHZnI0iFBE} znz^}{el6y6q98G|&MB7SoIRmC)42i-1Yqk}PyrAC)q?q0v;d7y$;y_X=y$s{eH$`} zbBL#P+74<7aBbx9k^)ZE^y(~a&W5qv9vi-*VpvaawovP~U7X48SXggPpFp;N`Ihgc)SKsI`dY~)A z#Uqi**#)g=g%bNTdJSEVFhOPvpVcYPUh6*q7wXf9v2)~qC5BDGDsq70sjKuvQsQ=Cm&1_%od91ii86OmUpaot=g{bdmaC7fz_Ox7ZB%KdEv ztf<9-3Yn7~*j4kz-z#t>!Xxw5bQ%dc7xtvtP+(OnlZ`3S>dWE~b>|Z~d!Y6-BTY>} zP0b}Ru5>#TlZ^v^1S%)5jWL5BM|&=l01*KI0f_=O1Q-Dd03a421mBt)g(Jf*?*A%m z+ILy{9iQy1o&^G6>sU|%8w>yn2@rQ#`W>I_te$dn5CFRrJr~sV=pHr+5lU=kW1d5J z)VjHWU3K@i4&orv<0i)Rd8vltapo?0bs5rQ^_^TTTTkW$0&7Hn)M!-_rZc&5)1zMK zh5Kxkv7QA{?3Anb0>m><7>c~ABgVTboX8BmkhWMP=ng&)I_~T zeej-f6|nY&3g!W^YJb4Z$(@rs&8yq0Msf@FgmxB@Wh{t%(PdtNd2h5^;9T-3>8ML< zB{QjmSaKto^IX?!^~){%0j|7uF@q9Us(T)G>+2)|{=|X=c;~!-A@)#+tn}(y^~b-C zc^3V9{Fc(#XunWVQ4;Ig$bvk>3LFNxde@7!swf82byx|H3H%aMaRG>1E0WNX`c5Z!2%`3DNW7h}$iU5vUWD-~>l@QbgMkM|x_$GmAIvN`%@@Q{({tqr zX1J3+CM47WH|+}1poDcMw_ipKLB-sMh+xU_YS$|VRau)3ty#z#srgn+;4oy9Wp^xl d%Y}`zVcS9TUI1Y Assumes yes to all queries - # -n -> Do not update package cache after adding - run_on_sdcard "add-apt-repository -y -n \"${new_apt_source}\"" - display_alert "Return code : $?" - - # temporally exception for jammy - [[ $RELEASE == "jammy" ]] && find "${SDCARD}/etc/apt/sources.list.d/." -type f \( -name "*.list" ! -name "armbian.list" \) -print0 | xargs -0 sed -i 's/jammy/hirsute/g' - local apt_source_gpg_filepath="${apt_source_filepath}.gpg" - # PPA provide GPG keys automatically, it seems. - # But other repositories (Docker for example) require the - # user to import GPG keys manually - # Myy : FIXME We need some automatic Git warnings when someone - # add a GPG key, since trusting the wrong keys could lead to - # serious issues. - if [[ -f "${apt_source_gpg_filepath}" ]]; then - display_alert "Adding GPG Key ${apt_source_gpg_filepath}" - local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})" - cp "${apt_source_gpg_filepath}" "${SDCARD}/tmp/${apt_source_gpg_filename}" - run_on_sdcard "apt-key add \"/tmp/${apt_source_gpg_filename}\"" - echo "APT Key returned : $?" + # extract filenames + local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})" + local apt_source_filename="$(basename ${apt_source_filepath}).list" + + display_alert "Adding APT Source ${new_apt_source}" + + if [[ "${new_apt_source}" == ppa* ]] ; then + + # add list with apt-add + # -y -> Assumes yes to all queries + # -n -> Do not update package cache after adding + run_on_sdcard "add-apt-repository -y -n \"${new_apt_source}\"" + if [[ -f "${apt_source_gpg_filepath}" ]]; then + display_alert "Adding GPG Key ${apt_source_gpg_filepath}" + cp "${apt_source_gpg_filepath}" "${SDCARD}/tmp/${apt_source_gpg_filename}" + run_on_sdcard "apt-key add \"/tmp/${apt_source_gpg_filename}\"" + echo "APT Key returned : $?" + fi + else + # copy list if its not ppa + echo "${new_apt_source}" > "${SDCARD}/etc/apt/sources.list.d/${apt_source_filename}" + if [[ -f "${apt_source_gpg_filepath}" ]]; then + display_alert "Adding GPG Key ${apt_source_gpg_filepath}" +# local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})" + mkdir -p "${SDCARD}"/usr/share/keyrings/ + cp "${apt_source_gpg_filepath}" "${SDCARD}"/usr/share/keyrings/ + fi + fi + done fi done @@ -246,7 +254,8 @@ add_desktop_package_sources() { # Myy : I see Snap and Flatpak coming up in the next releases # so... let's prepare for that add_apt_sources - run_on_sdcard "apt -y -q update" + run_on_sdcard "apt -y update" >> "${DEST}"/${LOG_SUBPATH}/install.log + ls -l "${SDCARD}/usr/share/keyrings" >> "${DEST}"/${LOG_SUBPATH}/install.log ls -l "${SDCARD}/etc/apt/sources.list.d" >> "${DEST}"/${LOG_SUBPATH}/install.log cat "${SDCARD}/etc/apt/sources.list" >> "${DEST}"/${LOG_SUBPATH}/install.log