diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2019-06-26 10:57:57 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2019-06-26 10:57:57 -0700 |
| commit | 246f0439764f562cf163db5792551c5c586f8e4c (patch) | |
| tree | 7a2789a433249d76232029774f3719e142970c13 | |
| parent | Synced with upstream (diff) | |
| download | libretools-246f0439764f562cf163db5792551c5c586f8e4c.tar.xz | |
Sync with upstream
| -rw-r--r-- | 0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch b/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch index 759f686..75b2d6f 100644 --- a/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch +++ b/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch @@ -40,26 +40,19 @@ diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 00eb2e0..fe7dd3a 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg -@@ -124,11 +124,9 @@ build() ( +@@ -124,11 +124,11 @@ build() ( local run_ynet=() local run_nnet=() if $INCHROOT; then - local _run=(sh -c "mount --bind -o ro -- ${startdir@Q} ${startdir@Q} && cd ${startdir@Q} && \$@" --) ++ local _run=(sh -c "cd ${startdir@Q} && \$@" --) run_ynet=(unshare --mount -- "${_run[@]}") run_nnet=(unshare --mount --net -- "${_run[@]}") else - librechroot_flags+=(-r "$startdir:/startdir") ++ librechroot_flags+=(-w "$startdir:/startdir") run_ynet=(librechroot "${librechroot_flags[@]}" run) run_nnet=(librechroot "${librechroot_flags[@]}" -N run) fi -@@ -266,6 +264,7 @@ main() { - "Waiting for existing lock on build directory to be released" - else - librechroot_flags+=( -+ -w "$PWD:/startdir" - -n "$CHROOT" - -l "$copy" - ) --- 2.21.0 @@ -19,10 +19,10 @@ source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} 0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch) sha256sums=('2bdefd1803ba3e6cbd1eb955fad3de9ce8a4abfd23a0bd96a60772762df7b53b' 'SKIP' - 'a4cd21efb1e7444574c0b4c5c81bcde38fa1395950b72bc0cd9fd3c722994dd8') + '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883') validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker -pkgrel=4 +pkgrel=5 arch=('any') makedepends=(ruby-ronn) checkdepends=( |