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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
26d3175a
Commit
26d3175a
authored
Aug 17, 2018
by
Lorenzo Martinico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only add necessary ebuilds, fix typo
parent
46d9f928
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+1
-1
software/nayuos/scripts/cros_full_build.in
software/nayuos/scripts/cros_full_build.in
+3
-3
software/nayuos/software.cfg
software/nayuos/software.cfg
+1
-1
No files found.
software/nayuos/instance.cfg
View file @
26d3175a
...
...
@@ -99,7 +99,7 @@ context =
recipe = slapos.recipe.template:jinja2
template = {{ software_dir }}/scripts/cros_full_build.in
rendered = ${directory:run}/cros_full_build
md5sum =
2c5d17c0a907dc730cb24d09d1fb2d61
md5sum =
e6e007d407a69367b0ddaa5c92ca0fa0
mode = 0700
context =
key bash_path bin:bash
...
...
software/nayuos/scripts/cros_full_build.in
View file @
26d3175a
...
...
@@ -123,9 +123,9 @@ if [ $line_number ] ; then
fi
# add some ebuilds, specific to NayuOS
for category in
$( find {{ ebuilds_dir }} -maxdepth 1 -mindepth 1 -type d)
; do
for category in
{{ nayu_dev_packages }} {{nayu_dev_rootfs_packages }}
; do
echo ${category}
cp -R "
${category}/"* "${CHROMIUM_OVERLAY}/${category}/"
cp -R "
{{ ebuilds_dir }}/${category}" $(dirname "${CHROMIUM_OVERLAY}/${category}/")
done
install -m 770 "{{ scripts_dir }}/test_nayuos_image" "{{ cros_location }}/{{ branch }}/src/scripts/test_nayuos_image"
...
...
@@ -322,7 +322,7 @@ for board in ${BOARDS} ; do
NAYU_IMAGE_LOCATION=/tmp/${board}.nayuos.img
# rebuild packages with boot pictures
cros_sdk --nouse-image-- ./build_packages --board=${board} >> "${BUILD_LOG}"
cros_sdk --nouse-image
-- ./build_packages --board=${board} >> "${BUILD_LOG}"
# NayuOS images
date >> "${BUILD_LOG}"
...
...
software/nayuos/software.cfg
View file @
26d3175a
...
...
@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
mode = 0644
md5sum =
18425365676ffe7fe45e77a3f0838a0b
md5sum =
2833376b4b17bc0eecfb0910ced62d19
context =
key software_dir :_profile_base_location_
key instance_dir buildout:directory
...
...
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