Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dedal
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
3
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Harbor Registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EBRAINS RI
Tech Hub
Platform
EBRAINS Software Distribution
dedal
Commits
3039bb09
Commit
3039bb09
authored
1 year ago
by
Philipp Spilger
Browse files
Options
Downloads
Patches
Plain Diff
fix: Allow empty temporary meta directory
Change-Id: Ibcbee09ffde55f21716465921f79848c5ae8eca1
parent
534f4493
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bin/yashchiki
+1
-0
1 addition, 0 deletions
bin/yashchiki
share/yashchiki/styles/asic/create_recipe.sh
+1
-1
1 addition, 1 deletion
share/yashchiki/styles/asic/create_recipe.sh
share/yashchiki/styles/visionary/create_recipe.sh
+1
-1
1 addition, 1 deletion
share/yashchiki/styles/visionary/create_recipe.sh
with
3 additions
and
2 deletions
bin/yashchiki
+
1
−
0
View file @
3039bb09
...
@@ -254,6 +254,7 @@ with tempfile.TemporaryDirectory(prefix="spack-", dir=env["TMPDIR"]) \
...
@@ -254,6 +254,7 @@ with tempfile.TemporaryDirectory(prefix="spack-", dir=env["TMPDIR"]) \
meta_dir
=
args
.
meta_dir
meta_dir
=
args
.
meta_dir
else
:
else
:
meta_dir
=
temporary_directory
.
joinpath
(
"
meta
"
)
meta_dir
=
temporary_directory
.
joinpath
(
"
meta
"
)
meta_dir
.
mkdir
(
parents
=
True
)
env
=
env
|
{
"
YASHCHIKI_META_DIR
"
:
meta_dir
}
env
=
env
|
{
"
YASHCHIKI_META_DIR
"
:
meta_dir
}
# host environment storage filename defaults to temporary file
# host environment storage filename defaults to temporary file
...
...
This diff is collapsed.
Click to expand it.
share/yashchiki/styles/asic/create_recipe.sh
+
1
−
1
View file @
3039bb09
...
@@ -39,7 +39,7 @@ From: ${DOCKER_BASE_IMAGE}
...
@@ -39,7 +39,7 @@ From: ${DOCKER_BASE_IMAGE}
rsync -av "
${
ROOT_DIR
}
"/lib/yashchiki/*.awk "
\$
{SINGULARITY_ROOTFS}/
${
SPACK_INSTALL_SCRIPTS
}
"
rsync -av "
${
ROOT_DIR
}
"/lib/yashchiki/*.awk "
\$
{SINGULARITY_ROOTFS}/
${
SPACK_INSTALL_SCRIPTS
}
"
rsync -av "
${
ROOT_DIR
}
"/share/yashchiki/patches "
\$
{SINGULARITY_ROOTFS}/
${
SPACK_INSTALL_SCRIPTS
}
"
rsync -av "
${
ROOT_DIR
}
"/share/yashchiki/patches "
\$
{SINGULARITY_ROOTFS}/
${
SPACK_INSTALL_SCRIPTS
}
"
mkdir -p "
\$
{SINGULARITY_ROOTFS}/
${
META_DIR_INSIDE
}
"
mkdir -p "
\$
{SINGULARITY_ROOTFS}/
${
META_DIR_INSIDE
}
"
rsync -av "
${
META_DIR_OUTSIDE
}
"
/*
"
\$
{SINGULARITY_ROOTFS}/
${
META_DIR_INSIDE
}
"
rsync -av "
${
META_DIR_OUTSIDE
}
/
" "
\$
{SINGULARITY_ROOTFS}/
${
META_DIR_INSIDE
}
"
# init scripts for user convenience
# init scripts for user convenience
mkdir -p "
\$
{SINGULARITY_ROOTFS}/opt/init"
mkdir -p "
\$
{SINGULARITY_ROOTFS}/opt/init"
rsync -av "
${
ROOT_DIR
}
"/share/yashchiki/misc-files/init/*.sh "
\$
{SINGULARITY_ROOTFS}/opt/init"
rsync -av "
${
ROOT_DIR
}
"/share/yashchiki/misc-files/init/*.sh "
\$
{SINGULARITY_ROOTFS}/opt/init"
...
...
This diff is collapsed.
Click to expand it.
share/yashchiki/styles/visionary/create_recipe.sh
+
1
−
1
View file @
3039bb09
...
@@ -44,7 +44,7 @@ From: ${DOCKER_BASE_IMAGE}
...
@@ -44,7 +44,7 @@ From: ${DOCKER_BASE_IMAGE}
rsync -av "
${
ROOT_DIR
}
"/lib/yashchiki/*.awk "
\$
{SINGULARITY_ROOTFS}/
${
SPACK_INSTALL_SCRIPTS
}
"
rsync -av "
${
ROOT_DIR
}
"/lib/yashchiki/*.awk "
\$
{SINGULARITY_ROOTFS}/
${
SPACK_INSTALL_SCRIPTS
}
"
rsync -av "
${
ROOT_DIR
}
"/share/yashchiki/patches "
\$
{SINGULARITY_ROOTFS}/
${
SPACK_INSTALL_SCRIPTS
}
"
rsync -av "
${
ROOT_DIR
}
"/share/yashchiki/patches "
\$
{SINGULARITY_ROOTFS}/
${
SPACK_INSTALL_SCRIPTS
}
"
mkdir -p "
\$
{SINGULARITY_ROOTFS}/
${
META_DIR_INSIDE
}
"
mkdir -p "
\$
{SINGULARITY_ROOTFS}/
${
META_DIR_INSIDE
}
"
rsync -av "
${
META_DIR_OUTSIDE
}
"
/*
"
\$
{SINGULARITY_ROOTFS}/
${
META_DIR_INSIDE
}
"
rsync -av "
${
META_DIR_OUTSIDE
}
/
" "
\$
{SINGULARITY_ROOTFS}/
${
META_DIR_INSIDE
}
"
# init scripts for user convenience
# init scripts for user convenience
mkdir -p "
\$
{SINGULARITY_ROOTFS}/opt/init"
mkdir -p "
\$
{SINGULARITY_ROOTFS}/opt/init"
rsync -av "
${
ROOT_DIR
}
"/share/yashchiki/misc-files/init/*.sh "
\$
{SINGULARITY_ROOTFS}/opt/init"
rsync -av "
${
ROOT_DIR
}
"/share/yashchiki/misc-files/init/*.sh "
\$
{SINGULARITY_ROOTFS}/opt/init"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment