NayuOS: add Chromium policies

Conflicts:
	software/nayuos/instance.cfg

software/nayuos/instance.cfg

@@ -25,6 +25,7 @@ command =
 [nayuos-ebuilds]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/nayuos-ebuilds.git
+branch = master
 
 ############################################################################################
 
@@ -84,7 +85,7 @@ context =
 recipe = slapos.recipe.template:jinja2
 template = {{ scripts_dir }}/cros_full_build.in
 rendered = ${directory:run}/cros_full_build
-md5sum = ffec0279ec4a3e13bb151e2a0796c29b
+md5sum = a0f66cd1eb525d0873670cfb81424968
 mode = 0700
 context =
   key bash_path bin:bash
@@ -97,4 +98,5 @@ context =
   key ebuilds_dir directory:ebuilds_dir
   key scripts_dir directory:scripts_dir
   key logo_dir directory:logo_dir
+  raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
   raw nayu_dev_packages net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup

software/nayuos/scripts/cros_full_build.in

@@ -93,6 +93,7 @@ install -m 770 "{{ scripts_dir }}/test_nayuos_image" "{{ cros_location }}/{{ bra
 
 ### packages management ###
 VIRTUAL_CHROMEOS_OS_DEV_EBUILD=${CHROMIUM_OVERLAY}/virtual/target-chromium-os-dev/target-chromium-os-dev-1.ebuild
+VIRTUAL_CHROMEOS_DEV_ROOTFS_EBUILD=${CHROMIUM_OVERLAY}/chromeos-base/chromeos-dev-root/chromeos-dev-root-0.0.1.ebuild
 
 # change the virtual ebuild responsible for installing all packages to add the ones
 # needed for NayuOS
@@ -105,7 +106,18 @@ for package in {{ nayu_dev_packages }} ; do
   fi
 done
 
+# XXX: create a function for this
+for package in {{ nayu_dev_rootfs_packages }} ; do
+  echo $package
+  if [[ $( grep "${package}" "${VIRTUAL_CHROMEOS_DEV_ROOTFS_EBUILD}" ) ]] ; then
+    echo "no need to change ${VIRTUAL_CHROMEOS_DEV_ROOTFS_EBUILD} file to add ${package}..." >> "${BUILD_LOG}"
+  else
+    printf "\n\nRDEPEND=\"\${RDEPEND}\n          ${package}\"\n">> ${VIRTUAL_CHROMEOS_DEV_ROOTFS_EBUILD}
+  fi
+done
+
 increase_revision_number ${CHROMIUM_OVERLAY}/virtual/target-chromium-os-dev
+increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-dev-root
 
 # do not install the Upstart init script that starts ssh daemon at boot time
 rm ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/files/openssh-server.conf
@@ -132,7 +144,6 @@ if [ "\${less_path}" ] ; then
 fi" >> ${BASH_EBUILD_DIR}/files/dot-bashrc
 fi
 
-# XXX: hardcoded revision numbers...
 increase_revision_number ${BASH_EBUILD_DIR}
 
 ######################################## Build ##############################################
@@ -174,9 +185,11 @@ for board in ${BOARDS} ; do
     && cros_sdk -- ./test_nayuos_image ${board} > "${TEST_LOG}" \
     || { echo "An error occured while building ${board} NayuOS image. Exiting." ; exit 1 ;}
 
-  # save ~15Go/device but delete cache (next build will be as long)
+  # save a lot of space on the server but delete cache and build files
+  # (it means that the next build will be as long and use as much resources as this one)
   if [ ${KEEP_CACHE,,} == "no" ] ; then
-    cros_sdk -- sudo rm -R /var/cache/chromeos-chrome/chrome-src/src/out_${board}
+    cros_sdk -- sudo rm -R "/var/cache/chromeos-chrome/chrome-src/src/out_${board}"
+    cros_sdk -- sudo rm -R "/build/${board}"
   fi
 
   if [ ${board} == daisy ]; then

software/nayuos/scripts/test_nayuos_image

@@ -17,6 +17,7 @@ BASHRC="etc/skel/.bashrc"
 GIT_CORE="usr/local/libexec/git-core/"
 EXPECTED_ALIAS="alias git='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
 
@@ -42,6 +43,8 @@ if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then
   gitcore=$(ls "${MOUNTPOINT}/${GIT_CORE}")
   gitalias=$(grep "${EXPECTED_ALIAS}" "${MOUNTPOINT}/${BASHRC}")
   virtualenvbin=$(ls "${MOUNTPOINT}/${VIRTUALENV_BIN}")
+  chromium_policy=$(ls "${MOUNTPOINT}/${CHROMIUM_POLICY}")
+
 else
   is_empty=1
 fi
@@ -96,6 +99,14 @@ else
   else
     print_result ${FAILURE} "Expected virtualenv binary not in ${MOUNTPOINT}/${VIRTUALENV_BIN}."
   fi
+
+  echo "* test if Chromium policies are installed"
+
+  if [[ ${chromium_policy} ]] ; then
+    print_result ${SUCCESS} "Chromium policies are installed."
+  else
+    print_result ${FAILURE} "Expected Chromium policies file not in ${MOUNTPOINT}/${CHROMIUM_POLICY}."
+  fi
 fi
 
 exit ${HAS_FAILED}

software/nayuos/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 = 6761ff454e186548ed9dc16e4410840a
+md5sum = fe8ce63b2d2f872427a52854c5cb5167
 mode = 0644
 scripts_dir = ${:_profile_base_location_}/scripts
 logo_dir = ${:_profile_base_location_}/logo