manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix_offline_repo' into 'master' 

Fix build with local offline mirrors

See merge request live-team/live-build!1
This commit is contained in:
Raphaël Hertzog 2018-02-23 16:39:38 +00:00
parent 96e73960b3 9a0c6102fd
commit ee8d06c46c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/build/chroot_archives
View File

@ -449,12 +449,6 @@ EOF
mv chroot/etc/apt/sources.list.d/zz-sources.list chroot/etc/apt/sources.list mv chroot/etc/apt/sources.list.d/zz-sources.list chroot/etc/apt/sources.list
fi fi
# Unmount local repository
if echo "${LB_PARENT_MIRROR_CHROOT}" | grep -q '^file:/'
then
Chroot_unbind_path chroot "$(echo ${LB_PARENT_MIRROR_CHROOT} | sed -e 's|file:||')"
fi
# Configure generic indices # Configure generic indices
# Cleaning apt list cache # Cleaning apt list cache
rm -rf chroot/var/lib/apt/lists rm -rf chroot/var/lib/apt/lists
@ -652,6 +646,12 @@ EOF
# Updating indices # Updating indices
Apt chroot update Apt chroot update
# Unmount local repository - after apt update or it will fail due to missing files
if echo "${LB_PARENT_MIRROR_CHROOT}" | grep -q '^file:/'
then
Chroot_unbind_path chroot "$(echo ${LB_PARENT_MIRROR_CHROOT} | sed -e 's|file:||')"
fi
# Cleaning apt package cache # Cleaning apt package cache
rm -rf chroot/var/cache/apt rm -rf chroot/var/cache/apt
mkdir -p chroot/var/cache/apt/archives/partial mkdir -p chroot/var/cache/apt/archives/partial