|
@@ -313,7 +313,6 @@ deb http://archive.ubuntu.com/ubuntu/ precise-security main restricted universe
|
|
|
('append_file', 'etc/yum.conf', 'exclude = *.i?86\n'),
|
|
|
('shell', 'yum install -y gcc gcc-c++ make diffutils perl ruby-devel rubygems rpm-build libffi-devel'),
|
|
|
('shell', 'yum install -y openssl-devel libX11-devel libXrender-devel libXext-devel fontconfig-devel freetype-devel libjpeg-turbo-devel libpng-devel zlib-devel'),
|
|
|
- ('shell', 'yum reinstall -y binutils'), # binutils isn't properly installed (no /usr/bin/ld) hence reinstall it
|
|
|
('shell', 'gem install fpm --no-ri --no-rdoc'),
|
|
|
('write_file', 'update.sh', 'yum update -y\ngem update fpm\n'),
|
|
|
('fpm_setup', 'fpm_package.sh'),
|
|
@@ -729,6 +728,7 @@ def build_setup_schroot(config, basedir):
|
|
|
|
|
|
for arch in ARCH:
|
|
|
message('******************* %s-%s\n' % (chroot, arch))
|
|
|
+ unmount = False
|
|
|
base_dir = os.environ.get('WKHTMLTOX_CHROOT') or '/var/chroot'
|
|
|
root_dir = os.path.join(base_dir, 'wkhtmltopdf-%s-%s' % (chroot, arch))
|
|
|
rmdir(root_dir)
|
|
@@ -746,6 +746,10 @@ def build_setup_schroot(config, basedir):
|
|
|
if name == 'debootstrap':
|
|
|
shell('debootstrap --arch=%(arch)s --variant=buildd %(distro)s %(dir)s %(url)s' % {
|
|
|
'arch': arch, 'dir': root_dir, 'distro': command[1], 'url': command[2] })
|
|
|
+ cmd = (arch == 'i386' and 'linux32 chroot' or 'chroot')
|
|
|
+ shell('%s %s mount -t proc proc /proc' % (cmd, root_dir))
|
|
|
+ shell('%s %s mount -t sysfs sysfs /sys' % (cmd, root_dir))
|
|
|
+ unmount = True
|
|
|
elif name == 'rinse':
|
|
|
cmd = (arch == 'i386' and 'linux32 rinse' or 'rinse')
|
|
|
shell('%s --arch %s --distribution %s --directory %s' % (cmd, arch, command[1], root_dir))
|
|
@@ -780,6 +784,9 @@ def build_setup_schroot(config, basedir):
|
|
|
if arch == 'i386' and 'amd64' in ARCH:
|
|
|
cfg.write('personality=linux32\n')
|
|
|
cfg.close()
|
|
|
+ if unmount:
|
|
|
+ shell('umount %s/proc' % root_dir)
|
|
|
+ shell('umount %s/sys' % root_dir)
|
|
|
|
|
|
def check_update_schroot(config):
|
|
|
check_running_on_debian()
|