Browse Source

fix

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

+ 10
- 10
drone.yml View File

61
 
61
 
62
     - PKG_NAME="${DRONE_REPO_NAME}" &&
62
     - PKG_NAME="${DRONE_REPO_NAME}" &&
63
       PKG_VERSION="$(git describe --always)" &&
63
       PKG_VERSION="$(git describe --always)" &&
64
-      PKG_RELEASE_DIR="release" &&
65
-      PKG_DIST_DIR="dist" &&
64
+      PKG_SRC_ROOT="$(pwd)" &&
65
+      PKG_RELEASE_DIR="$${PKG_SRC_ROOT}/release" &&
66
+      PKG_DIST_DIR="$${PKG_SRC_ROOT}/dist" &&
66
       mkdir -p "$${PKG_RELEASE_DIR}" &&
67
       mkdir -p "$${PKG_RELEASE_DIR}" &&
67
-      PKG_DEB_ARCHIVE="$${PKG_RELEASE_DIR}/$${PKG_NAME}_$${PKG_VERSION}.orig.tar.xz" &&
68
+      PKG_DEB_ARCHIVE="$${PKG_NAME}_$${PKG_VERSION}.orig.tar.xz" &&
68
       PKG_DEB_ARCHIVE_ROOT="${PKG_NAME}-${PKG_VERSION}" &&
69
       PKG_DEB_ARCHIVE_ROOT="${PKG_NAME}-${PKG_VERSION}" &&
69
       tar --exclude='./.*' --exclude='debian' --exclude="$${PKG_RELEASE_DIR}"
70
       tar --exclude='./.*' --exclude='debian' --exclude="$${PKG_RELEASE_DIR}"
70
         --exclude="$${PKG_DEB_ARCHIVE}" 
71
         --exclude="$${PKG_DEB_ARCHIVE}" 
71
         --transform "s/\./$${PKG_DEB_ARCHIVE_ROOT}/" 
72
         --transform "s/\./$${PKG_DEB_ARCHIVE_ROOT}/" 
72
-        -cJvf "$${PKG_DEB_ARCHIVE}" . &&
73
+        -cJvf "$${PKG_RELEASE_DIR}/$${PKG_DEB_ARCHIVE}" . &&
73
       PKG_BUILDHOST_ARCH="amd64" &&
74
       PKG_BUILDHOST_ARCH="amd64" &&
74
-      PKG_SRC_ROOT="$(pwd)" &&
75
       for PKG_ARCH in $${BUILD_ARCH} ; do cd "$${PKG_SRC_ROOT}" && echo "Building for $${PKG_ARCH}" &&
75
       for PKG_ARCH in $${BUILD_ARCH} ; do cd "$${PKG_SRC_ROOT}" && echo "Building for $${PKG_ARCH}" &&
76
         PKG_RELEASE_ARCHIVE="$${PKG_NAME}_$${PKG_VERSION}_$${PKG_ARCH}.tar.xz" &&
76
         PKG_RELEASE_ARCHIVE="$${PKG_NAME}_$${PKG_VERSION}_$${PKG_ARCH}.tar.xz" &&
77
         PKG_RELEASE_ARCHIVE_ROOT="$${PKG_NAME}-$${PKG_VERSION}" &&
77
         PKG_RELEASE_ARCHIVE_ROOT="$${PKG_NAME}-$${PKG_VERSION}" &&
78
-        PKG_BUILD_DIR="build/$${PKG_ARCH}/$${PKG_ARCHIVE_ROOT}" &&
78
+        PKG_BUILD_DIR="$${PKG_SRC_ROOT}/build/$${PKG_ARCH}/$${PKG_ARCHIVE_ROOT}" &&
79
         mkdir -p "$${PKG_BUILD_DIR}" &&
79
         mkdir -p "$${PKG_BUILD_DIR}" &&
80
-        tar -xf "$${PKG_DEB_ARCHIVE}" -C "$${PKG_BUILD_DIR}" --strip 1 &&
80
+        tar -xf "$${PKG_RELEASE_DIR}/$${PKG_DEB_ARCHIVE}" -C "$${PKG_BUILD_DIR}" --strip 1 &&
81
         cd "$${PKG_BUILD_DIR}" &&
81
         cd "$${PKG_BUILD_DIR}" &&
82
         export MAKEFLAGS="$${MAKEFLAGS}" &&
82
         export MAKEFLAGS="$${MAKEFLAGS}" &&
83
         make &&
83
         make &&
84
-#        tar --exclude='./.*'
85
-#          --transform "s/$${PKG_DIST_DIR}/$${PKG_RELEASE_ARCHIVE_ROOT}/"
86
-#          -cJvf "$${PKG_RELEASE_DIR}/$${PKG_RELEASE_ARCHIVE}" "${PKG_DIST_DIR}" &&
84
+        tar --exclude='./.*'
85
+          --transform "s/$${PKG_DIST_DIR}/$${PKG_RELEASE_ARCHIVE_ROOT}/"
86
+          -cJvf "$${PKG_RELEASE_DIR}/$${PKG_RELEASE_ARCHIVE}" "${PKG_DIST_DIR}" &&
87
         make clean ;
87
         make clean ;
88
       done &&
88
       done &&
89
       ls -la "$${PKG_RELEASE_DIR}" &&
89
       ls -la "$${PKG_RELEASE_DIR}" &&

Loading…
Cancel
Save