|
@@ -250,6 +250,27 @@ setup-vbootstrap-rpm(){
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
+## recover apt-get data on host/chroot
|
|
|
+apt-get-update(){
|
|
|
+ case $1 in
|
|
|
+ --host)
|
|
|
+ echo -n "apt-get update on host ... "
|
|
|
+ apt-get update > /dev/null 2>&1
|
|
|
+ echo "done."
|
|
|
+ ;;
|
|
|
+ --chroot)
|
|
|
+ echo -n "apt-get update on chroot ... "
|
|
|
+ /usr/sbin/chroot ${BUILD_ROOT} \
|
|
|
+ /bin/sh -c 'apt-get update' > /dev/null 2>&1
|
|
|
+ echo "done."
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ echo apt-get-update: unknown option $1
|
|
|
+ exit 1
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+}
|
|
|
+
|
|
|
## mount /home
|
|
|
mount_home(){
|
|
|
if [ "$1" = "--umount" ]; then
|
|
@@ -306,6 +327,7 @@ Clean(){
|
|
|
# mount_home --umount
|
|
|
# mount_tmp --umount
|
|
|
mount_vfs --umount
|
|
|
+ apt-get-update --host
|
|
|
|
|
|
if [ -d ${BUILD_ROOT}/var/cache/apt/archives ]; then
|
|
|
echo -n "Caching RPMs in ${CACHE_DIR}/apt/archives ... "
|
|
@@ -378,6 +400,7 @@ Build(){
|
|
|
# mount_home --umount
|
|
|
# mount_tmp --umount
|
|
|
mount_vfs --umount
|
|
|
+ apt-get-update --host
|
|
|
|
|
|
echo "Making a build farm for ${VERSION} done."
|
|
|
}
|
|
@@ -394,16 +417,19 @@ RPM_Remove(){
|
|
|
/bin/sh -c "apt-get -y remove $BASE_RPM_PKG"
|
|
|
|
|
|
mount_vfs --umount
|
|
|
+ apt-get-update --host
|
|
|
}
|
|
|
|
|
|
RPM_Install(){
|
|
|
setup-vbootstrap-rpm
|
|
|
mount_vfs
|
|
|
+ apt-get-update --chroot
|
|
|
|
|
|
/usr/sbin/chroot ${BUILD_ROOT} \
|
|
|
/bin/sh -c "cd ${BUILD_DIR} && apt-get -y install $BASE_RPM_PKG"
|
|
|
|
|
|
mount_vfs --umount
|
|
|
+ apt-get-update --host
|
|
|
}
|
|
|
|
|
|
RPM_Build(){
|
|
@@ -452,6 +478,7 @@ RPM_Build(){
|
|
|
done
|
|
|
|
|
|
mount_vfs --umount
|
|
|
+ apt-get-update --host
|
|
|
|
|
|
echo "done."
|
|
|
}
|