diff options
| author | Adrian Schröter <adrian@suse.de> | 2014-10-24 11:43:57 +0200 |
|---|---|---|
| committer | Adrian Schröter <adrian@suse.de> | 2014-10-24 12:21:06 +0200 |
| commit | dafe67336672360deec05588173653813bedbcfc (patch) | |
| tree | ce8d31295bba41d2f7a8560ae002dfb362c8dd64 /build-pkg-arch | |
| parent | c1860ce9b72f4d661f62f0d838536e26464da84b (diff) | |
- new chroot does not take / anymore but just fails.
This is fixing Ubuntu 14.10 builds (and hopefully breaks nothing else)
Diffstat (limited to 'build-pkg-arch')
| -rw-r--r-- | build-pkg-arch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-pkg-arch b/build-pkg-arch index 3b0f90e..dcbdca5 100644 --- a/build-pkg-arch +++ b/build-pkg-arch @@ -53,7 +53,7 @@ pkg_cumulate_arch() { pkg_install_arch() { # -d -d disables deps checking - ( cd $BUILD_ROOT && chroot $BUILD_ROOT pacman -U --force -d -d --noconfirm .init_b_cache/$PKG.$PSUF 2>&1 || touch $BUILD_ROOT/exit ) | \ + ( $CHROOT pacman -U --force -d -d --noconfirm /.init_b_cache/$PKG.$PSUF 2>&1 || touch $BUILD_ROOT/exit ) | \ perl -ne '$|=1;/^(warning: could not get filesystem information for |loading packages|looking for inter-conflicts|Targets |Total Installed Size: |Net Upgrade Size: |Proceed with installation|checking package integrity|loading package files|checking for file conflicts|checking keyring|Packages \(\d+\):|:: Proceed with installation|checking available disk space|installing |upgrading |warning:.*is up to date -- reinstalling|Optional dependencies for| )/||/^$/||print' } @@ -73,7 +73,7 @@ pkg_preinstall_arch() { pkg_runscripts_arch() { if test -e "$BUILD_ROOT/.init_b_cache/scripts/$PKG.post" ; then echo "running $PKG postinstall script" - ( cd $BUILD_ROOT && chroot $BUILD_ROOT ".init_b_cache/scripts/$PKG.post" < /dev/null ) + ( $CHROOT "/.init_b_cache/scripts/$PKG.post" < /dev/null ) rm -f "$BUILD_ROOT/.init_b_cache/scripts/$PKG.post" fi } |