mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
app-backup/btrbk: Fix race condition in install
Closes: https://bugs.gentoo.org/745808 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Craig Andrews <candrews@gentoo.org>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@@ -27,6 +27,10 @@ RDEPEND="dev-lang/perl
|
||||
mbuffer? ( >=sys-block/mbuffer-20180505 )
|
||||
>=sys-fs/btrfs-progs-4.12"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-make-install-race.patch"
|
||||
)
|
||||
|
||||
src_compile() {
|
||||
emake clean
|
||||
use doc && emake -C doc
|
||||
|
||||
27
app-backup/btrbk/files/btrbk-0.30.0-make-install-race.patch
Normal file
27
app-backup/btrbk/files/btrbk-0.30.0-make-install-race.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
https://github.com/digint/btrbk/pull/341
|
||||
|
||||
From ec123405669762aefe813801e2c49183800cc3a9 Mon Sep 17 00:00:00 2001
|
||||
From: Xiretza <xiretza@xiretza.xyz>
|
||||
Date: Mon, 28 Sep 2020 16:49:19 +0200
|
||||
Subject: [PATCH] Fix race condition in `make install`
|
||||
|
||||
If run with -j, it's possible for install-bin-links to run before
|
||||
install-bin and subsequently fail because $(BINDIR) hasn't been created
|
||||
yet.
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 030b577..44ab19f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -54,7 +54,7 @@ install-bin:
|
||||
install -d -m 755 "$(DESTDIR)$(BINDIR)"
|
||||
install -p -m 755 $(BIN) "$(DESTDIR)$(BINDIR)"
|
||||
|
||||
-install-bin-links:
|
||||
+install-bin-links: install-bin
|
||||
@echo 'installing symlinks...'
|
||||
for name in $(BIN_LINKS); do \
|
||||
ln -s -n -f $(BIN) "$(DESTDIR)$(BINDIR)/$$name"; \
|
||||
Reference in New Issue
Block a user