Merge branch 'nayuos-cleanup' into nayuos-devserver

software/nayuos/instance.cfg

@@ -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
@@ -117,4 +117,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                 net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
+  raw nayu_dev_packages                 sys-fs/cryptsetup

software/nayuos/scripts/cros_full_build.in

@@ -163,14 +163,6 @@ if ! grep "BEGIN NayuOS configuration" "${BASH_EBUILD_DIR}/files/dot-bashrc" > /
 # use vim as default editor if nano does not exist
 which nano &> /dev/null || export EDITOR=vim
 
-# git quickfix for finding right git executables
-export GIT_EXEC_PATH=/usr/local/libexec/git-core
-
-# configure .gitconfig once
-if [ ! -e ~/.gitconfig ] ; then
-  which less &> /dev/null && git config --global core.pager less
-fi
-
 # go to ~/Download
 [ "\$(pwd)" = / ] && cd ~/Downloads
 

software/nayuos/scripts/test_nayuos_image

@@ -10,13 +10,8 @@ fi
 
 BOARD=$1
 MOUNTPOINT="/tmp/${BOARD}"
-ORIGINAL_GRANDENET_SCRIPT=~/trunk/src/third_party/chromiumos-overlay/net-misc/re6stnet/files/grandenet
-GRANDENET_SCRIPT="usr/local/bin/grandenet"
 INIT_SSH_SERVER="etc/init/openssh-server.conf"
 BASHRC="etc/skel/.bashrc"
-GIT_CORE="usr/local/libexec/git-core/"
-GIT_EXPECTED_EXPORT="export GIT_EXEC_PATH=/usr/local/libexec/git-core"
-VIRTUALENV_BIN="usr/local/bin/virtualenv"
 CHROMIUM_POLICY="etc/chromium/policies/recommended/nayuos_policy.json"
 
 HAS_FAILED=0
@@ -38,13 +33,8 @@ install -d "${MOUNTPOINT}"
 ./mount_gpt_image.sh --safe -f $( ./get_latest_image.sh --board=${BOARD} ) -r ${MOUNTPOINT}
 echo $(ls "${MOUNTPOINT}/usr/local")
 if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then
-  my_diff=$(diff "${ORIGINAL_GRANDENET_SCRIPT}" "${MOUNTPOINT}/${GRANDENET_SCRIPT}")
   opensshd_config=$(ls "${MOUNTPOINT}/${INIT_SSH_SERVER}")
-  gitcore=$(ls "${MOUNTPOINT}/${GIT_CORE}")
-  gitexport=$(grep "${GIT_EXPECTED_EXPORT}" "${MOUNTPOINT}/${BASHRC}")
-  virtualenvbin=$(ls "${MOUNTPOINT}/${VIRTUALENV_BIN}")
   chromium_policy=$(ls "${MOUNTPOINT}/${CHROMIUM_POLICY}")
-
 else
   is_empty=1
 fi
@@ -60,15 +50,6 @@ if [[ "${is_empty}" == "1" ]] ; then
 else
   print_result ${SUCCESS} "/usr/local is not empty."
 
-  echo "* test grandenet script existence and content"
-  if [[ ${no_grandenet_script} == 1 ]] ; then
-    print_result ${FAILURE} "grandenet script is missing (no file at ${GRANDENET_SCRIPT})."
-  elif [[ ${my_diff} != "" ]] ; then
-    print_result ${FAILURE} "grandenet scripts differs:\n${my_diff}"
-  else
-    print_result ${SUCCESS} "${GRANDENET_SCRIPT} exists and contains what is expected."
-  fi
-
   echo "* test openssh server init script absence"
   if [[ ${opensshd_config} ]] ; then
     print_result ${FAILURE} "opensshd config exists: ${opensshd_config}"
@@ -76,30 +57,6 @@ else
     print_result ${SUCCESS} "opensshd config removed."
   fi
 
-  echo "* test if git core directory is not empty"
-
-  if [[ "${gitcore}" == "" ]] ; then
-    print_result ${FAILURE} "No git file in ${MOUNTPOINT}/${GIT_CORE}."
-  else
-    print_result ${SUCCESS} "git core directory exists and is not empty."
-  fi
-
-  echo "* test bashrc changes for git paths quick fix"
-
-  if [[ "${gitexport}" == ""  ]] ; then
-    print_result ${FAILURE} "Expected alias for git command not in ${MOUNTPOINT}/${BASHRC}. There should be: ${GIT_EXPECTED_EXPORT}"
-  else
-    print_result ${SUCCESS} "git alias is correct."
-  fi
-
-  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

@@ -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