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

Fixes two issues with make clean #66

Closed
wants to merge 3 commits into from
Closed

Conversation

thedoc31
Copy link
Contributor

@thedoc31 thedoc31 commented Feb 15, 2024

Yesterday, I built haproxy 2.8.5 using make MAINVERSION=2.8, which downloaded haproxy-2.8.5.tar.gz into ./SOURCES. Today, 2.8.6 was released so I wanted to build it, but start fresh. I issued make clean, but the code tried to remove haproxy-2.4.25.tar.gz which was obviously incorrect, and the haproxy-2.8.5.tar.gz file remained. make clean MAINVERSION=2.8 did not work either, because it wants to remove haproxy-2.8.6.tar.gz (the current upstream version) and nothing else.

The way make clean is configured now, it will only try to remove whatever the current upstream version of MAINVERSION is rather than removing any/all versions which might happen to be in ./SOURCES. This could also get messy for people who might be using the same build box for multiple MAINVERSION versions, say 2.7 and 2.8.

Therefore, for make clean to work as I would expect it to, I propose we remove all ./SOURCES/haproxy-*.tar.gz archives.

Lastly, the git diff is showing I removed the last line feed from EOF but I didn't - it's still there in code. I am not sure why git is reporting it as a change; I tried to put the line feed back, but just got an empty commit a364d0f. 🙄 Apologies for the mess.

@thedoc31
Copy link
Contributor Author

@DBezemer not sure if you saw this, so ping!

@DBezemer
Copy link
Owner

@thedoc31 thanks for the changes, I'm considering that we could empty out the whole SOURCES dir instead as multiple other archives could be placed there as well when building with some options, any comment/concern to that?

@thedoc31
Copy link
Contributor Author

thedoc31 commented Apr 5, 2024

@thedoc31 thanks for the changes, I'm considering that we could empty out the whole SOURCES dir instead as multiple other archives could be placed there as well when building with some options, any comment/concern to that?

None at all, I was conservative in case there was something else I hadn't thought of. I'll update the PR.

Using DBezemer's suggestion to remove entire SOURCES folder to be extra sure it's starting fresh
@thedoc31
Copy link
Contributor Author

@DBezemer Done! Have a look.

@DBezemer
Copy link
Owner

DBezemer commented Apr 16, 2024

@thedoc31 I just realized clearing out SOURCES will also remove the files provided by the repo, so I think removing all .tar.gz files only is a better idea so it clears up both the LUA archive and the HAP archive. Apologies for the roundabout on this :)

rm -f SOURCES/*.tar.gz

@DBezemer DBezemer closed this in 6bf55a7 Apr 16, 2024
@thedoc31
Copy link
Contributor Author

@thedoc31 I just realized clearing out SOURCES will also remove the files provided by the repo, so I think removing all .tar.gz files only is a better idea so it clears up both the LUA archive and the HAP archive. Apologies for the roundabout on this :)

rm -f SOURCES/*.tar.gz

No problem, thanks!

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

Successfully merging this pull request may close these issues.

2 participants