Skip to content

Commit 46d5bec

Browse files
committed
twoliter: support kits in makefile
1 parent 2cb43e1 commit 46d5bec

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

twoliter/embedded/Makefile.toml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ BUILDSYS_ARCH = { script = ['echo "${BUILDSYS_ARCH:-$(uname -m)}"'] }
1111
BUILDSYS_ROOT_DIR = "${CARGO_MAKE_WORKING_DIRECTORY}"
1212
BUILDSYS_BUILD_DIR = "${BUILDSYS_ROOT_DIR}/build"
1313
BUILDSYS_PACKAGES_DIR = "${BUILDSYS_BUILD_DIR}/rpms"
14+
BUILDSYS_KITS_DIR = "${BUILDSYS_BUILD_DIR}/kits"
1415
BUILDSYS_STATE_DIR = "${BUILDSYS_BUILD_DIR}/state"
1516
BUILDSYS_IMAGES_DIR = "${BUILDSYS_BUILD_DIR}/images"
1617
BUILDSYS_TOOLS_DIR = "${BUILDSYS_ROOT_DIR}/tools"
@@ -280,6 +281,7 @@ fi
280281
mkdir -p ${BUILDSYS_BUILD_DIR}
281282
mkdir -p ${BUILDSYS_OUTPUT_DIR}
282283
mkdir -p ${BUILDSYS_PACKAGES_DIR}
284+
mkdir -p ${BUILDSYS_KITS_DIR}
283285
mkdir -p ${BUILDSYS_STATE_DIR}
284286
mkdir -p ${BUILDSYS_METADATA_DIR}
285287
mkdir -p ${GO_MOD_CACHE}
@@ -1531,11 +1533,13 @@ extend = "_upload-ova-base"
15311533
dependencies = [
15321534
"clean-sources",
15331535
"clean-packages",
1536+
"clean-kits",
15341537
"clean-images",
15351538
"clean-repos",
15361539
"clean-state",
15371540
"clean-tools",
15381541
"clean-metadata",
1542+
"clean-workspace",
15391543
]
15401544

15411545
[tasks.clean-sources]
@@ -1551,12 +1555,27 @@ rm -f ${BUILDSYS_TOOLS_DIR}/bin/*
15511555
'''
15521556
]
15531557

1558+
[tasks.clean-workspace]
1559+
script_runner = "bash"
1560+
script = [
1561+
'''
1562+
cargo clean --manifest-path "${BUILDSYS_ROOT_DIR}/Cargo.toml"
1563+
'''
1564+
]
1565+
15541566
[tasks.clean-packages]
15551567
script_runner = "bash"
15561568
script = [
15571569
'''
15581570
rm -rf ${BUILDSYS_PACKAGES_DIR}
1559-
cargo clean --manifest-path "${BUILDSYS_ROOT_DIR}/Cargo.toml"
1571+
'''
1572+
]
1573+
1574+
[tasks.clean-kits]
1575+
script_runner = "bash"
1576+
script = [
1577+
'''
1578+
rm -rf ${BUILDSYS_KITS_DIR}
15601579
'''
15611580
]
15621581

0 commit comments

Comments
 (0)