Skip to content

Commit

Permalink
Merge pull request #15150 from jack-w-shaw/JUJU-2615_symlink_sudo
Browse files Browse the repository at this point in the history
  • Loading branch information
jujubot authored Feb 3, 2023
2 parents 4502d63 + 8025cc0 commit 5a1cd24
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ endef
# juju package. It's expected that the make target using this sequence has a
# local variable defined for PACKAGE. An example of PACKAGE would be
# PACKAGE=github.com/juju/juju
#
#
# This canned command also allows building for architectures defined as
# ppc64el. Because of legacy Juju we use the arch ppc64el over the go defined
# arch of ppc64le. This canned command will do a last minute transformation of
Expand Down
4 changes: 2 additions & 2 deletions scripts/dqlite/scripts/dqlite/dqlite-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build() {
fi

# Ensure that when apt installs tzdata skips it's prompt in all contexts
ln -fs /usr/share/zoneinfo/UTC /etc/localtime
sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime

# TODO: Make this script idempotent, so that it checks for the
# existence of repositories, requiring only a pull and not a full clone.
Expand Down Expand Up @@ -161,4 +161,4 @@ build() {
echo "dqlite ${TAG_DQLITE}" >> juju-dqlite-static-lib-deps/BOM

tar cjvf juju-dqlite-static-lib-deps.tar.bz2 juju-dqlite-static-lib-deps
}
}

0 comments on commit 5a1cd24

Please sign in to comment.