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

Make build reproducible #1

Merged
merged 2 commits into from Jan 2, 2024
Merged

Make build reproducible #1

merged 2 commits into from Jan 2, 2024

Conversation

davidpolverari
Copy link
Contributor

The current Makefile creates a tarball with files whose permissions vary dependind on the umask.

This patch makes the build more deterministic by adding '--mode=go=rX,u+rw,a-s' to tar command line.

The current Makefile creates a tarball with files whose permissions vary
dependind on the umask.

This patch makes the build more deterministic by adding
'--mode=go=rX,u+rw,a-s' to tar command line.
Copy link
Owner

@Franticware Franticware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

INSTALLDIR should align with new prefix for OpenMRac (/usr/share/openmrac/ -> /usr/local/share/openmrac/) or use the prefix method similar to what you introduced into OpenMRac makefile (I am not exactly sure how it does it, but the expected openmrac.dat path indeed changed).

@davidpolverari
Copy link
Contributor Author

INSTALLDIR should align with new prefix for OpenMRac (/usr/share/openmrac/ -> /usr/local/share/openmrac/) or use the prefix method similar to what you introduced into OpenMRac makefile (I am not exactly sure how it does it, but the expected openmrac.dat path indeed changed).

Hi! I made those changes during the packaging work to include OpenMRac in Debian. I just added the prefix ?= /usr/local line for completeness, to make the Makefile more general and not too Debian-specific. As DIR_OPENMRAC_DAT is defined relative to prefix, I don't think it will present any problems. What problems do you see happening?

BTW, in case you don't know yet, OpenMRac is already in Debian unstable and testing [1] and in Ubuntu [2], as you requested its packaging [3]. Congratulations for the nice game and thanks for making it available!

[1] https://tracker.debian.org/pkg/openmrac

[2] https://launchpad.net/ubuntu/+source/openmrac

[3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1017986

@davidpolverari
Copy link
Contributor Author

davidpolverari commented Jan 2, 2024

INSTALLDIR should align with new prefix for OpenMRac (/usr/share/openmrac/ -> /usr/local/share/openmrac/) or use the prefix method similar to what you introduced into OpenMRac makefile (I am not exactly sure how it does it, but the expected openmrac.dat path indeed changed).

Oh, sorry for my mistake. I thought you were talking about OpenMRac, not OpenMRac-data. I will have a look at it. I didn't have any problems during packaging, but I will build both in a standalone way with those patches and see if any problem arises.

@Franticware
Copy link
Owner

Franticware commented Jan 2, 2024

With the new OpenMRac makefile, I see:
Error loading /usr/local/share/openmrac/openmrac.dat

I believe this should be addressed on the OpenMRac-data makefile side of things.

Thanks for all the effort on your side! I am happy to see the game spreading.

@Franticware
Copy link
Owner

Franticware commented Jan 2, 2024

Also, it might be a good idea to also have separate openmrac-gles2 package in Debian (OpenGL ES2 linked build, no game data) - many ARM and Risc-V based SBCs use Debian and have much better ES2 support than desktop GL. Maybe that even is already the case, I don't know because I use Manjaro. Again, just an idea and not required for this PR.

@Franticware
Copy link
Owner

I have merged the OpenMRac PR so that I can remove the deb target because I see it is no longer necessary.

@davidpolverari
Copy link
Contributor Author

I have tested building and installing with this newest commit, and now it works when building it as presented in README.md.

@Franticware Franticware merged commit e68c2bb into Franticware:main Jan 2, 2024
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.

None yet

2 participants