From aa0b3c22b2afa40040ad039dc3b53314a93e4024 Mon Sep 17 00:00:00 2001 From: xuhy Date: Mon, 24 Jun 2024 09:23:08 +0800 Subject: Remove dpatch dependency. dpatch package is not available on ubuntu 24.04. Change-Id: I169ecf2b6998f20cd88647a2d7bbc2a1e40f0dbc Signed-off-by: xuhy --- debian/control | 2 +- init_buildsystem | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 831940b..ec1ba0b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: build Section: devel Priority: optional Maintainer: Adrian Schroeter -Build-Depends: debhelper (>= 4), dpatch, cdbs,libc6, +Build-Depends: debhelper (>= 4), cdbs, libc6 Standards-Version: 3.7.2 Package: build diff --git a/init_buildsystem b/init_buildsystem index 3e4a892..aa3a072 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -462,7 +462,11 @@ downloadpkg() { ;; esac # if there is such package, didn't mv. - mv -n "$destfile" "$SRC" || cleanup_and_exit 1 + if [ ! -f "$SRC" ]; then + # avoid race condition in multi-thread cases, + # and skip errors if $SRC exists, because nothing is moved in this case. + ln -PT "$destfile" "$SRC" && rm "$destfile" || true || cleanup_and_exit 1 + fi rm -rf $destdir } -- cgit v1.2.3