lxc icon indicating copy to clipboard operation
lxc copied to clipboard

build: add more options for customizing install

Open adamcstephens opened this issue 1 year ago • 7 comments

Trying to get the nix lxc package up to 5.x and these options are helpful to avoid writing to places outside the nix sandbox. The default behavior should be unchanged.

adamcstephens avatar Dec 27 '23 20:12 adamcstephens

This pull request didn't trigger Jenkins as its author isn't in the allow list.

An organization member must perform one of the following:

  • To have this branch tested by Jenkins, use the "ok to test" command.
  • To have a one time test done, use the "test this please" command.

Those commands are simple Github comments of the format: "jenkins: COMMAND"

lxc-jenkins avatar Dec 27 '23 20:12 lxc-jenkins

I'd need to do some tests to be sure, but I thought we couldn't do conditional subdir statements because that also had the side effect of not including things in the dist tarball.

stgraber avatar Dec 27 '23 22:12 stgraber

(That's unless you pass all the right flags to cover every feature and so get everything in the dist tarball, but that kinda defeats the point as that target should be as reproducible as possible)

stgraber avatar Dec 27 '23 22:12 stgraber

I’m open to adjusting if needed. I figured setting them to default enable should be sufficient but I’ll admit I don’t know meson very well. This won’t block the upgrade for us, but I do prefer to upstream instead of carrying patches if possible.

adamcstephens avatar Dec 28 '23 00:12 adamcstephens

@stgraber Do you think this will get consideration, or should I plant to just maintain our own patch to enable building in nixpkgs?

adamcstephens avatar Feb 02 '24 17:02 adamcstephens

It's been on my to-do to do a proper review for a little while. We should be able to accommodate Nix.

stgraber avatar Feb 02 '24 21:02 stgraber

Thanks! No rush, I was just auditing my open PRs and figured it'd been long enough to check back in.

adamcstephens avatar Feb 02 '24 22:02 adamcstephens

jenkins: ok to test

mihalicyn avatar Apr 02 '24 17:04 mihalicyn

Testsuite passed

lxc-jenkins avatar Apr 02 '24 17:04 lxc-jenkins

Looks safe and this does not change default behavior.

LGTM!

mihalicyn avatar Apr 02 '24 17:04 mihalicyn

Just did a quick diff of before/after tarballs to make sure this isn't causing a bunch of files to be missed and it looks fine:

stgraber@dakara:~/data/code/lxc/lxc/a (install-options)$ diff -Nrup orig new | diffstat
 meson.build       |   79 +++++++++++++++++++++++++++++++++++++++++++++----------------------------------
 meson_options.txt |    8 ++++++++
 2 files changed, 53 insertions(+), 34 deletions(-)

stgraber avatar Apr 02 '24 17:04 stgraber

And also confirmed that our current dist tarball matches the git tree (as in, we're not missing any files outside of this change).

stgraber avatar Apr 02 '24 17:04 stgraber