From 9ab5317dcaa7105029359e12d8b26b29a6b45212 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 4 Jun 2019 09:24:23 -0700 Subject: [PATCH] tsconfig: Move scripts into tsconfig Currently the build system automagically copies the scripts directory into tsconfig as part of constructing the source rpm. In order to build with OBS (for multi-os), all the files need to be in the correct directory level, in this case update/tsconfig/tsconfig. Correct where devstack finds the tsconfig script Tested with current build-pkgs from clean and verified contents of both tsconfig RPM and SRPM where correct. Change-Id: Ib6fdf7aaad5ed91be091b7f1f63365895a8aea7d Signed-off-by: Saul Wold --- devstack/lib/update | 2 +- tsconfig/centos/build_srpm.data | 1 - tsconfig/{ => tsconfig}/scripts/tsconfig | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename tsconfig/{ => tsconfig}/scripts/tsconfig (100%) diff --git a/devstack/lib/update b/devstack/lib/update index 2f6c73bc..513e8a70 100644 --- a/devstack/lib/update +++ b/devstack/lib/update @@ -58,7 +58,7 @@ function install_tsconfig { setup_dev_lib "tsconfig" $STX_SUDO install -d -m 755 $STX_BIN_DIR - $STX_SUDO install -p -D -m 700 $TSCONFIG_DIR/scripts/tsconfig $STX_BIN_DIR/tsconfig + $STX_SUDO install -p -D -m 700 $TSCONFIG_DIR/tsconfig/scripts/tsconfig $STX_BIN_DIR/tsconfig } function install_update { diff --git a/tsconfig/centos/build_srpm.data b/tsconfig/centos/build_srpm.data index f5a48889..f60b44e0 100644 --- a/tsconfig/centos/build_srpm.data +++ b/tsconfig/centos/build_srpm.data @@ -1,3 +1,2 @@ SRC_DIR="tsconfig" -COPY_LIST_TO_TAR="scripts" TIS_PATCH_VER=9 diff --git a/tsconfig/scripts/tsconfig b/tsconfig/tsconfig/scripts/tsconfig similarity index 100% rename from tsconfig/scripts/tsconfig rename to tsconfig/tsconfig/scripts/tsconfig