Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
siteconf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
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
Clemens John
siteconf
Commits
b8fbcaeb
Commit
b8fbcaeb
authored
7 years ago
by
Jan-Tarek Butt
Browse files
Options
Downloads
Patches
Plain Diff
build.sh: break by branch fault
parent
54b23489
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.build/build.sh
+7
-5
7 additions, 5 deletions
.build/build.sh
with
7 additions
and
5 deletions
.build/build.sh
+
7
−
5
View file @
b8fbcaeb
...
...
@@ -9,7 +9,7 @@ GLUON_VERSION="$2"
#check installed debendenciece
if
[
-f
/etc/debian_version
]
;
then
echo
"Checking for git..."
if
!
command
-v
git
2&
> /dev/null
;
then
if
!
command
-v
git
>
/dev/null
2>&1
;
then
echo
"git is not installed"
exit
1
fi
...
...
@@ -73,9 +73,11 @@ ls -A | grep -v -E '(^|\s)site($|\s)' | xargs -I{} mv {} site/
# Clone Gluon repo
git init
.
git remote add origin https://github.com/freifunk-gluon/gluon.git
git pull origin
$GLUON_VERSION
git pull origin
"
$GLUON_VERSION
"
cd
site
&&
sh prepare.sh
&&
cd
..
cd
site
||
exit
1
sh prepare.sh
||
exit
1
cd
..
# fetch packages repos and apply patches
make update
||
exit
1
...
...
@@ -90,9 +92,9 @@ while read line; do
targ
=
$(
echo
$line
|
sed
-e
's/^.*GluonTarget//'
-e
's/^,//'
-e
's/)).*//'
-e
's/[,]/-/'
)
#Build arcitecture images
make
-j
$((
CPUS
*
2
))
GLUON_TARGET
=
$targ
BROKEN
=
1
GLUON_BRANCH
=
$GLUON_BRANCH
||
exit
1
make
-j
$((
CPUS
*
2
))
GLUON_TARGET
=
"
$targ
"
BROKEN
=
1
GLUON_BRANCH
=
"
$GLUON_BRANCH
"
||
exit
1
fi
;
done
<
"targets/targets.mk"
# create manifest file for autoupdater
make manifest
GLUON_BRANCH
=
$GLUON_BRANCH
make manifest
GLUON_BRANCH
=
"
$GLUON_BRANCH
"
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