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
Klaus Wölfel
slapos
Commits
89d89c18
Commit
89d89c18
authored
Jun 30, 2017
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NayuOS] Revert of commit
ba61b318
(NayuOS: add Chromium policies)
parent
790c8382
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+3
-2
software/nayuos/scripts/cros_full_build.in
software/nayuos/scripts/cros_full_build.in
+7
-2
software/nayuos/software.cfg
software/nayuos/software.cfg
+1
-1
No files found.
software/nayuos/instance.cfg
View file @
89d89c18
...
@@ -96,7 +96,7 @@ context =
...
@@ -96,7 +96,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 =
d015e62f327dc8b81ba4c5ea2b2f863e
md5sum =
560e17da3d9f3110fe562a8da425051d
mode = 0700
mode = 0700
context =
context =
key bash_path bin:bash
key bash_path bin:bash
...
@@ -109,5 +109,6 @@ context =
...
@@ -109,5 +109,6 @@ context =
key ebuilds_dir directory:ebuilds_dir
key ebuilds_dir directory:ebuilds_dir
key scripts_dir directory:scripts_dir
key scripts_dir directory:scripts_dir
key logo_dir directory:logo_dir
key logo_dir directory:logo_dir
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
json nayu_dev_rootfs_packages ""
# raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
raw nayu_dev_packages net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
raw nayu_dev_packages net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
software/nayuos/scripts/cros_full_build.in
View file @
89d89c18
...
@@ -109,6 +109,10 @@ for package in {{ nayu_dev_packages }} ; do
...
@@ -109,6 +109,10 @@ for package in {{ nayu_dev_packages }} ; do
fi
fi
done
done
if [ ! -z "{{ nayu_dev_packages }}" ]; then
increase_revision_number ${CHROMIUM_OVERLAY}/virtual/target-chromium-os-dev
fi
# XXX: create a function for this
# XXX: create a function for this
for package in {{ nayu_dev_rootfs_packages }} ; do
for package in {{ nayu_dev_rootfs_packages }} ; do
echo $package
echo $package
...
@@ -119,8 +123,9 @@ for package in {{ nayu_dev_rootfs_packages }} ; do
...
@@ -119,8 +123,9 @@ for package in {{ nayu_dev_rootfs_packages }} ; do
fi
fi
done
done
increase_revision_number ${CHROMIUM_OVERLAY}/virtual/target-chromium-os-dev
if [ ! -z "{{ nayu_dev_rootfs_packages }}" ]; then
increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-dev-root
increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-dev-root
fi
# do not install the Upstart init script that starts ssh daemon at boot time
# do not install the Upstart init script that starts ssh daemon at boot time
rm ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/files/openssh-server.conf
rm ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/files/openssh-server.conf
...
...
software/nayuos/software.cfg
View file @
89d89c18
...
@@ -25,7 +25,7 @@ slapos.recipe.template = 2.9
...
@@ -25,7 +25,7 @@ slapos.recipe.template = 2.9
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 =
f4f1dcd506661a81a5c7e9f5123663a9
md5sum =
7b2ac25e47ed2736618104f1bd6b87cf
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