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
Aurel
slapos
Commits
362213c2
Commit
362213c2
authored
Jun 26, 2018
by
Lorenzo Martinico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove git package
parent
03b9058b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
25 deletions
+1
-25
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+1
-1
software/nayuos/scripts/cros_full_build.in
software/nayuos/scripts/cros_full_build.in
+0
-8
software/nayuos/scripts/test_nayuos_image
software/nayuos/scripts/test_nayuos_image
+0
-16
No files found.
software/nayuos/instance.cfg
View file @
362213c2
...
@@ -116,4 +116,4 @@ context =
...
@@ -116,4 +116,4 @@ context =
# those packages will be marked as dependency of root filesystem
# those packages will be marked as dependency of root filesystem
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
# those packages will be marked as dependency of the chromium build itself
# those packages will be marked as dependency of the chromium build itself
raw nayu_dev_packages dev-
vcs/git dev-
python/flask dev-python/virtualenv sys-fs/cryptsetup
raw nayu_dev_packages dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
software/nayuos/scripts/cros_full_build.in
View file @
362213c2
...
@@ -163,14 +163,6 @@ if ! grep "BEGIN NayuOS configuration" "${BASH_EBUILD_DIR}/files/dot-bashrc" > /
...
@@ -163,14 +163,6 @@ if ! grep "BEGIN NayuOS configuration" "${BASH_EBUILD_DIR}/files/dot-bashrc" > /
# use vim as default editor if nano does not exist
# use vim as default editor if nano does not exist
which nano &> /dev/null || export EDITOR=vim
which nano &> /dev/null || export EDITOR=vim
# git quickfix for finding right git executables
export GIT_EXEC_PATH=/usr/local/libexec/git-core
# configure .gitconfig once
if [ ! -e ~/.gitconfig ] ; then
which less &> /dev/null && git config --global core.pager less
fi
# go to ~/Download
# go to ~/Download
[ "\$(pwd)" = / ] && cd ~/Downloads
[ "\$(pwd)" = / ] && cd ~/Downloads
...
...
software/nayuos/scripts/test_nayuos_image
View file @
362213c2
...
@@ -12,8 +12,6 @@ BOARD=$1
...
@@ -12,8 +12,6 @@ BOARD=$1
MOUNTPOINT
=
"/tmp/
${
BOARD
}
"
MOUNTPOINT
=
"/tmp/
${
BOARD
}
"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
BASHRC
=
"etc/skel/.bashrc"
BASHRC
=
"etc/skel/.bashrc"
GIT_CORE
=
"usr/local/libexec/git-core/"
GIT_EXPECTED_EXPORT
=
"export GIT_EXEC_PATH=/usr/local/libexec/git-core"
VIRTUALENV_BIN
=
"usr/local/bin/virtualenv"
VIRTUALENV_BIN
=
"usr/local/bin/virtualenv"
CHROMIUM_POLICY
=
"etc/chromium/policies/recommended/nayuos_policy.json"
CHROMIUM_POLICY
=
"etc/chromium/policies/recommended/nayuos_policy.json"
...
@@ -37,8 +35,6 @@ install -d "${MOUNTPOINT}"
...
@@ -37,8 +35,6 @@ install -d "${MOUNTPOINT}"
echo
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
echo
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
if
[[
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
]]
;
then
if
[[
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
]]
;
then
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
gitcore
=
$(
ls
"
${
MOUNTPOINT
}
/
${
GIT_CORE
}
"
)
gitexport
=
$(
grep
"
${
GIT_EXPECTED_EXPORT
}
"
"
${
MOUNTPOINT
}
/
${
BASHRC
}
"
)
virtualenvbin
=
$(
ls
"
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
"
)
virtualenvbin
=
$(
ls
"
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
"
)
chromium_policy
=
$(
ls
"
${
MOUNTPOINT
}
/
${
CHROMIUM_POLICY
}
"
)
chromium_policy
=
$(
ls
"
${
MOUNTPOINT
}
/
${
CHROMIUM_POLICY
}
"
)
...
@@ -66,20 +62,8 @@ else
...
@@ -66,20 +62,8 @@ else
echo
"* test if git core directory is not empty"
echo
"* test if git core directory is not empty"
if
[[
"
${
gitcore
}
"
==
""
]]
;
then
print_result
${
FAILURE
}
"No git file in
${
MOUNTPOINT
}
/
${
GIT_CORE
}
."
else
print_result
${
SUCCESS
}
"git core directory exists and is not empty."
fi
echo
"* test bashrc changes for git paths quick fix"
echo
"* test bashrc changes for git paths quick fix"
if
[[
"
${
gitexport
}
"
==
""
]]
;
then
print_result
${
FAILURE
}
"Expected alias for git command not in
${
MOUNTPOINT
}
/
${
BASHRC
}
. There should be:
${
GIT_EXPECTED_EXPORT
}
"
else
print_result
${
SUCCESS
}
"git alias is correct."
fi
echo
"* test if virtualenv binary exists"
echo
"* test if virtualenv binary exists"
if
[[
${
virtualenvbin
}
]]
;
then
if
[[
${
virtualenvbin
}
]]
;
then
...
...
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