From e4b0126863052a05fd4c7abf5c010111b0248063 Mon Sep 17 00:00:00 2001
From: Yue Tao <Yue.Tao@windriver.com>
Date: Mon, 17 Jan 2022 13:24:28 +0800
Subject: [PATCH] stx-openstack-helm: remove dl_hook

Replace dl_hook with "src_path" and "src_files"

Test Plan:

Pass: successfully build stx-openstack-helm
Pass: No difference comparing with the result of dl_hook

Story: 2009101
Task: 43801

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Change-Id: I477c0b51ed735f9bcab6bf80e96a109f24c96710
---
 stx-openstack-helm/debian/dl_hook        | 28 ------------------------
 stx-openstack-helm/debian/meta_data.yaml |  5 ++++-
 2 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100755 stx-openstack-helm/debian/dl_hook

diff --git a/stx-openstack-helm/debian/dl_hook b/stx-openstack-helm/debian/dl_hook
deleted file mode 100755
index 698e0fc9..00000000
--- a/stx-openstack-helm/debian/dl_hook
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -x
-
-PKG_BUILD_NAME=$1
-PKG_BUILD_ROOT=$(realpath `pwd`/${PKG_BUILD_NAME})
-PKG_DIR="stx-openstack-helm"
-
-STX_BASE=$(realpath ${MY_REPO}/stx)
-SRC=$(realpath ${STX_BASE}/openstack-armada-app/${PKG_DIR}/${PKG_DIR})
-
-FM_CHART_PKG="fm-rest-api"
-FM_HELM_CHARTS=$(realpath ${STX_BASE}/helm-charts/${FM_CHART_PKG}/${FM_CHART_PKG}/helm-charts)
-
-PSP_CHART_PKG="psp-rolebinding"
-PSP_HELM_CHARTS=$(realpath ${STX_BASE}/helm-charts/${PSP_CHART_PKG}/${PSP_CHART_PKG}/helm-charts)
-
-mkdir -p ${PKG_BUILD_ROOT}
-
-# Copy fm-rest-api helm charts to the build directory.
-cp -pr ${FM_HELM_CHARTS} ${PKG_BUILD_ROOT}
-
-# Copy psp-rolebinding helm charts to the build directory.
-cp -pr ${PSP_HELM_CHARTS} ${PKG_BUILD_ROOT}
-
-# Copy source files to the build directory.
-cp -pr ${SRC}/files ${PKG_BUILD_ROOT}
-cp -pr ${SRC}/helm-charts/* ${PKG_BUILD_ROOT}/helm-charts
-cp -pr ${SRC}/manifests ${PKG_BUILD_ROOT}
diff --git a/stx-openstack-helm/debian/meta_data.yaml b/stx-openstack-helm/debian/meta_data.yaml
index 20009f43..5250d2ff 100644
--- a/stx-openstack-helm/debian/meta_data.yaml
+++ b/stx-openstack-helm/debian/meta_data.yaml
@@ -1,7 +1,10 @@
 ---
 debname: stx-openstack-helm
 debver: 1.0-1
-dl_hook: dl_hook
+src_path: stx-openstack-helm
+src_files:
+  - ${MY_REPO}/stx/helm-charts/psp-rolebinding/psp-rolebinding/helm-charts
+  - ${MY_REPO}/stx/helm-charts/fm-rest-api/fm-rest-api/helm-charts
 revision:
   dist: $STX_DIST
   PKG_GITREVCOUNT: true