buildscript: fix/improve prepare step #103
34
buildscript
34
buildscript
|
@ -62,6 +62,11 @@ checkout_git(){
|
||||||
if [ -d "$DIRECTORY" ]; then
|
if [ -d "$DIRECTORY" ]; then
|
||||||
if $MYGIT remote -v | grep -q "$REPO_URL" ; then
|
if $MYGIT remote -v | grep -q "$REPO_URL" ; then
|
||||||
echo "Right remote detected"
|
echo "Right remote detected"
|
||||||
|
# Reset tracked files
|
||||||
|
$MYGIT reset --hard HEAD
|
||||||
|
|||||||
|
# Remove untracked files
|
||||||
|
$MYGIT clean -f -d
|
||||||
|
# Select desired commit
|
||||||
if ! $MYGIT checkout "$COMMITID" ; then
|
if ! $MYGIT checkout "$COMMITID" ; then
|
||||||
echo "commitid not found trying to fetch new commits"
|
echo "commitid not found trying to fetch new commits"
|
||||||
$MYGIT pull && $MYGIT checkout "$COMMITID"
|
$MYGIT pull && $MYGIT checkout "$COMMITID"
|
||||||
|
@ -82,14 +87,11 @@ checkout_git(){
|
||||||
}
|
}
|
||||||
|
|
||||||
get_source() {
|
get_source() {
|
||||||
test -d src || mkdir src
|
#Get the OpenWrt main repo
|
||||||
cd src
|
checkout_git $builddir $OPENWRTURL $OPENWRTREV
|
||||||
|
|
||||||
#Get the OpenWrt Core Source for Firmware
|
test -d src/packages || mkdir -p src/packages
|
||||||
checkout_git openwrt $OPENWRTURL $OPENWRTREV
|
cd src/packages
|
||||||
|
|
||||||
test -d packages || mkdir packages
|
|
||||||
cd packages
|
|
||||||
|
|
||||||
#checkout needed package feeds
|
#checkout needed package feeds
|
||||||
for FEEDVAR in "${FEEDS[@]}" ; do
|
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||||
|
@ -129,21 +131,12 @@ patch_target() {
|
||||||
prepare() {
|
prepare() {
|
||||||
get_source
|
get_source
|
||||||
|
|
||||||
test -d $builddir || mkdir $builddir
|
|
||||||
|
|
||||||
/bin/rm -rf "$builddir"
|
|
||||||
cp -a src/openwrt "$builddir"
|
|
||||||
|
|
||||||
patch_target
|
patch_target
|
||||||
|
|
||||||
# apply variant to ensure the included file "variant.mk"
|
# apply variant to ensure the included file "variant.mk"
|
||||||
# exists in builddir.
|
# exists in builddir.
|
||||||
apply_variant
|
apply_variant
|
||||||
|
|
||||||
#saves ~200MB for each build
|
|
||||||
test -d ./src/dl || mkdir ./src/dl
|
|
||||||
ln -s ../src/dl "$builddir"/dl
|
|
||||||
|
|
||||||
update_feeds
|
update_feeds
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -197,13 +190,6 @@ prebuild() {
|
||||||
cp -r ./bsp/default/root_file_system/* "$builddir"/files/
|
cp -r ./bsp/default/root_file_system/* "$builddir"/files/
|
||||||
cp ./bsp/"$machine"/.config "$builddir"/.config
|
cp ./bsp/"$machine"/.config "$builddir"/.config
|
||||||
|
|
||||||
while IFS= read -r -d '' template
|
|
||||||
do
|
|
||||||
echo "Translating $template .."
|
|
||||||
$tpl_translate "$template" > "$(dirname "$template")"/"$(basename "$template" .tpl)"
|
|
||||||
/bin/rm "$template"
|
|
||||||
done < <(find "${builddir}/files" -name '*.tpl' -print0)
|
|
||||||
|
|
||||||
#insert actual firware version informations into release file
|
#insert actual firware version informations into release file
|
||||||
variant=$(cat selected_variant)
|
variant=$(cat selected_variant)
|
||||||
version=$(git describe --tags --dirty)
|
version=$(git describe --tags --dirty)
|
||||||
|
@ -346,7 +332,7 @@ buildrelease() {
|
||||||
}
|
}
|
||||||
|
|
||||||
clean() {
|
clean() {
|
||||||
/bin/rm -rf bin $builddir src/openwrt
|
/bin/rm -rf bin $builddir
|
||||||
|
|
||||||
# remove downloaded package feeds
|
# remove downloaded package feeds
|
||||||
for FEEDVAR in "${FEEDS[@]}" ; do
|
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||||
|
|
Loading…
Reference in New Issue
Ich würde hier "$COMMITID" nehmen.
Aber das brauchts hier gar nicht, wenn man beim checkout noch ein "-f" hinzufügt. Würde ich glaube ich bevorzugen.