diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2024-08-29 09:20:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2024-08-29 11:21:52 +0000 |
| commit | dc6448d1417761c84eea68a5bb5a578ac112f3b5 (patch) | |
| tree | 92bbec884a38996d0156337b7875f1480f4ecd2a | |
| parent | Using signed-by for debian apt sources. (diff) | |
| download | compute-tools-dc6448d1417761c84eea68a5bb5a578ac112f3b5.tar.xz compute-tools-dc6448d1417761c84eea68a5bb5a578ac112f3b5.zip | |
Using signed-by for local apt sources.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
| -rwxr-xr-x | share/build-scripts/debconf | 7 | ||||
| -rwxr-xr-x | share/build-scripts/debconf.d/0003-debconf | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf index 489808b..b739bac 100755 --- a/share/build-scripts/debconf +++ b/share/build-scripts/debconf @@ -693,12 +693,7 @@ EOF if ls "${DEBCONF_TMPDIR}/apt"/*.key > /dev/null 2>&1 then - for KEY in "${DEBCONF_TMPDIR}/apt"/*.key - do - cp "${KEY}" "${DIRECTORY}" - Chroot "${DIRECTORY}" "apt-key add $(basename ${KEY})" - rm -f "${DIRECTORY}/$(basename ${KEY})" - done + cp "${DEBCONF_TMPDIR}/apt"/*.key "${DIRECTORY}/etc/apt/keyrings" fi if ls "${DEBCONF_TMPDIR}/apt"/*.pref > /dev/null 2>&1 diff --git a/share/build-scripts/debconf.d/0003-debconf b/share/build-scripts/debconf.d/0003-debconf index bd171c1..305f159 100755 --- a/share/build-scripts/debconf.d/0003-debconf +++ b/share/build-scripts/debconf.d/0003-debconf @@ -701,6 +701,10 @@ EOF KEY="${RET}" wget -q "${KEY}" -O "${DEBCONF_TMPDIR}/apt/$(basename ${LIST} .sources).key" + + SIGNED="/etc/apt/keyrings/$(basename ${LIST} .sources).key" + else + SIGNED="" fi cat > "${DEBCONF_TMPDIR}/apt/${LIST}" << EOF @@ -711,6 +715,15 @@ Components: ${AREAS} PDiffs: no EOF + if [ -n "${SIGNED}" ] + then + +cat >> "${DEBCONF_TMPDIR}/apt/${LIST}" << EOF +Signed-By: ${SIGNED} +EOF + + fi + PREFERENCES_PACKAGE="" PREFERENCES_PIN="" PREFERENCES_PIN_PRIORITY="" |