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

Updating bootstrap for multiarch.

This commit is contained in:
Daniel Baumann 2010-12-05 15:33:54 +01:00
parent 47ce1c19d0
commit 70e84bd3c1
4 changed files with 294 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/build/lb_bootstrap_cache
View File

@ -27,6 +27,8 @@ Set_defaults
# Check architecture
Check_crossarchitectures
for _ARCHITECTURE in ${LB_ARCHITECTURES}
do
Echo_message "Begin caching bootstrap stage..."
for STAGE in ${LB_CACHE_STAGES}
@ -36,9 +38,9 @@ do
case "${1}" in
restore)
# Checking stage file
Check_stagefile .stage/bootstrap_cache.restore
Check_stagefile .stage/bootstrap_cache.${_ARCHITECTURE}-restore
if [ -d cache/stages_bootstrap ]
if [ -d cache/stages_bootstrap.${_ARCHITECTURE} ]
then
# Checking lock file
Check_lockfile .lock
@ -47,19 +49,19 @@ do
Create_lockfile .lock
# Removing old chroot
rm -rf chroot
rm -rf chroot.${_ARCHITECTURE}
# Restoring old cache
${LB_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
${LB_ROOT_COMMAND} cp -a cache/stages_bootstrap.${_ARCHITECTURE} chroot.${_ARCHITECTURE}
if [ -n "${LB_ROOT_COMMAND}" ]
then
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot.${_ARCHITECTURE}
fi
# Creating stage file
Create_stagefile .stage/bootstrap_cache.restore
Create_stagefile .stage/bootstrap
Create_stagefile .stage/bootstrap_cache.${_ARCHITECTURE}-restore
Create_stagefile .stage/bootstrap.${_ARCHITECTURE}
exit 0
fi
@ -67,7 +69,7 @@ do
save)
# Checking stage file
Check_stagefile .stage/bootstrap_cache.save
Check_stagefile .stage/bootstrap_cache.${_ARCHITECTURE}-save
# Checking lock file
Check_lockfile .lock
@ -75,20 +77,21 @@ do
# Creating lock file
Create_lockfile .lock
rm -rf cache/stages_bootstrap
rm -rf cache/stages_bootstrap.${_ARCHITECTURE}
mkdir -p cache
${LB_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
${LB_ROOT_COMMAND} cp -a chroot.${_ARCHITECTURE} cache/stages_bootstrap.${_ARCHITECTURE}
if [ -n "${LB_ROOT_COMMAND}" ]
then
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_bootstrap
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_bootstrap.${_ARCHITECTURE}
fi
# Creating stage file
Create_stagefile .stage/bootstrap_cache.save
Create_stagefile .stage/bootstrap_cache.${_ARCHITECTURE}-save
;;
esac
fi
done
done

46
scripts/build/lb_bootstrap_cdebootstrap
View File

@ -32,6 +32,8 @@ fi
# Check architecture
Check_crossarchitectures
for _ARCHITECTURE in ${LB_ARCHITECTURES}
do
Echo_message "Begin bootstrapping system..."
Check_package /usr/bin/${LB_BOOTSTRAP} cdebootstrap
@ -40,8 +42,8 @@ Check_package /usr/bin/${LB_BOOTSTRAP} cdebootstrap
lb testroot
# Checking stage file
Check_stagefile .stage/bootstrap
Check_stagefile .stage/bootstrap_cache.restore
Check_stagefile .stage/bootstrap.${_ARCHITECTURE}
Check_stagefile .stage/bootstrap_cache.${_ARCHITECTURE}-restore
# Checking lock file
Check_lockfile .lock
@ -50,13 +52,10 @@ Check_lockfile .lock
Create_lockfile .lock
# Creating chroot directory
mkdir -p chroot
mkdir -p chroot.${_ARCHITECTURE}
# Setting cdebootstrap options
if [ -n "${LB_ARCHITECTURES}" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
fi
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${_ARCHITECTURE}"
if [ -n "${LB_BOOTSTRAP_CONFIG}" ]
then
@ -124,54 +123,55 @@ if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
then
if [ "${LB_CACHE_PACKAGES}" = "true" ]
then
if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
if ls cache/packages_bootstrap.${_ARCHITECTURE}/*.deb > /dev/null 2>&1
then
mkdir -p chroot/var/cache/bootstrap
cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
mkdir -p chroot.${_ARCHITECTURE}/var/cache/bootstrap
cp cache/packages_bootstrap.${_ARCHITECTURE}/*.deb chroot.${_ARCHITECTURE}/var/cache/bootstrap
fi
Echo_breakage "Running ${LB_BOOTSTRAP} (download-only)... "
${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}"
${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LB_DISTRIBUTION}" chroot.${_ARCHITECTURE} "${LB_MIRROR_BOOTSTRAP}"
if [ -n "${LB_ROOT_COMMAND}" ]
then
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot.${_ARCHITECTURE}
fi
# Removing old cache
rm -f cache/packages_bootstrap/*.deb
rm -f cache/packages_bootstrap.${_ARCHITECTURE}/*.deb
# Saving new cache
mkdir -p cache/packages_bootstrap
cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
mkdir -p cache/packages_bootstrap.${_ARCHITECTURE}
cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap.${_ARCHITECTURE}
fi
Echo_breakage "Running ${LB_BOOTSTRAP}... "
${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}"
${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LB_DISTRIBUTION}" chroot.${_ARCHITECTURE} "${LB_MIRROR_BOOTSTRAP}"
if [ -n "${LB_ROOT_COMMAND}" ]
then
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot.${_ARCHITECTURE}
fi
# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
case "${LB_PACKAGE_LISTS}" in
stripped|minimal)
Chroot chroot "dpkg -P cdebootstrap-helper-diverts"
Chroot chroot.${_ARCHITECTURE} "dpkg -P cdebootstrap-helper-diverts"
;;
esac
# Deconfiguring cdebootstrap configurations
rm -f chroot/etc/apt/sources.list
rm -f chroot/etc/hosts
rm -f chroot/etc/resolv.conf
rm -f chroot.${_ARCHITECTURE}/etc/apt/sources.list
rm -f chroot.${_ARCHITECTURE}/etc/hosts
rm -f chroot.${_ARCHITECTURE}/etc/resolv.conf
# Removing bootstrap cache
rm -rf chroot/var/cache/bootstrap
rm -rf chroot.${_ARCHITECTURE}/var/cache/bootstrap
# Creating stage file
Create_stagefile .stage/bootstrap
Create_stagefile .stage/bootstrap.${_ARCHITECTURE}
else
Echo_error "Can't process file /usr/bin/${LB_BOOTSTRAP} (FIXME)"
exit 1
fi
done

11
scripts/build/lb_bootstrap_copy
View File

@ -32,13 +32,15 @@ fi
# Check architecture
Check_crossarchitectures
for _ARCHITECTURE in ${LB_ARCHITECTURES}
do
Echo_message "Begin bootstrapping system..."
# Ensure that a system is built as root
lb testroot
# Checking stage file
Check_stagefile .stage/bootstrap
Check_stagefile .stage/bootstrap.${_ARCHITECTURE}
# Checking lock file
Check_lockfile .lock
@ -47,10 +49,11 @@ Check_lockfile .lock
Create_lockfile .lock
# Copying host system
mkdir chroot
cd chroot
mkdir chroot.${_ARCHITECTURE}
cd chroot.${_ARCHITECTURE}
tar c / --exclude /proc --exclude /sys --exclude "$(dirname ${PWD})" | tar xv
cd ..
# Creating stage file
Create_stagefile .stage/bootstrap
Create_stagefile .stage/bootstrap.${_ARCHITECTURE}
done

41
scripts/build/lb_bootstrap_debootstrap
View File

@ -32,6 +32,8 @@ fi
# Check architecture
Check_crossarchitectures
for _ARCHITECTURE in ${LB_ARCHITECTURES}
do
Echo_message "Begin bootstrapping system..."
Check_package /usr/sbin/debootstrap debootstrap
@ -40,8 +42,8 @@ Check_package /usr/sbin/debootstrap debootstrap
lb testroot
# Checking stage file
Check_stagefile .stage/bootstrap
Check_stagefile .stage/bootstrap_cache.restore
Check_stagefile .stage/bootstrap.${_ARCHITECTURE}
Check_stagefile .stage/bootstrap_cache.${_ARCHITECTURE}-restore
# Checking lock file
Check_lockfile .lock
@ -50,13 +52,10 @@ Check_lockfile .lock
Create_lockfile .lock
# Creating chroot directory
mkdir -p chroot
mkdir -p chroot.${_ARCHITECTURE}
# Setting debootstrap options
if [ -n "${LB_ARCHITECTURES}" ]
then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
fi
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${_ARCHITECTURE}"
if [ "${LB_ARCHIVE_AREAS}" != "main" ]
then
@ -97,6 +96,7 @@ then
stripped|minimal)
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
;;
standard)
;;
@ -117,45 +117,46 @@ if [ -x "/usr/sbin/debootstrap" ]
then
if [ "${LB_CACHE_PACKAGES}" = "true" ]
then
if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
if ls cache/packages_bootstrap.${_ARCHITECTURE}/*.deb > /dev/null 2>&1
then
mkdir -p chroot/var/cache/apt/archives
cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
mkdir -p chroot.${_ARCHITECTURE}/var/cache/apt/archives
cp cache/packages_bootstrap.${_ARCHITECTURE}/*.deb chroot.${_ARCHITECTURE}/var/cache/apt/archives
fi
Echo_breakage "Running debootstrap (download-only)... "
${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_DISTRIBUTION}" chroot.${_ARCHITECTURE} "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LB_ROOT_COMMAND}" ]
then
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot.${_ARCHITECTURE}
fi
# Removing old cache
rm -f cache/packages_bootstrap/*.deb
rm -f cache/packages_bootstrap.${_ARCHITECTURE}/*.deb
# Saving new cache
mkdir -p cache/packages_bootstrap
cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
mkdir -p cache/packages_bootstrap.${_ARCHITECTURE}
cp chroot.${_ARCHITECTURE}/var/cache/apt/archives/*.deb cache/packages_bootstrap.${_ARCHITECTURE}
fi
Echo_breakage "Running debootstrap... "
${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_DISTRIBUTION}" chroot.${_ARCHITECTURE} "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LB_ROOT_COMMAND}" ]
then
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot.${_ARCHITECTURE}
fi
# Deconfiguring debootstrap configurations
rm -f chroot/etc/hosts
rm -f chroot.${_ARCHITECTURE}/etc/hosts
# Removing bootstrap cache
rm -f chroot/var/cache/apt/archives/*.deb
rm -f chroot.${_ARCHITECTURE}/var/cache/apt/archives/*.deb
# Creating stage file
Create_stagefile .stage/bootstrap
Create_stagefile .stage/bootstrap.${_ARCHITECTURE}
else
Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
exit 1
fi
done