Remove dpatch dependency.

dpatch package is not available on ubuntu 24.04.

Change-Id: I604ee04561203fa7b2b69f6f7621a47524d2a553

diff --git a/debian/control b/debian/control
index 831940ba3c28c179941a6e89f483049dfa89090c..ec1ba0bafc3fb9e79dde976c37b58c95bba02d36 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: build
 Section: devel
 Priority: optional
 Maintainer: Adrian Schroeter <adrian@suse.de>
-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 3e4a892341042f8005e758c2666c76806053252e..aa3a072827d01cecf905d66caf028cbd201e11e3 100755 (executable)
--- 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
 }