Skip to content
Snippets Groups Projects
Commit 36d8f0ac authored by chrissi^'s avatar chrissi^ Committed by chrissi^
Browse files

Remove patching-feature from builder


Until now patches for gluon have been organized in the site-repo. From
now on they are maintained as a stack of patches on top of the
gluon-upstream in our own fork.

Signed-off-by: default avatarChrissi^ <chris@tinyhost.de>
parent 7ce37b79
No related branches found
No related tags found
No related merge requests found
...@@ -6,12 +6,12 @@ cd ../ ...@@ -6,12 +6,12 @@ cd ../
# Setting environment # Setting environment
# ################### # ###################
ARCHITECTURES=( ar71xx-tiny ar71xx-generic ar71xx-nand brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic x86-64 x86-generic ramips-mt7621) #ARCHITECTURES=( ar71xx-tiny ar71xx-generic ar71xx-nand brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic x86-64 x86-generic ramips-mt7621)
#ARCHITECTURES=( ar71xx-tiny ) ARCHITECTURES=( ar71xx-tiny )
#BRANCH=stable #BRANCH=stable
#BRANCH=unbranded_stable #BRANCH=unbranded_stable
#BRANCH=experimental BRANCH=experimental
BRANCH=beta #BRANCH=beta
# prepare needed strings # prepare needed strings
GLUONVERSION=$(git describe --tags | cut -d "-" -f 1) GLUONVERSION=$(git describe --tags | cut -d "-" -f 1)
...@@ -43,6 +43,7 @@ sed -i -e "s/AUTOUPDATERBRANCH/$BRANCH/g" site/site.conf ...@@ -43,6 +43,7 @@ sed -i -e "s/AUTOUPDATERBRANCH/$BRANCH/g" site/site.conf
# remove old images to make sure we only upload the new shiny stuff # remove old images to make sure we only upload the new shiny stuff
rm -rf output/images rm -rf output/images
# update toolchain to current release # update toolchain to current release
make update make update
...@@ -59,22 +60,9 @@ do ...@@ -59,22 +60,9 @@ do
# ############### # ###############
make clean GLUON_TARGET=$ARCHITECTURE $DEBUG -j24 make clean GLUON_TARGET=$ARCHITECTURE $DEBUG -j24
git reset --hard
# Applying patches
# ################
# (aka patching the gluon-build environment that after that patches the OpenWRT...)
if [ -d site/patches/ ]; then
for f in site/patches/*; do
echo $f
git apply $f
done
fi
# Doing the Build # Doing the Build
# ############### # ###############
make all GLUON_TARGET=$ARCHITECTURE $DEBUG -j16 GLUON_RELEASE=${RELEASENAME} GLUON_BRANCH=$BRANCH GLUON_PRIORITY=$PRIO GLUON_ATH10K_MESH=ibss make all GLUON_TARGET=$ARCHITECTURE $DEBUG -j24 GLUON_RELEASE=${RELEASENAME} GLUON_BRANCH=$BRANCH GLUON_PRIORITY=$PRIO GLUON_ATH10K_MESH=ibss
echo Exiting with Code $? echo Exiting with Code $?
done done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment