Commit d8022335 authored by Lorenzo Martinico's avatar Lorenzo Martinico

Remove python packages flask, virtualenv

parent 4c09e1c4
...@@ -99,7 +99,7 @@ context = ...@@ -99,7 +99,7 @@ context =
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ software_dir }}/scripts/cros_full_build.in template = {{ software_dir }}/scripts/cros_full_build.in
rendered = ${directory:run}/cros_full_build rendered = ${directory:run}/cros_full_build
md5sum = 2a64b5cc0314ec2221a949928956f5c0 md5sum = e11a8ed3fc100ddf591469ca8ac75d52
mode = 0700 mode = 0700
context = context =
key bash_path bin:bash key bash_path bin:bash
...@@ -116,4 +116,4 @@ context = ...@@ -116,4 +116,4 @@ context =
# those packages will be marked as dependency of root filesystem # those packages will be marked as dependency of root filesystem
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
# those packages will be marked as dependency of the chromium build itself # 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
...@@ -12,7 +12,6 @@ BOARD=$1 ...@@ -12,7 +12,6 @@ BOARD=$1
MOUNTPOINT="/tmp/${BOARD}" MOUNTPOINT="/tmp/${BOARD}"
INIT_SSH_SERVER="etc/init/openssh-server.conf" INIT_SSH_SERVER="etc/init/openssh-server.conf"
BASHRC="etc/skel/.bashrc" BASHRC="etc/skel/.bashrc"
VIRTUALENV_BIN="usr/local/bin/virtualenv"
CHROMIUM_POLICY="etc/chromium/policies/recommended/nayuos_policy.json" CHROMIUM_POLICY="etc/chromium/policies/recommended/nayuos_policy.json"
HAS_FAILED=0 HAS_FAILED=0
...@@ -35,9 +34,7 @@ install -d "${MOUNTPOINT}" ...@@ -35,9 +34,7 @@ install -d "${MOUNTPOINT}"
echo $(ls "${MOUNTPOINT}/usr/local") echo $(ls "${MOUNTPOINT}/usr/local")
if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then
opensshd_config=$(ls "${MOUNTPOINT}/${INIT_SSH_SERVER}") opensshd_config=$(ls "${MOUNTPOINT}/${INIT_SSH_SERVER}")
virtualenvbin=$(ls "${MOUNTPOINT}/${VIRTUALENV_BIN}")
chromium_policy=$(ls "${MOUNTPOINT}/${CHROMIUM_POLICY}") chromium_policy=$(ls "${MOUNTPOINT}/${CHROMIUM_POLICY}")
else else
is_empty=1 is_empty=1
fi fi
...@@ -60,18 +57,6 @@ else ...@@ -60,18 +57,6 @@ else
print_result ${SUCCESS} "opensshd config removed." print_result ${SUCCESS} "opensshd config removed."
fi 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" echo "* test if Chromium policies are installed"
if [[ ${chromium_policy} ]] ; then if [[ ${chromium_policy} ]] ; then
......
...@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2 ...@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg rendered = ${buildout:directory}/instance.cfg
mode = 0644 mode = 0644
md5sum = 73f964d73367dbf280d904e408a7f9b8 md5sum = 037a1c8c1091f07e8e5660b59223743f
context = context =
key software_dir :_profile_base_location_ key software_dir :_profile_base_location_
key instance_dir buildout:directory key instance_dir buildout:directory
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment