Skip to content

Commit 215e73d

Browse files
authored
Changes for building dpkgs (#1243)
1 parent a6ac801 commit 215e73d

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

config/docker/build_dpkg.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ docker build -f l2tbuilds_ubuntu.Dockerfile --force-rm --no-cache -t log2timelin
2121
if test -d "${GNUPG_DIRECTORY}";
2222
then
2323
# Run the container in interactive mode ("run -it") to use gpg-agent to sign the builds
24-
docker run -it -u ${UID}:${GID} -v "${GNUPG_DIRECTORY}:/home/ubuntu/.gnupg:z" -v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z" log2timeline/l2tbuilds_ubuntu
24+
docker run -it -u ${UID}:${GID} -v "${GNUPG_DIRECTORY}:/home/ubuntu/.gnupg:z" -v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" log2timeline/l2tbuilds_ubuntu
2525
else
26-
docker run -u ${UID}:${GID} -v "${L2TBUILDS_DIRECTORY}:/home/build/l2tbuilds:z" log2timeline/l2tbuilds_ubuntu /bin/bash -c "(cd l2tdevtools && ./utils/build_dpkg.sh --preset plaso)"
26+
docker run -u ${UID}:${GID} -v "${L2TBUILDS_DIRECTORY}:/home/ubuntu/l2tbuilds:z" log2timeline/l2tbuilds_ubuntu /bin/bash -c "(cd l2tdevtools && ./utils/build_dpkg.sh --preset plaso)"
2727
fi
2828

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
usr/lib/python3*/dist-packages/xlsxwriter/
2-
usr/lib/python3*/dist-packages/XlsxWriter*.egg-info/*
2+
usr/lib/python3*/dist-packages/xlsxwriter*.egg-info/*

utils/build_dpkg-source.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
#!/bin/bash
22

3+
GPG_SESSION_FILE="/tmp/gpg-session-$$"
4+
5+
touch ${GPG_SESSION_FILE}
6+
7+
# Trigger GPG to unlock the passphrase for GPG agent.
8+
gpg -q -d ${GPG_SESSION_FILE}
9+
310
PYTHONPATH=. python3 ./tools/build.py --builds-directory ../l2tbuilds/dpkg-source --downloads-directory ../l2tbuilds/downloads $* dpkg-source
11+
12+
rm -f ${GPG_SESSION_FILE}

0 commit comments

Comments
 (0)