buildscript: fix/improve prepare step #103

adschm · 2021-02-04T15:41:18+01:00

adschm commented

2021-02-04 15:41:18 +01:00

This addresses several buildscript issues:

remove obsolete link for common download dir
remove template replacement for root_file_system
don't wipe build directory on prepare

This addresses several buildscript issues: * remove obsolete link for common download dir * remove template replacement for root_file_system * don't wipe build directory on prepare

adschm added the

build/scripts/tools

label 2021-02-04 15:41:18 +01:00

adschm added 3 commits 2021-02-04 15:41:19 +01:00

8aad142794 buildscript: remove unneeded global download directory link

Some time ago, the firmware created a directory for each target
and built OpenWrt separately there. In this situation, it made
sense to download files only once and share them between these
build directories.

However, since we nowadays only have one build directory for all
targets, this makes no sense anymore. Remove the link.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

2d8334e2df buildscript: do not overwrite build directory on prepare

So far, we remove the old and copy a fresh new OpenWrt directory
into the build directory on prepare. There is no need to do this,
as OpenWrt/Make is capable of detecting changes and we do properly
update the feeds and patches already.

So, just clone the OpenWrt main repo into builddir directly, and
just checkout/apply patches during prepare.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

2c807356ea buildscript: remove obsolete template rewrite

We do not use any *.tpl files anymore, so remove the routine for
installing them.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

rohammer approved these changes 2021-02-08 19:04:04 +01:00

rohammer left a comment

Aufraeumen tut immer gut.

Reviewed-by: Robert Langhammer <rlanghammer@web.de>

Aufraeumen tut immer gut. ``` Reviewed-by: Robert Langhammer <rlanghammer@web.de> ```

adschm commented

2021-02-09 23:02:02 +01:00

Ich nehme mal den einfachen ersten Patch und lasse den Rest noch etwas liegen.

fbl approved these changes 2021-03-02 00:51:41 +01:00

fbl left a comment

Sowohl mit als auch ohne der angefragten Änderung:
Reviewed-by: Fabian Bläse <fabian@blaese.de>

Sowohl mit als auch ohne der angefragten Änderung: `Reviewed-by: Fabian Bläse <fabian@blaese.de>`

buildscript

						
				@ -63,2 +63,4 @@

				        if $MYGIT remote -v | grep -q "$REPO_URL" ; then

				            echo "Right remote detected"

				            # Reset tracked files

				            $MYGIT reset --hard HEAD