Commit 26d3175a authored by Lorenzo Martinico's avatar Lorenzo Martinico

Only add necessary ebuilds, fix typo

parent 46d9f928
...@@ -99,7 +99,7 @@ context = ...@@ -99,7 +99,7 @@ context =
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ software_dir }}/scripts/cros_full_build.in template = {{ software_dir }}/scripts/cros_full_build.in
rendered = ${directory:run}/cros_full_build rendered = ${directory:run}/cros_full_build
md5sum = 2c5d17c0a907dc730cb24d09d1fb2d61 md5sum = e6e007d407a69367b0ddaa5c92ca0fa0
mode = 0700 mode = 0700
context = context =
key bash_path bin:bash key bash_path bin:bash
......
...@@ -123,9 +123,9 @@ if [ $line_number ] ; then ...@@ -123,9 +123,9 @@ if [ $line_number ] ; then
fi fi
# add some ebuilds, specific to NayuOS # 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} echo ${category}
cp -R "${category}/"* "${CHROMIUM_OVERLAY}/${category}/" cp -R "{{ ebuilds_dir }}/${category}" $(dirname "${CHROMIUM_OVERLAY}/${category}/")
done done
install -m 770 "{{ scripts_dir }}/test_nayuos_image" "{{ cros_location }}/{{ branch }}/src/scripts/test_nayuos_image" 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 ...@@ -322,7 +322,7 @@ for board in ${BOARDS} ; do
NAYU_IMAGE_LOCATION=/tmp/${board}.nayuos.img NAYU_IMAGE_LOCATION=/tmp/${board}.nayuos.img
# rebuild packages with boot pictures # 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 # NayuOS images
date >> "${BUILD_LOG}" date >> "${BUILD_LOG}"
......
...@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2 ...@@ -26,7 +26,7 @@ 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
mode = 0644 mode = 0644
md5sum = 18425365676ffe7fe45e77a3f0838a0b md5sum = 2833376b4b17bc0eecfb0910ced62d19
context = context =
key software_dir :_profile_base_location_ key software_dir :_profile_base_location_
key instance_dir buildout:directory key instance_dir buildout:directory
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment