Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Building from scratch fails due to attempt to delete non-existing gluon branch "patched" #62

Closed
jj-freifunk-muc opened this issue Jun 8, 2019 · 2 comments

Comments

@jj-freifunk-muc
Copy link

Checked out a fresh, clean copy of tag v2019.0.4, then tried to build from scratch, but build fails almost at the beginning:

[user@node001 site-ffm.test2]$ make

#########################
# FFMUC Firmware build
# Building release v2019.0.4 for branch stable

make manifest
make[1]: Entering directory `/home/user/site-ffm.test2'
rm -rf output
(cd gluon-build \
        && git remote set-url origin https://github.com/freifunk-gluon/gluon.git \
        && git fetch origin \
        && git checkout -q v2018.2.1)
ln -sfT .. gluon-build/site
make gluon-patch
make[2]: Entering directory `/home/user/site-ffm.test2'
echo "Applying Patches ..."
Applying Patches ...
(cd gluon-build; git branch -D patched)
error: branch 'patched' not found.
make[2]: *** [gluon-patch] Error 1
make[2]: Leaving directory `/home/user/site-ffm.test2'
make[1]: *** [gluon-prepare] Error 2
make[1]: Leaving directory `/home/user/site-ffm.test2'
make: *** [all] Error 2

Manually creating a branch called "patched" in the repo inside the gluon-build directory works around the issue and allows the build to move forward.

@jj-freifunk-muc jj-freifunk-muc changed the title Building from scratch fails because trying to delete non-existing gluon branch "patched" fails Building from scratch fails due to attempt to delete non-existing gluon branch "patched" Jun 8, 2019
@awlx
Copy link
Member

awlx commented Jun 8, 2019

It's a known issue.

We maybe should move from the old and often patched Makefile to a buildscript of another community.

@awlx
Copy link
Member

awlx commented Jan 16, 2020

Fixed via 026f468#diff-b67911656ef5d18c4ae36cb6741b7965

@awlx awlx closed this as completed Jan 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants