nayuos: Add flask + fix instance bug due to comment on raw parameter.

instance.cfg

@@ -46,9 +46,9 @@ scripts_dir = {{ scripts_dir }}
 # create the instance.cfg file in the buildout directory
 # (use jinja for templating)
 recipe = slapos.recipe.template:jinja2
-template = {{ scripts_dir }}/cros_full_build.sh.in
-rendered = ${directory:run}/cros_full_build.sh
-md5sum = 5a219df73265afae234e03892079d0ce
+template = {{ scripts_dir }}/cros_full_build.in
+rendered = ${directory:run}/cros_full_build
+md5sum = 735bed3b3ea1cd73f9509a4deab2329f
 mode = 0770
 context =
 # for access to the eggs from the instance
@@ -59,5 +59,4 @@ context =
   key boards_list parameters:configuration.boards
   key ebuilds_dir directory:ebuilds_dir
   key scripts_dir directory:scripts_dir
-  raw nayu_dev_packages net-libs/nodejs net-misc/re6stnet dev-vcs/git # would need to be in /usr/bin
-  raw nayu_dev_root chromeos-base/re6stnet-init # should be in /etc/init and /etc/re6stnet (and not /usr/local/etc/...)
\ No newline at end of file
+  raw nayu_dev_packages net-libs/nodejs net-misc/re6stnet dev-vcs/git dev-python/flask
\ No newline at end of file

scripts/cros_full_build.sh.in → scripts/cros_full_build.in

@@ -45,7 +45,8 @@ VIRTUAL_CHROMEOS_OS_DEV_EBUILD={{ cros_location }}/src/third_party/chromiumos-ov
 # change the virtual ebuild responsible for installing all packages to add the ones 
 # needed for NayuOS
 for package in {{ nayu_dev_packages }} ; do
-  if cat ${VIRTUAL_CHROMEOS_OS_DEV_EBUILD} | grep ${package} ; then
+  echo $package
+  if [[ $( cat "${VIRTUAL_CHROMEOS_OS_DEV_EBUILD}" | grep "${package}" ) ]] ; then
     echo "no need to change ${VIRTUAL_CHROMEOS_OS_DEV_EBUILD} file to add ${package}..." >> "${BUILD_LOG}"
   else
     printf "\n\nRDEPEND=\"\${RDEPEND}\n          ${package}\"\n">> ${VIRTUAL_CHROMEOS_OS_DEV_EBUILD}
@@ -55,14 +56,6 @@ done
 # do not install the Upstart init script that starts ssh daemon at boot time
 sed -i '/openssh-server-init/ d' ${BASE_CHROMEOS_DEV_ROOT_EBUILD}
 
-for package in {{ nayu_dev_root }} ; do
-  if cat ${BASE_CHROMEOS_DEV_ROOT_EBUILD} | grep ${package} ; then
-    echo "no need to change ${BASE_CHROMEOS_DEV_ROOT_EBUILD} file to add ${package}..." >> "${BUILD_LOG}"
-  else
-    printf "\n\nRDEPEND=\"\${RDEPEND}\n          ${package}\"\n">> ${BASE_CHROMEOS_DEV_ROOT_EBUILD}
-  fi
-done
-
 ######################################## Build ##############################################
 BOARDS="{{ boards_list }}"
 
@@ -82,13 +75,13 @@ for board in ${BOARDS}; do
   echo "building packages for a ${board}-flavoured Chromium OS..." >> "${BUILD_LOG}"
   cros_sdk -- ./build_packages --board=${board} >> "${BUILD_LOG}"
 
-  # Chromium original dev image
-  date >> "${BUILD_LOG}"
-  echo "building image for a ${board}-flavoured Chromium OS..." >> "${BUILD_LOG}"
-  cros_sdk -- ./build_image --board=${board} >> "${BUILD_LOG}" \
-    && echo "removing old image if any and creating image file $IMAGE_LOCATION..." >> "${BUILD_LOG}" \
-    && cros_sdk -- rm -f $IMAGE_LOCATION && cros_sdk -- touch $IMAGE_LOCATION \
-    && cros_sdk -- cros flash --board=${board} file://$IMAGE_LOCATION >> "${BUILD_LOG}"
+  ## Chromium original base image
+  #date >> "${BUILD_LOG}"
+  #echo "building image for a ${board}-flavoured Chromium OS..." >> "${BUILD_LOG}"
+  #cros_sdk -- ./build_image --board=${board} base >> "${BUILD_LOG}" \
+  #  && echo "removing old image if any and creating image file $IMAGE_LOCATION..." >> "${BUILD_LOG}" \
+  #  && cros_sdk -- rm -f $IMAGE_LOCATION && cros_sdk -- touch $IMAGE_LOCATION \
+  #  && cros_sdk -- cros flash --board=${board} file://$IMAGE_LOCATION >> "${BUILD_LOG}"
 
   # NayuOS
     # /usr/local/usr/lib/debug is needed because of symbolic links that leads 

software.cfg

@@ -35,7 +35,7 @@ command = sudo -V
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg
 rendered = ${buildout:directory}/instance.cfg
-md5sum = e58fa5979e33e93c42cb8605033322c6
+md5sum = 21bf362db7fcd7a833ca90954df9bc70
 mode = 0644
 scripts_dir = ${:_profile_base_location_}/scripts
 ebuilds_dir = ${:_profile_base_location_}/custom_ebuilds