Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
9be490db
Commit
9be490db
authored
Oct 09, 2015
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nayuos: No need to change /etc/hosts.
parent
db72eab3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
instance.cfg
instance.cfg
+1
-4
scripts/cros_full_build.sh.in
scripts/cros_full_build.sh.in
+5
-2
software.cfg
software.cfg
+1
-1
No files found.
instance.cfg
View file @
9be490db
...
...
@@ -64,10 +64,7 @@ template = {{ scripts_dir }}/modify_image.sh.in
rendered = ${directory:cros_location}/src/scripts/modify_image.sh
mode = 0770
commands = sudo rm /tmp/m/etc/init/openssh-server.conf
sudo install -d /tmp/m/var/run/net/
&& sudo sh -c "printf '127.0.0.1 localhost\n::1 localhost' > /tmp/m/var/run/net/hosts" \
&& sudo rm /tmp/m/etc/hosts \
&& sudo ln -s /tmp/m/etc/hosts /var/run/net/hosts
sudo emerge-$${BOARD} --root=/tmp/m --root-deps=rdeps --usepkgonly git
context =
key board parameters:configuration.boards
key commands :commands
\ No newline at end of file
scripts/cros_full_build.sh.in
View file @
9be490db
...
...
@@ -26,10 +26,12 @@ for board in ${BOARDS}; do
BUILD_LOG
={{
instance_log_dir
}}
/cros_build.log
# preparing packages (for chroot and image)
date
>>
$BUILD_LOG
echo
"building packages for a
${
board
}
-flavoured Chromium OS..."
>>
$BUILD_LOG
cros_sdk
--
./build_packages
--board
=
${
board
}
>>
$BUILD_LOG
# Chromium original dev image
date
>>
$BUILD_LOG
echo
"building image for a
${
board
}
-flavoured Chromium OS..."
>>
$BUILD_LOG
cros_sdk
--
./build_image
--board
=
${
board
}
>>
$BUILD_LOG
\
&&
echo
"removing old image if any and creating image file
$IMAGE_LOCATION
..."
>>
$BUILD_LOG
\
...
...
@@ -37,10 +39,11 @@ for board in ${BOARDS}; do
&&
cros_sdk
--
cros flash
--board
=
${
board
}
file://
$IMAGE_LOCATION
>>
$BUILD_LOG
# NayuOS
date
>>
$BUILD_LOG
echo
"rebuilding image with noenable_rootfs_verification and modifying image"
>>
$BUILD_LOG
cros_sdk
--
./build_image
--board
=
${
board
}
--noenable_rootfs_verification
>>
$BUILD_LOG
\
&&
cros_sdk
--
./modify_image.sh
${
board
}
\
cros_sdk
--
./build_image
--noenable_rootfs_verification
--board
=
${
board
}
>>
$BUILD_LOG
\
&&
echo
"modifying image, removing old image if any and creating image file
$NAYU_IMAGE_LOCATION
..."
>>
$BUILD_LOG
\
&&
cros_sdk
--
./modify_image.sh
${
board
}
\
&&
cros_sdk
--
rm
-f
$NAYU_IMAGE_LOCATION
&&
cros_sdk
--
touch
$NAYU_IMAGE_LOCATION
\
&&
cros_sdk
--
cros flash
--board
=
${
board
}
file://
$NAYU_IMAGE_LOCATION
>>
$BUILD_LOG
...
...
software.cfg
View file @
9be490db
...
...
@@ -35,7 +35,7 @@ command = sudo -V
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
md5sum =
fc963e19bb083726bca7e38224c0edfa
md5sum =
1d0d186af7d838ae79313d1b330c1c37
mode = 0644
scripts_dir = ${:_profile_base_location_}/scripts
context =
...
...
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