From dcf936d360b7e6cca38eead46c58a6d0571f49fe Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Tue, 7 Dec 2021 17:11:06 +0800 Subject: [PATCH] chartmuseum: update meta_data.yaml to remove dl_hook "dl_path" replaces the ${CM_SOURCE} in dl_hook "dl_files" replaces the ${CM_EXEC} in dl_hook debrepack extracts the "dl_path" automatically and copies the "dl_files" to build directory, so no longer need the dl_hook, and remove the untar operation in debian/rules. Test Plan: Pass: successfully build test Story: 2009101 Task: 43715 Signed-off-by: Yue Tao Change-Id: Id11fa62cc510808899ba79f5f2a44cd65bd97109 --- kubernetes/chartmuseum/debian/deb_folder/rules | 1 - kubernetes/chartmuseum/debian/dl_hook | 17 ----------------- kubernetes/chartmuseum/debian/meta_data.yaml | 10 +++++++++- 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100755 kubernetes/chartmuseum/debian/dl_hook diff --git a/kubernetes/chartmuseum/debian/deb_folder/rules b/kubernetes/chartmuseum/debian/deb_folder/rules index 028582fd2..ccd0e757f 100755 --- a/kubernetes/chartmuseum/debian/deb_folder/rules +++ b/kubernetes/chartmuseum/debian/deb_folder/rules @@ -9,7 +9,6 @@ export BINDIR = $(ROOT)/usr/bin dh $@ override_dh_auto_build: - tar xfz chartmuseum-$(CHARTMUSEUM_VERSION).tar.gz override_dh_auto_clean: diff --git a/kubernetes/chartmuseum/debian/dl_hook b/kubernetes/chartmuseum/debian/dl_hook deleted file mode 100755 index 1146f9c75..000000000 --- a/kubernetes/chartmuseum/debian/dl_hook +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -x - -PKG_BUILD_NAME=$1 -PKG_BUILD_ROOT=$(realpath `pwd`/${PKG_BUILD_NAME}) - -mkdir ${PKG_BUILD_ROOT} -pushd ${PKG_BUILD_ROOT} - -# Local mirror workaround until CGCS_BASE mirror is supported. -STX_MIRROR=$(realpath "/import/mirrors/starlingx") - -# Download and extract helm source package. -CM_SOURCE=$(realpath ${STX_MIRROR}/downloads/chartmuseum-0.12.0.tar.gz) -CM_EXEC=$(realpath ${STX_MIRROR}/downloads/chartmuseum-v0.12.0-amd64) -cp ${CM_SOURCE} ${PKG_BUILD_ROOT} -cp ${CM_EXEC} ${PKG_BUILD_ROOT} diff --git a/kubernetes/chartmuseum/debian/meta_data.yaml b/kubernetes/chartmuseum/debian/meta_data.yaml index 064a78814..b800f084a 100644 --- a/kubernetes/chartmuseum/debian/meta_data.yaml +++ b/kubernetes/chartmuseum/debian/meta_data.yaml @@ -1,7 +1,15 @@ --- debname: chartmuseum debver: 0.12.0-1 -dl_hook: dl_hook +dl_path: + name: chartmuseum-0.12.0.tar.gz + url: https://github.com/helm/chartmuseum/archive/v0.12.0.tar.gz + md5sum: 5c4cadff25c20e3fc17f079a457bddd9 +dl_files: + chartmuseum-v0.12.0-amd64: + topdir: null + url: https://s3.amazonaws.com/chartmuseum/release/v0.12.0/bin/linux/amd64/chartmuseum + md5sum: fba48bf948c224e662e84e7b295899f2 revision: dist: $STX_DIST PKG_GITREVCOUNT: true