Skip to content

Commit

Permalink
use fakeroot + fakechroot on travis arm (unpriviledged lxd containers)
Browse files Browse the repository at this point in the history
  • Loading branch information
alekitto committed Jan 25, 2021
1 parent 15bc96a commit 1ad9efe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ services:
- sudo rm -f /usr/local/bin/jq
install:
- sudo make .installed-requirements
- 'if [[ "$TRAVIS_CPU_ARCH" == "arm64" ]] ; then sudo apt-get update && sudo apt-get install -y fakeroot fakechroot ; fi'
script:
- sudo bash buildone $DIST $PLATFORM
- 'if [[ "$TRAVIS_CPU_ARCH" == "arm64" ]] ; then fakechroot fakeroot bash buildone $DIST $PLATFORM ; else sudo bash buildone $DIST $PLATFORM ; fi'
- 'if [[ "$TRAVIS_BRANCH" == "master" && "$DIST" == "buster" ]] ; then sudo bash buildone_snapshot $DIST "$(./snapshot_id)" $PLATFORM ; fi'
after_success:
- 'if [[ "$TRAVIS_BRANCH" == "master" && "$DIST" == "buster" ]] ; then sudo docker tag "bitnami/minideb:$DIST-$PLATFORM" "$BASENAME:latest-$PLATFORM" ; fi'
Expand Down
5 changes: 4 additions & 1 deletion mkimage
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ if [ "$DIST" != "unstable" ]; then
echo "deb ${sec_repo_url} $DIST/updates main" >> "$rootfsDir/etc/apt/sources.list"
fi

LD_LIBRARY_PATH="$rootfsDir/lib:$rootfsDir/usr/local/lib:$rootfsDir/usr/lib/$(gcc -dumpmachine)"
export LD_LIBRARY_PATH

chroot "$rootfsDir" apt-get update
chroot "$rootfsDir" apt-get upgrade -y -o Dpkg::Options::="--force-confdef"

Expand Down Expand Up @@ -229,7 +232,7 @@ for DIR in $DIRS_TO_TRIM; do
done
# Remove the aux-cache as it isn't reproducible. It doesn't seem to
# cause any problems to remove it.
rm "$rootfsDir/var/cache/ldconfig/aux-cache"
rm -f "$rootfsDir/var/cache/ldconfig/aux-cache"
# Remove /usr/share/doc, but leave copyright files to be sure that we
# comply with all licenses.
# `mindepth 2` as we only want to remove files within the per-package
Expand Down

0 comments on commit 1ad9efe

Please sign in to comment.