From 26898034f64721dda241f5a9ce32c1a3535f761b Mon Sep 17 00:00:00 2001 From: iv <isabelle.vallet@nexedi.com> Date: Fri, 22 Jul 2016 15:47:42 +0000 Subject: [PATCH] NayuOS: remove changes in portage-stable overlay after building --- software/nayuos/instance.cfg | 2 +- software/nayuos/scripts/cros_full_build.in | 5 ++++- software/nayuos/software.cfg | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/software/nayuos/instance.cfg b/software/nayuos/instance.cfg index 331830b04..9f0ce8b81 100644 --- a/software/nayuos/instance.cfg +++ b/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 diff --git a/software/nayuos/scripts/cros_full_build.in b/software/nayuos/scripts/cros_full_build.in index 58ac55253..069948cb9 100644 --- a/software/nayuos/scripts/cros_full_build.in +++ b/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 diff --git a/software/nayuos/software.cfg b/software/nayuos/software.cfg index 8bda9ef79..428e79f22 100644 --- a/software/nayuos/software.cfg +++ b/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 -- 2.30.9