Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joanne Hugé
slapos
Commits
d8022335
Commit
d8022335
authored
Jun 26, 2018
by
Lorenzo Martinico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove python packages flask, virtualenv
parent
4c09e1c4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
18 deletions
+3
-18
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+2
-2
software/nayuos/scripts/test_nayuos_image
software/nayuos/scripts/test_nayuos_image
+0
-15
software/nayuos/software.cfg
software/nayuos/software.cfg
+1
-1
No files found.
software/nayuos/instance.cfg
View file @
d8022335
...
...
@@ -99,7 +99,7 @@ context =
recipe = slapos.recipe.template:jinja2
template = {{ software_dir }}/scripts/cros_full_build.in
rendered = ${directory:run}/cros_full_build
md5sum =
2a64b5cc0314ec2221a949928956f5c0
md5sum =
e11a8ed3fc100ddf591469ca8ac75d52
mode = 0700
context =
key bash_path bin:bash
...
...
@@ -116,4 +116,4 @@ context =
# those packages will be marked as dependency of root filesystem
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
# those packages will be marked as dependency of the chromium build itself
raw nayu_dev_packages
dev-python/flask dev-python/virtualenv
sys-fs/cryptsetup
raw nayu_dev_packages sys-fs/cryptsetup
software/nayuos/scripts/test_nayuos_image
View file @
d8022335
...
...
@@ -12,7 +12,6 @@ BOARD=$1
MOUNTPOINT
=
"/tmp/
${
BOARD
}
"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
BASHRC
=
"etc/skel/.bashrc"
VIRTUALENV_BIN
=
"usr/local/bin/virtualenv"
CHROMIUM_POLICY
=
"etc/chromium/policies/recommended/nayuos_policy.json"
HAS_FAILED
=
0
...
...
@@ -35,9 +34,7 @@ install -d "${MOUNTPOINT}"
echo
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
if
[[
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
]]
;
then
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
virtualenvbin
=
$(
ls
"
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
"
)
chromium_policy
=
$(
ls
"
${
MOUNTPOINT
}
/
${
CHROMIUM_POLICY
}
"
)
else
is_empty
=
1
fi
...
...
@@ -60,18 +57,6 @@ else
print_result
${
SUCCESS
}
"opensshd config removed."
fi
echo
"* test if git core directory is not empty"
echo
"* test bashrc changes for git paths quick fix"
echo
"* test if virtualenv binary exists"
if
[[
${
virtualenvbin
}
]]
;
then
print_result
${
SUCCESS
}
"virtualenv binary exists."
else
print_result
${
FAILURE
}
"Expected virtualenv binary not in
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
."
fi
echo
"* test if Chromium policies are installed"
if
[[
${
chromium_policy
}
]]
;
then
...
...
software/nayuos/software.cfg
View file @
d8022335
...
...
@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
mode = 0644
md5sum =
73f964d73367dbf280d904e408a7f9b8
md5sum =
037a1c8c1091f07e8e5660b59223743f
context =
key software_dir :_profile_base_location_
key instance_dir buildout:directory
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment