Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freedombone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Context Sensitive Group
freedombone
Commits
a839b00a
Commit
a839b00a
authored
6 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Configurable filename for build log
parent
bddc98a1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
man/freedombone-image.1.gz
+0
-0
0 additions, 0 deletions
man/freedombone-image.1.gz
src/freedombone-image
+9
-1
9 additions, 1 deletion
src/freedombone-image
src/freedombone-image-make
+5
-1
5 additions, 1 deletion
src/freedombone-image-make
with
14 additions
and
2 deletions
man/freedombone-image.1.gz
+
0
−
0
View file @
a839b00a
No preview for this file type
This diff is collapsed.
Click to expand it.
src/freedombone-image
+
9
−
1
View file @
a839b00a
...
...
@@ -77,6 +77,9 @@ PASSWORD=
CONTINUOUS_INTEGRATION
=
""
# filename where the build progress will be logged to
BUILD_LOG
=
# IP address of the router (gateway)
ROUTER_IP_ADDRESS
=
"192.168.1.254"
...
...
@@ -331,6 +334,10 @@ do
shift
IMAGE_TYPE
=
"
$1
"
;;
--build-log
)
shift
BUILD_LOG
=
"
$1
"
;;
-u
|
--user
|
--username
)
shift
USERNAME
=
"
$1
"
...
...
@@ -639,7 +646,8 @@ make "$IMAGE_TYPE" \
SOCIALINSTANCE
=
"
$SOCIALINSTANCE
"
\
EXTERNAL_DRIVE
=
"
$EXTERNAL_DRIVE
"
\
CONTINUOUS_INTEGRATION
=
"
$CONTINUOUS_INTEGRATION
"
\
LOCAL_NAME
=
"
$LOCAL_NAME
"
LOCAL_NAME
=
"
$LOCAL_NAME
"
\
BUILD_LOG
=
"
$BUILD_LOG
"
# shellcheck disable=SC2181
if
[
!
"
$?
"
=
"0"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
src/freedombone-image-make
+
5
−
1
View file @
a839b00a
...
...
@@ -79,6 +79,7 @@ export SOCIALINSTANCE
export
LOCAL_NAME
export
EXTERNAL_DRIVE
export
CONTINUOUS_INTEGRATION
export
BUILD_LOG
# Locate vmdebootstrap program fetched in Makefile
basedir
=
`
pwd
`
...
...
@@ -270,6 +271,9 @@ fi
sudo chmod
+x
$TEMP_CUSTOMISE
echo
$'Customised customisation script created'
if
[
!
"
$BUILD_LOG
"
]
;
then
BUILD_LOG
=
"
$(
dirname
"
$IMAGE
"
)
/
${
PROJECT_NAME
}
.log"
fi
echo
$"starting
$VMDEBOOTSTRAP
"
...
...
@@ -287,7 +291,7 @@ sudo -H \
EXTERNAL_DRIVE
=
"
$EXTERNAL_DRIVE
"
\
CONTINUOUS_INTEGRATION
=
"
$CONTINUOUS_INTEGRATION
"
\
$VMDEBOOTSTRAP
\
--log
"
$
(
dirname
"
$IMAGE
"
)
/
${
PROJECT_NAME
}
.log
"
\
--log
"
$
BUILD_LOG
"
\
--log-level
debug
\
--size
"
$IMAGE_SIZE
"
\
--image
"
$IMAGE
.img"
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment