Browse Source

fix

tags/v0.0.59
Peter Vivell 6 years ago
parent
commit
0b7312425e
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      drone.yml

+ 7
- 7
drone.yml View File

60
 
60
 
61
     - PKG_NAME="${DRONE_REPO_NAME}" &&
61
     - PKG_NAME="${DRONE_REPO_NAME}" &&
62
       PKG_VERSION="$(git describe --always)" &&
62
       PKG_VERSION="$(git describe --always)" &&
63
-      PKG_DEB_ARCHIVE="$${PKG_NAME}_$${PKG_VERSION}.orig.tar.xz" &&
63
+      PKG_RELEASE_DIR="release" &&
64
+      PKG_DIST_DIR="dist" &&
65
+      mkdir -p "$${PKG_RELEASE_DIR}" &&
66
+      PKG_DEB_ARCHIVE="$${PKG_RELEASE_DIR}/$${PKG_NAME}_$${PKG_VERSION}.orig.tar.xz" &&
64
       PKG_DEB_ARCHIVE_ROOT="${PKG_NAME}-${PKG_VERSION}" &&
67
       PKG_DEB_ARCHIVE_ROOT="${PKG_NAME}-${PKG_VERSION}" &&
65
-      tar --exclude='./.*' --exclude='debian' 
68
+      tar --exclude='./.*' --exclude='debian' --excluse="$${PKG_RELEASE_DIR}"
66
         --exclude="$${PKG_DEB_ARCHIVE}" 
69
         --exclude="$${PKG_DEB_ARCHIVE}" 
67
         --transform "s/\./$${PKG_DEB_ARCHIVE_ROOT}/" 
70
         --transform "s/\./$${PKG_DEB_ARCHIVE_ROOT}/" 
68
         -cJvf "$${PKG_DEB_ARCHIVE}" .
71
         -cJvf "$${PKG_DEB_ARCHIVE}" .
69
 
72
 
70
       # https://wiki.debian.org/CrossCompiling#Building_with_dpkg-buildpackage
73
       # https://wiki.debian.org/CrossCompiling#Building_with_dpkg-buildpackage
71
-    - PKG_RELEASE_DIR="release" &&
72
-      PKG_DIST_DIR="dist" &&
73
-      PKG_BUILDHOST_ARCH="${DRONE_RUNNER_ARCH}" &&
74
+    - PKG_BUILDHOST_ARCH="${DRONE_RUNNER_ARCH}" &&
74
       PKG_SRC_ROOT="$(pwd)" &&
75
       PKG_SRC_ROOT="$(pwd)" &&
75
-      mkdir -p "$${PKG_RELEASE_DIR}" &&
76
       for PKG_ARCH in ${BUILD_ARCH} ; do cd "$${PKG_SRC_ROOT}" &&
76
       for PKG_ARCH in ${BUILD_ARCH} ; do cd "$${PKG_SRC_ROOT}" &&
77
         PKG_RELEASE_ARCHIVE="$${PKG_NAME}_$${PKG_VERSION}_$${PKG_ARCH}.tar.xz" &&
77
         PKG_RELEASE_ARCHIVE="$${PKG_NAME}_$${PKG_VERSION}_$${PKG_ARCH}.tar.xz" &&
78
         PKG_RELEASE_ARCHIVE_ROOT="$${PKG_NAME}-$${PKG_VERSION}" &&
78
         PKG_RELEASE_ARCHIVE_ROOT="$${PKG_NAME}-$${PKG_VERSION}" &&
79
         PKG_BUILD_DIR="build/$${PKG_ARCH}/$${PKG_ARCHIVE_ROOT}" &&
79
         PKG_BUILD_DIR="build/$${PKG_ARCH}/$${PKG_ARCHIVE_ROOT}" &&
80
-        tar -xf "$${PKG_ARCHIVE}" -C "$${PKG_ARCHIVE_ROOT}" --strip 1 &&
80
+        tar -xf "$${PKG_DEB_ARCHIVE}" -C "$${PKG_ARCHIVE_ROOT}" --strip 1 &&
81
         cd "$${PKG_BUILD_DIR}" &&
81
         cd "$${PKG_BUILD_DIR}" &&
82
         export MAKEFLAGS="${MAKEFLAGS}" &&
82
         export MAKEFLAGS="${MAKEFLAGS}" &&
83
         make &&
83
         make &&

Loading…
Cancel
Save