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
Lu Xu
slapos
Commits
7042567a
Commit
7042567a
authored
Nov 06, 2015
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nayuos: On the way to a clean and working way to add re6stnet.
parent
286eb70b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
17 deletions
+16
-17
instance.cfg
instance.cfg
+3
-2
scripts/cros_full_build.sh.in
scripts/cros_full_build.sh.in
+12
-4
scripts/modify_image.sh
scripts/modify_image.sh
+0
-10
software.cfg
software.cfg
+1
-1
No files found.
instance.cfg
View file @
7042567a
...
@@ -48,7 +48,7 @@ scripts_dir = {{ scripts_dir }}
...
@@ -48,7 +48,7 @@ scripts_dir = {{ scripts_dir }}
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = {{ scripts_dir }}/cros_full_build.sh.in
template = {{ scripts_dir }}/cros_full_build.sh.in
rendered = ${directory:run}/cros_full_build.sh
rendered = ${directory:run}/cros_full_build.sh
md5sum =
711901bd5da4f7edd11d711e65b14bbc
md5sum =
5a219df73265afae234e03892079d0ce
mode = 0770
mode = 0770
context =
context =
# for access to the eggs from the instance
# for access to the eggs from the instance
...
@@ -59,4 +59,5 @@ context =
...
@@ -59,4 +59,5 @@ context =
key boards_list parameters:configuration.boards
key boards_list parameters:configuration.boards
key ebuilds_dir directory:ebuilds_dir
key ebuilds_dir directory:ebuilds_dir
key scripts_dir directory:scripts_dir
key scripts_dir directory:scripts_dir
raw nayu_packages dev-vcs/git net-misc/re6stnet
raw nayu_dev_packages net-libs/nodejs net-misc/re6stnet dev-vcs/git # would need to be in /usr/bin
\ No newline at end of file
raw nayu_dev_root chromeos-base/re6stnet-init # should be in /etc/init and /etc/re6stnet (and not /usr/local/etc/...)
\ No newline at end of file
scripts/cros_full_build.sh.in
View file @
7042567a
...
@@ -34,17 +34,17 @@ fi
...
@@ -34,17 +34,17 @@ fi
# add custom ebuilds
# add custom ebuilds
for
category
in
$(
ls
{{
ebuilds_dir
}}
)
;
do
for
category
in
$(
ls
{{
ebuilds_dir
}}
)
;
do
echo
${
category
}
echo
${
category
}
cp
-R
{{
ebuilds_dir
}}
/
${
category
}
/
*
{{
cros_location
}}
/src/third_party/chromiumos-overlay/
${
category
}
/
cp
-R
{{
ebuilds_dir
}}
/
${
category
}
/
*
{{
cros_location
}}
/src/third_party/chromiumos-overlay/
${
category
}
/
done
done
### packages management ###
### packages management ###
BASE_CHROMEOS_DEV_ROOT_EBUILD
={{
cros_location
}}
/src/third_party/chromiumos-overlay/chromeos-base/chromeos-dev-root/chromeos-dev-root-0.0.1.ebuild
BASE_CHROMEOS_DEV_ROOT_EBUILD
={{
cros_location
}}
/src/third_party/chromiumos-overlay/chromeos-base/chromeos-dev-root/chromeos-dev-root-0.0.1.ebuild
VIRTUAL_CHROMEOS_OS_DEV_EBUILD
={{
cros_location
}}
/src/third_party/chromiumos-overlay/virtual/target-chromium-os-dev/target-chromium-os-dev-1.ebuild
VIRTUAL_CHROMEOS_OS_DEV_EBUILD
={{
cros_location
}}
/src/third_party/chromiumos-overlay/virtual/target-chromium-os-dev/target-chromium-os-dev-1.ebuild
# change the virtual ebuild responsible for installing all packages to add the ones
# change the virtual ebuild responsible for installing all packages to add the ones
# needed for NayuOS
# needed for NayuOS
for
package
in
{{
nayu_packages
}}
;
do
for
package
in
{{
nayu_
dev_
packages
}}
;
do
if
cat
${
VIRTUAL_CHROMEOS_OS_DEV_EBUILD
}
|
grep
${
package
}
;
then
if
cat
${
VIRTUAL_CHROMEOS_OS_DEV_EBUILD
}
|
grep
${
package
}
;
then
echo
"no need to change
${
VIRTUAL_CHROMEOS_OS_DEV_EBUILD
}
file to add
${
package
}
..."
>>
"
${
BUILD_LOG
}
"
echo
"no need to change
${
VIRTUAL_CHROMEOS_OS_DEV_EBUILD
}
file to add
${
package
}
..."
>>
"
${
BUILD_LOG
}
"
else
else
...
@@ -55,6 +55,14 @@ done
...
@@ -55,6 +55,14 @@ done
# 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
sed
-i
'/openssh-server-init/ d'
${
BASE_CHROMEOS_DEV_ROOT_EBUILD
}
sed
-i
'/openssh-server-init/ d'
${
BASE_CHROMEOS_DEV_ROOT_EBUILD
}
for
package
in
{{
nayu_dev_root
}}
;
do
if
cat
${
BASE_CHROMEOS_DEV_ROOT_EBUILD
}
|
grep
${
package
}
;
then
echo
"no need to change
${
BASE_CHROMEOS_DEV_ROOT_EBUILD
}
file to add
${
package
}
..."
>>
"
${
BUILD_LOG
}
"
else
printf
"
\n\n
RDEPEND=
\"\$
{RDEPEND}
\n
${
package
}
\"\n
"
>>
${
BASE_CHROMEOS_DEV_ROOT_EBUILD
}
fi
done
######################################## Build ##############################################
######################################## Build ##############################################
BOARDS
=
"{{ boards_list }}"
BOARDS
=
"{{ boards_list }}"
...
...
scripts/modify_image.sh
deleted
100644 → 0
View file @
286eb70b
#! /bin/bash
# This script will modify all the images produced after running it for the given board,
# that is given as first parameter
BOARD
=
$1
./mount_gpt_image.sh
-f
$(
./get_latest_image.sh
--board
=
${
BOARD
}
)
sudo rm
/tmp/m/etc/init/openssh-server.conf
sudo
emerge-
${
BOARD
}
--root
=
/tmp/m
--root-deps
=
rdeps
--usepkgonly
git babeld-re6stnet re6stnet
./mount_gpt_image.sh
-f
$(
./get_latest_image.sh
--board
=
${
BOARD
}
)
-u
\ No newline at end of file
software.cfg
View file @
7042567a
...
@@ -35,7 +35,7 @@ command = sudo -V
...
@@ -35,7 +35,7 @@ command = sudo -V
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 =
274271cee06f175653ff20f351cc5c65
md5sum =
e58fa5979e33e93c42cb8605033322c6
mode = 0644
mode = 0644
scripts_dir = ${:_profile_base_location_}/scripts
scripts_dir = ${:_profile_base_location_}/scripts
ebuilds_dir = ${:_profile_base_location_}/custom_ebuilds
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