From 7d4bce20871ee75a6c8fb7e0b8393d7f8694a6b8 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Fri, 13 Nov 2020 13:35:50 +0100
Subject: [PATCH] Drop the APT GPG key from images that get it via the base
container
The base container already ships the GPG key for the Apertis APT
repositories, no need to have multiple copies of it.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
.../keyring/apertis-archive-keyring.gpg | Bin 1167 -> 0 bytes
.../keyring/apertis-archive-keyring.gpg | Bin 1167 -> 0 bytes
image-builder/test-recipe.yaml | 2 +-
3 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 flatdeb-builder/keyring/apertis-archive-keyring.gpg
delete mode 100644 image-builder/keyring/apertis-archive-keyring.gpg
diff --git a/flatdeb-builder/keyring/apertis-archive-keyring.gpg b/flatdeb-builder/keyring/apertis-archive-keyring.gpg
deleted file mode 100644
index 4a126de5bba5cebb7181ac74b3f1739cfea354b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1167
zcmV;A1aSMA0u2OIed0a=5CE;4O^e2-&lA{LC}kL#gDCF(SR^uCGShV8;!Z`47-CpB
zZ%z*lRW+X5xep<Sx<ohY9}PRWZv7%W;_G%=O#shcdeGSU=>>Un^C?yEH>sK4EM|K%
z017*b#^6JIw-&UKGMl5hXqoV;+c&i-PYB(gmvR<ie<?n%`KmX*dp@qi(pfwRcnW1F
zgXEZA%wBZ4sPo0!&XONk_w-7$Ga`R=T57$$4JDaVjT=`LOg(y}vqX#sh-zmKs^6Y-
zH-cQmxZBL7%}x!1Jh+V+ntUQo&Iu&{fW5LDsJ>QhW;!xR0(VqM@bK1R+*({@eWgig
z#ti^7WaM_^dQ)P^LxK$F2g6VCtjPRHpfW;IW$u@;x1A$y7+g>Zq|l_>x<$fR85S+}
zpqouCoM;R+Id)jVPSTB~LFjdTahX}I-^S(&%oqtck!NW`0?7Lv32N!l6#bx-Hi5EZ
zVp>*~i?7^0Bh=9B@W;n3-<dS@VY)Qfpwx!{QF`|fNli4nrzL%1;zQ{R>8)=p6-)`Y
z+j^I5$(UNDrsSo|h};fe_mbLc6*b{X#vmv14=xIJ`PxAuU+!qT@sUrni2}c?+51cU
zgLB%X_fCV@SUDA*+M^8a%{_f}m0#OdQKn_dcg%*!#Jm@nxhRZT+%xfH=Gy%L9;PBg
zZC$o<($M_-R;2(D0RRECLqTw5a&&2PAVG3tXlZt3AVGC>Z*5_8X=5N$X=iR}Zf77%
zWqBYxaA9L>VP|D>b3klqb98eqVQ^(~bZK)gZ*pfoi2^qS69EbUAq4_g0-iVm8v_Lk
z2?z%R1r-Vj2nz)k0|Eg60v-VZ7k~f?2@v%HEKciIk^H{K5Bv(F;dGnW`gaF+7u@ml
ztHOg^9UU!LSi~Zrx$3K&X8w$WXo!tEJY-3U+_ofokeOyJ`|9Xjjg-R8E=8XSqVaKJ
zlv4QuFAe`&MH2t%759=M>AO{C7|dnYBxh-;GT+0mw#QfETIauZ2+WDZE1<aD;j{yG
zJ-UB&=(^e|Ra59?YwqY-{&EVIX(-@&a~{JPP(2s#t(k(*N}6zA>8=6-3((~@G#eH+
zX{qUtqtV`!b-1iU6@_S*rD?_uW~)1Ea|y`sG=;b)O^>jg?mkC;9E^;pgW8{t5NiK@
zjYO&NYTfBjq+5Gud}%eVaRdhatGcmkXG2SsoYSn_w<Sk?UheCJxwFWv@Bfwo!%&kM
zcPQ^Jlonqf^A{6HT)WGG_b|K|uG<v%5JgzIEw%4M%|<lF+DtC~r@gucOaAf(iMvS^
z7j}2$wdaV>b|{75A|(B%;lVCGz5bv~=w}i6My*Oy)A8XE*{EHLrtr6A8}X)}agXkm
z#b&hUTV(1TV*eHTEMiy;Y#?waPWZ`Yy|L_m^Svp^3OdD_a>-Yl9OLfM&R69u00Z&`
zpO%2MHP71qVMi^fO7>(9b{R&x!$SUtl+6_|6E<A}H&0|z(0B1qOKUPNtS^HgGcp3L
h<p2yt1qz@)=j?Wgp*4_G)Z_ZP3sn!w=HWWwO#5v4EolG%
diff --git a/image-builder/keyring/apertis-archive-keyring.gpg b/image-builder/keyring/apertis-archive-keyring.gpg
deleted file mode 100644
index 4a126de5bba5cebb7181ac74b3f1739cfea354b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1167
zcmV;A1aSMA0u2OIed0a=5CE;4O^e2-&lA{LC}kL#gDCF(SR^uCGShV8;!Z`47-CpB
zZ%z*lRW+X5xep<Sx<ohY9}PRWZv7%W;_G%=O#shcdeGSU=>>Un^C?yEH>sK4EM|K%
z017*b#^6JIw-&UKGMl5hXqoV;+c&i-PYB(gmvR<ie<?n%`KmX*dp@qi(pfwRcnW1F
zgXEZA%wBZ4sPo0!&XONk_w-7$Ga`R=T57$$4JDaVjT=`LOg(y}vqX#sh-zmKs^6Y-
zH-cQmxZBL7%}x!1Jh+V+ntUQo&Iu&{fW5LDsJ>QhW;!xR0(VqM@bK1R+*({@eWgig
z#ti^7WaM_^dQ)P^LxK$F2g6VCtjPRHpfW;IW$u@;x1A$y7+g>Zq|l_>x<$fR85S+}
zpqouCoM;R+Id)jVPSTB~LFjdTahX}I-^S(&%oqtck!NW`0?7Lv32N!l6#bx-Hi5EZ
zVp>*~i?7^0Bh=9B@W;n3-<dS@VY)Qfpwx!{QF`|fNli4nrzL%1;zQ{R>8)=p6-)`Y
z+j^I5$(UNDrsSo|h};fe_mbLc6*b{X#vmv14=xIJ`PxAuU+!qT@sUrni2}c?+51cU
zgLB%X_fCV@SUDA*+M^8a%{_f}m0#OdQKn_dcg%*!#Jm@nxhRZT+%xfH=Gy%L9;PBg
zZC$o<($M_-R;2(D0RRECLqTw5a&&2PAVG3tXlZt3AVGC>Z*5_8X=5N$X=iR}Zf77%
zWqBYxaA9L>VP|D>b3klqb98eqVQ^(~bZK)gZ*pfoi2^qS69EbUAq4_g0-iVm8v_Lk
z2?z%R1r-Vj2nz)k0|Eg60v-VZ7k~f?2@v%HEKciIk^H{K5Bv(F;dGnW`gaF+7u@ml
ztHOg^9UU!LSi~Zrx$3K&X8w$WXo!tEJY-3U+_ofokeOyJ`|9Xjjg-R8E=8XSqVaKJ
zlv4QuFAe`&MH2t%759=M>AO{C7|dnYBxh-;GT+0mw#QfETIauZ2+WDZE1<aD;j{yG
zJ-UB&=(^e|Ra59?YwqY-{&EVIX(-@&a~{JPP(2s#t(k(*N}6zA>8=6-3((~@G#eH+
zX{qUtqtV`!b-1iU6@_S*rD?_uW~)1Ea|y`sG=;b)O^>jg?mkC;9E^;pgW8{t5NiK@
zjYO&NYTfBjq+5Gud}%eVaRdhatGcmkXG2SsoYSn_w<Sk?UheCJxwFWv@Bfwo!%&kM
zcPQ^Jlonqf^A{6HT)WGG_b|K|uG<v%5JgzIEw%4M%|<lF+DtC~r@gucOaAf(iMvS^
z7j}2$wdaV>b|{75A|(B%;lVCGz5bv~=w}i6My*Oy)A8XE*{EHLrtr6A8}X)}agXkm
z#b&hUTV(1TV*eHTEMiy;Y#?waPWZ`Yy|L_m^Svp^3OdD_a>-Yl9OLfM&R69u00Z&`
zpO%2MHP71qVMi^fO7>(9b{R&x!$SUtl+6_|6E<A}H&0|z(0B1qOKUPNtS^HgGcp3L
h<p2yt1qz@)=j?Wgp*4_G)Z_ZP3sn!w=HWWwO#5v4EolG%
diff --git a/image-builder/test-recipe.yaml b/image-builder/test-recipe.yaml
index 3e8a925..1ae7a4b 100644
--- a/image-builder/test-recipe.yaml
+++ b/image-builder/test-recipe.yaml
@@ -12,5 +12,5 @@ actions:
mirror: {{ $mirror }}
variant: minbase
keyring-package: apertis-archive-keyring
- keyring-file: keyring/apertis-archive-keyring.gpg
+ keyring-file: /etc/apt/trusted.gpg.d/apertis-archive-keyring.gpg
merged-usr: true
--
GitLab