Skip to content

Commit 9f9ccca

Browse files
packaging: allow custom spec_file
Add SPEC_FILE variable support for .deb to allow multpile flavors to share configs. Signed-off-by: Artur Harasimiuk <[email protected]>
1 parent 143694a commit 9f9ccca

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ REPO_DIR="$( cd "$( dirname "${DIR}/../../../../" )" && pwd )"
1414
BUILD_DIR="${REPO_DIR}/../build_l0_gpu_driver"
1515
NEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS:-FALSE}
1616
NEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION:-FALSE}
17+
SPEC_FILE="${SPEC_FILE:-${OS_TYPE}}"
1718

1819
BRANCH_SUFFIX="$( cat ${REPO_DIR}/.branch )"
1920

@@ -48,11 +49,11 @@ fi
4849
rm -rf $BUILD_DIR
4950
mkdir -p $BUILD_DIR/debian
5051

51-
COPYRIGHT="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/l0_gpu_driver/${OS_TYPE}/copyright"
52-
CONTROL="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/l0_gpu_driver/${OS_TYPE}/control"
53-
SHLIBS="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/l0_gpu_driver/${OS_TYPE}/shlibs.local"
52+
COPYRIGHT="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/l0_gpu_driver/${SPEC_FILE}/copyright"
53+
CONTROL="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/l0_gpu_driver/${SPEC_FILE}/control"
54+
SHLIBS="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/l0_gpu_driver/${SPEC_FILE}/shlibs.local"
5455

55-
cp -pR ${REPO_DIR}/scripts/packaging/l0_gpu_driver/${OS_TYPE}/debian/* $BUILD_DIR/debian/
56+
cp -pR ${REPO_DIR}/scripts/packaging/l0_gpu_driver/${SPEC_FILE}/debian/* $BUILD_DIR/debian/
5657
cp $COPYRIGHT $BUILD_DIR/debian/
5758
cp $CONTROL $BUILD_DIR/debian/
5859
if [ -f "${SHLIBS}" ]; then

scripts/packaging/opencl/build_opencl_deb.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ REPO_DIR="$( cd "$( dirname "${DIR}/../../../../" )" && pwd )"
1414
BUILD_DIR="${REPO_DIR}/../build_opencl"
1515
NEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS:-FALSE}
1616
NEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION:-FALSE}
17+
SPEC_FILE="${SPEC_FILE:-${OS_TYPE}}"
1718

1819
BRANCH_SUFFIX="$( cat ${REPO_DIR}/.branch )"
1920

@@ -53,11 +54,11 @@ fi
5354
rm -rf $BUILD_DIR
5455
mkdir -p $BUILD_DIR/debian
5556

56-
COPYRIGHT="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/opencl/${OS_TYPE}/copyright"
57-
CONTROL="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/opencl/${OS_TYPE}/control"
58-
SHLIBS="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/opencl/${OS_TYPE}/shlibs.local"
57+
COPYRIGHT="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/opencl/${SPEC_FILE}/copyright"
58+
CONTROL="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/opencl/${SPEC_FILE}/control"
59+
SHLIBS="${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/opencl/${SPEC_FILE}/shlibs.local"
5960

60-
cp -pR ${REPO_DIR}/scripts/packaging/opencl/${OS_TYPE}/debian/* $BUILD_DIR/debian/
61+
cp -pR ${REPO_DIR}/scripts/packaging/opencl/${SPEC_FILE}/debian/* $BUILD_DIR/debian/
6162
cp $COPYRIGHT $BUILD_DIR/debian/
6263
cp $CONTROL $BUILD_DIR/debian/
6364
if [ -f "${SHLIBS}" ]; then

0 commit comments

Comments
 (0)