NayuOS: remove changes in portage-stable overlay after building

software/nayuos/instance.cfg

@@ -85,7 +85,7 @@ context =
 recipe = slapos.recipe.template:jinja2
 template = {{ scripts_dir }}/cros_full_build.in
 rendered = ${directory:run}/cros_full_build
-md5sum = a0f66cd1eb525d0873670cfb81424968
+md5sum = d6342b3a578fecd50ef86c6efd7b68bb
 mode = 0700
 context =
   key bash_path bin:bash

software/nayuos/scripts/cros_full_build.in

@@ -39,6 +39,7 @@ function increase_revision_number() {
 DL_LOG="{{ instance_log_dir }}/cros_sources_dl.log"
 BRANCH="{{ branch }}"
 CHROMIUM_OVERLAY="{{ cros_location }}/{{ branch }}/src/third_party/chromiumos-overlay"
+PORTAGE_STABLE="{{ cros_location }}/{{ branch }}/src/third_party/portage-stable"
 
 {{ export_path_cmd }}
 echo "getting Chromium OS sources..." >> $DL_LOG
@@ -57,6 +58,8 @@ repo init -u https://chromium.googlesource.com/chromiumos/manifest.git -b {{ bra
 # in case changes were already made, stash changes to be able to pull
 cd ${CHROMIUM_OVERLAY}
 git stash
+cd ${PORTAGE_STABLE}
+git stash
 
 repo sync >> $DL_LOG || { echo "Problem while downloading Chromium OS sources (repo sync). Exiting." ; exit 1 ; }
 
@@ -128,7 +131,7 @@ increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/openssh-server-init/
 increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/
 
 # bashrc modifications
-BASH_EBUILD_DIR='{{ cros_location }}/{{ branch }}/src/third_party/portage-stable/app-shells/bash'
+BASH_EBUILD_DIR="${PORTAGE_STABLE}/app-shells/bash"
 if ! grep '----- BEGIN NayuOS configuration -----' "${BASH_EBUILD_DIR}/files/dot-bashrc" > /dev/null ; then
   cat >> "${BASH_EBUILD_DIR}/files/dot-bashrc" <<EOF
 

software/nayuos/software.cfg

@@ -26,7 +26,7 @@ command = sudo -V
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg
 rendered = ${buildout:directory}/instance.cfg
-md5sum = fe8ce63b2d2f872427a52854c5cb5167
+md5sum = beae7b081543219fdf4f402681fa8af5
 mode = 0644
 scripts_dir = ${:_profile_base_location_}/scripts
 logo_dir = ${:_profile_base_location_}/logo