diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2019-06-25 09:43:28 +0200 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2019-06-25 09:43:28 +0200 |
| commit | 4bd637effeb24a6492b6df5dca9f5ca03c2c396a (patch) | |
| tree | 8a2ddcb7ff3f992cc0b57506d0399b4d4a3cc435 /libre/libretools | |
| parent | 07e8c1c3b6fdee3a416bfbca8e750af09d332a5c (diff) | |
libre/libretools: rebuilt to fix broken libremakepkg when SRCDIR is set
Diffstat (limited to 'libre/libretools')
| -rw-r--r-- | libre/libretools/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch | 13 | ||||
| -rw-r--r-- | libre/libretools/PKGBUILD | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/libre/libretools/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch b/libre/libretools/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch index 759f686e0..75b2d6f4f 100644 --- a/libre/libretools/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch +++ b/libre/libretools/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 diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index ca44491c0..c90437957 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -14,10 +14,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' - 'SKIP') + '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883') validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker -pkgrel=4 +pkgrel=5 arch=('any') makedepends=(ruby-ronn) checkdepends=( |