diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-15 11:00:02 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-15 11:00:02 -0600 |
| commit | eba252eca59c3d110e90c97d114bacceca343426 (patch) | |
| tree | c771345d885f449648b2e252bcc4c8fdd6d2d30c /makechrootpkg.in | |
| parent | bf8513ae631484a0c292ad085ea7ede9859f8e0f (diff) | |
| parent | 453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1 (diff) | |
Merge commit '4535'
Conflicts:
makechrootpkg.in
mkarchroot.in
Diffstat (limited to 'makechrootpkg.in')
| -rw-r--r-- | makechrootpkg.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index b0241f2..0164754 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -12,12 +12,6 @@ m4_include(lib/common.sh) shopt -s nullglob -# So that usage conflicts between upstream and -par mkarchroot don't get hidden -# silently in a merge. -archroot() { - mkarchroot "$@" -} - makepkg_args='-s --noconfirm -L' repack=false update_first=false @@ -159,7 +153,7 @@ if [[ -n "${install_pkgs[*]}" ]]; then pkgname="${install_pkg##*/}" cp "$install_pkg" "$copydir/$pkgname" - archroot -r "$copydir" pacman -U "/$pkgname" --noconfirm + arch-nspawn "$copydir" pacman -U /$pkgname --noconfirm (( ret += !! $? )) rm "$copydir/$pkgname" @@ -169,7 +163,7 @@ if [[ -n "${install_pkgs[*]}" ]]; then [[ -f PKGBUILD ]] || exit $ret fi -$update_first && archroot -u "$copydir" +$update_first && arch-nspawn "$copydir" pacman -Syu --noconfirm mkdir -p "$copydir/build" @@ -285,7 +279,7 @@ exit 0 EOF chmod +x "$copydir/chrootbuild" -if archroot -r "$copydir" "/chrootbuild"; then +if arch-nspawn "$copydir" /chrootbuild; then mkdir -p "$copydir/repo" for pkgfile in "$copydir"/pkgdest/*.pkg.tar.?z; do if $add_to_db; then |