Skip to content
This repository was archived by the owner on Jun 10, 2024. It is now read-only.

Commit 36b4a52

Browse files
authored
Merge pull request #102 from AkihiroSuda/dev
Support Debian 12
2 parents 7a8bbda + c2611c3 commit 36b4a52

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

examples/gcc/Dockerfile.generate-hash

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ RUN \
6969
set -eux -o pipefail; \
7070
. /etc/os-release && \
7171
export DEBIAN_FRONTEND=noninteractive && \
72-
: "${SOURCE_DATE_EPOCH="$(stat --format=%Y /etc/apt/sources.list)"}" && \
72+
sources_list="/etc/apt/sources.list" && \
73+
if [ -e /etc/apt/sources.list.d/debian.sources ]; then sources_list=/etc/apt/sources.list.d/debian.sources; fi && \
74+
: "${SOURCE_DATE_EPOCH="$(stat --format=%Y "${sources_list}")"}" && \
7375
export SOURCE_DATE_EPOCH && \
7476
snapshot="$(printf "%(%Y%m%dT%H%M%SZ)T\n" "${SOURCE_DATE_EPOCH}")" && \
7577
echo "deb [check-valid-until=no] ${SNAPSHOT_ARCHIVE_BASE}debian/${snapshot} ${VERSION_CODENAME} main" >/etc/apt/sources.list && \

pkg/distro/debian/Dockerfile.generate-hash.tmpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ RUN \
4242
set -eux -o pipefail; \
4343
. /etc/os-release && \
4444
export DEBIAN_FRONTEND=noninteractive && \
45-
: "${SOURCE_DATE_EPOCH="$(stat --format=%Y /etc/apt/sources.list)"}" && \
45+
sources_list="/etc/apt/sources.list" && \
46+
if [ -e /etc/apt/sources.list.d/debian.sources ]; then sources_list=/etc/apt/sources.list.d/debian.sources; fi && \
47+
: "${SOURCE_DATE_EPOCH="$(stat --format=%Y "${sources_list}")"}" && \
4648
export SOURCE_DATE_EPOCH && \
4749
snapshot="$(printf "%(%Y%m%dT%H%M%SZ)T\n" "${SOURCE_DATE_EPOCH}")" && \
4850
echo "deb [check-valid-until=no] ${SNAPSHOT_ARCHIVE_BASE}debian/${snapshot} ${VERSION_CODENAME} main" >/etc/apt/sources.list && \

0 commit comments

Comments
 (0)