Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Aurélien Vermylen
slapos
Commits
e0ae0bf5
Commit
e0ae0bf5
authored
Jan 28, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nayuos: Fix bashrc!
parent
d6c99cd1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
13 deletions
+12
-13
instance.cfg
instance.cfg
+1
-1
scripts/cros_full_build.in
scripts/cros_full_build.in
+10
-11
software.cfg
software.cfg
+1
-1
No files found.
instance.cfg
View file @
e0ae0bf5
...
...
@@ -48,7 +48,7 @@ logo_dir = {{ logo_dir }}
recipe = slapos.recipe.template:jinja2
template = {{ scripts_dir }}/cros_full_build.in
rendered = ${directory:run}/cros_full_build
md5sum =
7de043b33367048e78b835a0ff0a4d55
md5sum =
0657492802013f6c1a65c886eb59068f
mode = 0770
context =
# for access to the eggs from the instance
...
...
scripts/cros_full_build.in
View file @
e0ae0bf5
...
...
@@ -79,8 +79,8 @@ cd ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/
mv
chromeos-sshd-init-0.0.1-r5.ebuild chromeos-sshd-init-0.0.1-r6.ebuild
# bashrc modifications
BASH_EBUILD
={{
cros_location
}}
/
{{
branch
}}
/src/third_party/portage-stable/app-shells/bash
if
[[
$(
grep
"git --exec-path"
"
${
BASH_EBUILD
}
/files/dot-bashrc"
)
]]
;
then
BASH_EBUILD
_DIR
={{
cros_location
}}
/
{{
branch
}}
/src/third_party/portage-stable/app-shells/bash
if
[[
$(
grep
"git --exec-path"
"
${
BASH_EBUILD
_DIR
}
/files/dot-bashrc"
)
]]
;
then
echo
"git alias already set"
else
echo
"# git quickfix for finding right git executables
...
...
@@ -89,12 +89,15 @@ if [ -d /usr/local/libexec/git-core/ ] ; then
fi
# git quickfix for finding 'less' and using it as pager
if [
$(
which less
)
] ; then
git config --global core.pager
$(
which less
)
less_path=
\$
(which less 2>/dev/null)
if [ "
\$
{
less_path
}
" ] ; then
git config --global core.pager
\$
{less_path}
fi"
>>
${
BASH_EBUILD_DIR
}
/files/dot-bashrc
fi
"
>>
${
BASH_EBUILD
}
/files/dot-bashrc
fi
#XXX: change bash ebuild revision number (as it is made for sshd removal)
# XXX: hardcoded
cd
${
BASH_EBUILD_DIR
}
ln
-s
bash-4.2_p48-r1.ebuild bash-4.2_p48-r2.ebuild
######################################## Build ##############################################
BOARDS
=
"{{ boards_list }}"
...
...
@@ -119,7 +122,6 @@ for board in ${BOARDS} ; do
cros_sdk
--
cros_workon_make
--board
=
${
board
}
chromiumos-assets
--install
cp
{{
logo_dir
}}
/
*
{{
cros_location
}}
/
{{
branch
}}
/src/platform/chromiumos-assets/images_100_percent/
cp
{{
logo_dir
}}
/
*
{{
cros_location
}}
/
{{
branch
}}
/src/platform/chromiumos-assets/images_200_percent/
#cros_sdk -- git commit -a -m "Changing boot pictures." # TODO: should not be necessary
NAYU_IMAGE_LOCATION
=
${
board
}
.nayuos.img
...
...
@@ -135,9 +137,6 @@ for board in ${BOARDS} ; do
&&
cros_sdk
--
./test_nayuos_image
${
board
}
>
"
${
TEST_LOG
}
"
\
||
exit
1
# TODO: test produced image (ex: make a diff of grandenet script from ebuild dir,
# check that <mountpoint>/usr/local is not empty, ...)
# save ~15Go/device but delete cache (next build will be as long)
if
[
${
KEEP_CACHE
,,
}
==
"no"
]
;
then
cros_sdk
--
sudo rm
-R
/var/cache/chromeos-chrome/chrome-src/src/out_
${
board
}
...
...
software.cfg
View file @
e0ae0bf5
...
...
@@ -35,7 +35,7 @@ command = sudo -V
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
md5sum =
0b11860d6cab4112fe83721ab955062
7
md5sum =
b09c445b15f87a91cb5b4b2b582e7c1
7
mode = 0644
scripts_dir = ${:_profile_base_location_}/scripts
ebuilds_dir = ${:_profile_base_location_}/custom_ebuilds
...
...
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