Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
26898034
Commit
26898034
authored
Jul 22, 2016
by
iv
Committed by
Tomáš Peterka
Aug 04, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NayuOS: remove changes in portage-stable overlay after building
parent
f7c99367
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+1
-1
software/nayuos/scripts/cros_full_build.in
software/nayuos/scripts/cros_full_build.in
+4
-1
software/nayuos/software.cfg
software/nayuos/software.cfg
+1
-1
No files found.
software/nayuos/instance.cfg
View file @
26898034
...
@@ -85,7 +85,7 @@ context =
...
@@ -85,7 +85,7 @@ context =
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = {{ scripts_dir }}/cros_full_build.in
template = {{ scripts_dir }}/cros_full_build.in
rendered = ${directory:run}/cros_full_build
rendered = ${directory:run}/cros_full_build
md5sum =
a0f66cd1eb525d0873670cfb81424968
md5sum =
d6342b3a578fecd50ef86c6efd7b68bb
mode = 0700
mode = 0700
context =
context =
key bash_path bin:bash
key bash_path bin:bash
...
...
software/nayuos/scripts/cros_full_build.in
View file @
26898034
...
@@ -39,6 +39,7 @@ function increase_revision_number() {
...
@@ -39,6 +39,7 @@ function increase_revision_number() {
DL_LOG="{{ instance_log_dir }}/cros_sources_dl.log"
DL_LOG="{{ instance_log_dir }}/cros_sources_dl.log"
BRANCH="{{ branch }}"
BRANCH="{{ branch }}"
CHROMIUM_OVERLAY="{{ cros_location }}/{{ branch }}/src/third_party/chromiumos-overlay"
CHROMIUM_OVERLAY="{{ cros_location }}/{{ branch }}/src/third_party/chromiumos-overlay"
PORTAGE_STABLE="{{ cros_location }}/{{ branch }}/src/third_party/portage-stable"
{{ export_path_cmd }}
{{ export_path_cmd }}
echo "getting Chromium OS sources..." >> $DL_LOG
echo "getting Chromium OS sources..." >> $DL_LOG
...
@@ -57,6 +58,8 @@ repo init -u https://chromium.googlesource.com/chromiumos/manifest.git -b {{ bra
...
@@ -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
# in case changes were already made, stash changes to be able to pull
cd ${CHROMIUM_OVERLAY}
cd ${CHROMIUM_OVERLAY}
git stash
git stash
cd ${PORTAGE_STABLE}
git stash
repo sync >> $DL_LOG || { echo "Problem while downloading Chromium OS sources (repo sync). Exiting." ; exit 1 ; }
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/
...
@@ -128,7 +131,7 @@ increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/openssh-server-init/
increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/
increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/
# bashrc modifications
# 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
if ! grep '----- BEGIN NayuOS configuration -----' "${BASH_EBUILD_DIR}/files/dot-bashrc" > /dev/null ; then
cat >> "${BASH_EBUILD_DIR}/files/dot-bashrc" <<EOF
cat >> "${BASH_EBUILD_DIR}/files/dot-bashrc" <<EOF
...
...
software/nayuos/software.cfg
View file @
26898034
...
@@ -26,7 +26,7 @@ command = sudo -V
...
@@ -26,7 +26,7 @@ command = sudo -V
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg
template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
md5sum =
fe8ce63b2d2f872427a52854c5cb5167
md5sum =
beae7b081543219fdf4f402681fa8af5
mode = 0644
mode = 0644
scripts_dir = ${:_profile_base_location_}/scripts
scripts_dir = ${:_profile_base_location_}/scripts
logo_dir = ${:_profile_base_location_}/logo
logo_dir = ${:_profile_base_location_}/logo
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment