diff --git a/distributedcloud/centos/build_srpm.data b/distributedcloud/centos/build_srpm.data index 2f3c17bc1..3172dd3c1 100644 --- a/distributedcloud/centos/build_srpm.data +++ b/distributedcloud/centos/build_srpm.data @@ -1,4 +1,4 @@ SRC_DIR="." -COPY_LIST="$FILES_BASE/*" +COPY_LIST="$PKG_BASE/files/*" TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/distributedcloud/debian/dl_hook b/distributedcloud/debian/dl_hook deleted file mode 100755 index e8f9d97ad..000000000 --- a/distributedcloud/debian/dl_hook +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -x - -PKG_BUILD_NAME=$1 -PKG_BUILD_DIR=$(realpath `pwd`/${PKG_BUILD_NAME}) - -STX_BASE=$(realpath ${MY_REPO}/stx) -PKG_BASE=$(realpath ${STX_BASE}/distributedcloud/distributedcloud) - -mkdir ${PKG_BUILD_NAME} - -cp -r ${PKG_BASE}/* ${PKG_BUILD_DIR}/ - -mkdir ${PKG_BUILD_DIR}/files -cp ${PKG_BUILD_DIR}/centos/files/* ${PKG_BUILD_DIR}/files/ - -rm -rf ${PKG_BUILD_DIR}/centos diff --git a/distributedcloud/debian/meta_data.yaml b/distributedcloud/debian/meta_data.yaml index b797c1892..3c6159b08 100644 --- a/distributedcloud/debian/meta_data.yaml +++ b/distributedcloud/debian/meta_data.yaml @@ -1,7 +1,7 @@ --- debname: distributedcloud debver: 1.0-1 -dl_hook: dl_hook +src_path: . revision: dist: $STX_DIST PKG_GITREVCOUNT: true diff --git a/distributedcloud/centos/files/clean-dcorch b/distributedcloud/files/clean-dcorch similarity index 100% rename from distributedcloud/centos/files/clean-dcorch rename to distributedcloud/files/clean-dcorch diff --git a/distributedcloud/centos/files/dcdbsync-api.service b/distributedcloud/files/dcdbsync-api.service similarity index 100% rename from distributedcloud/centos/files/dcdbsync-api.service rename to distributedcloud/files/dcdbsync-api.service diff --git a/distributedcloud/centos/files/dcdbsync-openstack-api.service b/distributedcloud/files/dcdbsync-openstack-api.service similarity index 100% rename from distributedcloud/centos/files/dcdbsync-openstack-api.service rename to distributedcloud/files/dcdbsync-openstack-api.service diff --git a/distributedcloud/centos/files/dcdbsync.conf b/distributedcloud/files/dcdbsync.conf similarity index 100% rename from distributedcloud/centos/files/dcdbsync.conf rename to distributedcloud/files/dcdbsync.conf diff --git a/distributedcloud/centos/files/dcmanager-api.service b/distributedcloud/files/dcmanager-api.service similarity index 100% rename from distributedcloud/centos/files/dcmanager-api.service rename to distributedcloud/files/dcmanager-api.service diff --git a/distributedcloud/centos/files/dcmanager-audit-worker.service b/distributedcloud/files/dcmanager-audit-worker.service similarity index 100% rename from distributedcloud/centos/files/dcmanager-audit-worker.service rename to distributedcloud/files/dcmanager-audit-worker.service diff --git a/distributedcloud/centos/files/dcmanager-audit.service b/distributedcloud/files/dcmanager-audit.service similarity index 100% rename from distributedcloud/centos/files/dcmanager-audit.service rename to distributedcloud/files/dcmanager-audit.service diff --git a/distributedcloud/centos/files/dcmanager-manager.service b/distributedcloud/files/dcmanager-manager.service similarity index 100% rename from distributedcloud/centos/files/dcmanager-manager.service rename to distributedcloud/files/dcmanager-manager.service diff --git a/distributedcloud/centos/files/dcmanager-orchestrator.service b/distributedcloud/files/dcmanager-orchestrator.service similarity index 100% rename from distributedcloud/centos/files/dcmanager-orchestrator.service rename to distributedcloud/files/dcmanager-orchestrator.service diff --git a/distributedcloud/centos/files/dcmanager.conf b/distributedcloud/files/dcmanager.conf similarity index 100% rename from distributedcloud/centos/files/dcmanager.conf rename to distributedcloud/files/dcmanager.conf diff --git a/distributedcloud/centos/files/dcorch-api.service b/distributedcloud/files/dcorch-api.service similarity index 100% rename from distributedcloud/centos/files/dcorch-api.service rename to distributedcloud/files/dcorch-api.service diff --git a/distributedcloud/centos/files/dcorch-cinder-api-proxy.service b/distributedcloud/files/dcorch-cinder-api-proxy.service similarity index 100% rename from distributedcloud/centos/files/dcorch-cinder-api-proxy.service rename to distributedcloud/files/dcorch-cinder-api-proxy.service diff --git a/distributedcloud/centos/files/dcorch-engine.service b/distributedcloud/files/dcorch-engine.service similarity index 100% rename from distributedcloud/centos/files/dcorch-engine.service rename to distributedcloud/files/dcorch-engine.service diff --git a/distributedcloud/centos/files/dcorch-identity-api-proxy.service b/distributedcloud/files/dcorch-identity-api-proxy.service similarity index 100% rename from distributedcloud/centos/files/dcorch-identity-api-proxy.service rename to distributedcloud/files/dcorch-identity-api-proxy.service diff --git a/distributedcloud/centos/files/dcorch-neutron-api-proxy.service b/distributedcloud/files/dcorch-neutron-api-proxy.service similarity index 100% rename from distributedcloud/centos/files/dcorch-neutron-api-proxy.service rename to distributedcloud/files/dcorch-neutron-api-proxy.service diff --git a/distributedcloud/centos/files/dcorch-nova-api-proxy.service b/distributedcloud/files/dcorch-nova-api-proxy.service similarity index 100% rename from distributedcloud/centos/files/dcorch-nova-api-proxy.service rename to distributedcloud/files/dcorch-nova-api-proxy.service diff --git a/distributedcloud/centos/files/dcorch-sysinv-api-proxy.service b/distributedcloud/files/dcorch-sysinv-api-proxy.service similarity index 100% rename from distributedcloud/centos/files/dcorch-sysinv-api-proxy.service rename to distributedcloud/files/dcorch-sysinv-api-proxy.service diff --git a/distributedcloud/centos/files/dcorch.conf b/distributedcloud/files/dcorch.conf similarity index 100% rename from distributedcloud/centos/files/dcorch.conf rename to distributedcloud/files/dcorch.conf diff --git a/distributedcloud/centos/files/distcloud-logrotate.conf b/distributedcloud/files/distcloud-logrotate.conf similarity index 100% rename from distributedcloud/centos/files/distcloud-logrotate.conf rename to distributedcloud/files/distcloud-logrotate.conf diff --git a/distributedcloud/centos/files/distcloud-syslog.conf b/distributedcloud/files/distcloud-syslog.conf similarity index 100% rename from distributedcloud/centos/files/distcloud-syslog.conf rename to distributedcloud/files/distcloud-syslog.conf