diff options
| author | Michael Schroeder <mls@suse.de> | 2014-07-28 17:40:46 +0200 |
|---|---|---|
| committer | Michael Schroeder <mls@suse.de> | 2014-07-28 17:40:46 +0200 |
| commit | 9bed82b8008d5651378de4dfdda3b2dd5bad73fe (patch) | |
| tree | 97aaa61d3479701652042d23263789108e288585 /build-pkg-arch | |
| parent | b05e7206cb5def21133d52bf6d3c7ff4f906e1a8 (diff) | |
add workaround for broken coreutils package
chroot no longer changes the current working directory...
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 1779a6c..919a744 100644 --- a/build-pkg-arch +++ b/build-pkg-arch @@ -36,7 +36,7 @@ pkg_cumulate_arch() { pkg_install_arch() { # -d -d disables deps checking - ( chroot $BUILD_ROOT pacman -U --force -d -d --noconfirm .init_b_cache/$PKG.$PSUF 2>&1 || touch $BUILD_ROOT/exit ) | \ + ( cd $BUILD_ROOT && chroot $BUILD_ROOT 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' } @@ -56,7 +56,7 @@ pkg_preinstall_arch() { pkg_runscripts_arch() { if test -e "$BUILD_ROOT/.init_b_cache/scripts/$PKG.post" ; then echo "running $PKG postinstall script" - chroot $BUILD_ROOT ".init_b_cache/scripts/$PKG.post" < /dev/null + ( cd $BUILD_ROOT && chroot $BUILD_ROOT ".init_b_cache/scripts/$PKG.post" < /dev/null ) rm -f "$BUILD_ROOT/.init_b_cache/scripts/$PKG.post" fi } |