[lxc/lxc] 5313e5: meson.build: allow explicit distrosysconfdir

1 view
Skip to first unread message

Christian Brauner

unread,
Nov 22, 2022, 2:11:01 AM11/22/22
to lxc-...@lists.linuxcontainers.org
Branch: refs/heads/stable-5.0
Home: https://github.com/lxc/lxc
Commit: 5313e50484c1f00d588dfbf108113a272784cff2
https://github.com/lxc/lxc/commit/5313e50484c1f00d588dfbf108113a272784cff2
Author: Đoàn Trần Công Danh <congd...@gmail.com>
Date: 2022-10-28 (Fri, 28 Oct 2022)

Changed paths:
M meson.build
M meson_options.txt

Log Message:
-----------
meson.build: allow explicit distrosysconfdir

Allows either:

- Build inside minimal-and-clean chroot with neither
/etc/sysconfig nor /etc/default available.
- Cross Compile lxc from foreign distro,
let's say host distro uses /etc/sysconfig and build distro
uses /etc/default and vice versus.

Signed-off-by: Đoàn Trần Công Danh <congd...@gmail.com>


Commit: b7b269680f4a773a54b274d7fbd1140fc32e1935
https://github.com/lxc/lxc/commit/b7b269680f4a773a54b274d7fbd1140fc32e1935
Author: Christian Brauner <bra...@kernel.org>
Date: 2022-10-28 (Fri, 28 Oct 2022)

Changed paths:
M meson.build
M src/lxc/conf.c
M src/lxc/conf.h
M src/lxc/mount_utils.c
M src/lxc/syscall_wrappers.h

Log Message:
-----------
build: detect where struct mount_attr is declared

Fixes: #4176
Signed-off-by: Christian Brauner (Microsoft) <christia...@ubuntu.com>


Commit: e510d6bd870c15fc509477343cb1268b9726caa6
https://github.com/lxc/lxc/commit/e510d6bd870c15fc509477343cb1268b9726caa6
Author: Christian Brauner <bra...@kernel.org>
Date: 2022-10-28 (Fri, 28 Oct 2022)

Changed paths:
M meson.build
M src/lxc/process_utils.h

Log Message:
-----------
build: detect sys/pidfd.h availability

Fixes: #4176
Signed-off-by: Christian Brauner (Microsoft) <christia...@ubuntu.com>


Commit: 2a9743bba63903b66331b0b90fe2c25784585b89
https://github.com/lxc/lxc/commit/2a9743bba63903b66331b0b90fe2c25784585b89
Author: Aleksa Sarai <cyp...@cyphar.com>
Date: 2022-10-28 (Fri, 28 Oct 2022)

Changed paths:
M src/lxc/cgroups/cgfsng.c

Log Message:
-----------
cgroups: fix -Waddress warning

While in principle the pointer could overflow, GCC 12 considers this to
not be possible and issues the following warning:

../src/lxc/cgroups/cgfsng.c: In function ‘__cgfsng_delegate_controllers’:
../src/lxc/cgroups/cgfsng.c:3306:21: warning: the comparison will always evaluate as ‘true’ for the pointer operand in ‘it + 8’ must not be NULL [-Waddress]
3306 | if ((it + 1) && *(it + 1))
| ^

This removes the only build warning triggered when building on openSUSE.

Signed-off-by: Aleksa Sarai <cyp...@cyphar.com>


Commit: 062c2d9803074c62e801f61d4957bbefa1e9398a
https://github.com/lxc/lxc/commit/062c2d9803074c62e801f61d4957bbefa1e9398a
Author: Aleksa Sarai <cyp...@cyphar.com>
Date: 2022-10-28 (Fri, 28 Oct 2022)

Changed paths:
M meson.build
M src/lxc/cmd/meson.build
M src/lxc/meson.build

Log Message:
-----------
build: fix handling of dependancies to fix build on openSUSE

Among other things, openSUSE places seccomp.h inside a non-default
include directory (/usr/include/seccomp/seccomp.h) which revealed
several issues with how dependencies were being handled previously.

The most notable issue is that the include cflags of our build
dependencies were not being provided to the recipes for static
executables (yet they still expected access to the dependency headers).

This also involved a minor cleanup of how these dependencies are
collected, and added liburing to the set of private pkg-config libs
(which I assume was an oversight?).

Signed-off-by: Aleksa Sarai <cyp...@cyphar.com>


Commit: 59f69162caed3781d6737d2a4bc039e2205b8470
https://github.com/lxc/lxc/commit/59f69162caed3781d6737d2a4bc039e2205b8470
Author: Aleksa Sarai <cyp...@cyphar.com>
Date: 2022-10-28 (Fri, 28 Oct 2022)

Changed paths:
M meson.build
M src/lxc/cmd/meson.build

Log Message:
-----------
build: only build init.lxc.static if libcap is statically linkable

Without setting this, the default build will fail if you don't have the
static libcap library installed (on openSUSE this is packaged separately
to libcap-devel).

Signed-off-by: Aleksa Sarai <cyp...@cyphar.com>


Commit: 1d5c7e771c036e72a1c516f49b7d7aa1a9da4bb7
https://github.com/lxc/lxc/commit/1d5c7e771c036e72a1c516f49b7d7aa1a9da4bb7
Author: Aleksa Sarai <cyp...@cyphar.com>
Date: 2022-10-28 (Fri, 28 Oct 2022)

Changed paths:
M config/init/systemd/meson.build
M meson_options.txt

Log Message:
-----------
build: drop build-time systemd dependency

On openSUSE, our packages are build in the Open Build Service which does
not have a proper systemd installation that you can query to get the
systemdunitdir.

The simplest solution is to re-add the ability to explicitly set the
systemdunitdir (as was previously possible with the autotools build
system in pre-5.0 LXC).

Signed-off-by: Aleksa Sarai <cyp...@cyphar.com>


Commit: 116c24ade68fc6b1afed10dc9d08e864cf55f162
https://github.com/lxc/lxc/commit/116c24ade68fc6b1afed10dc9d08e864cf55f162
Author: Christian Brauner <chri...@brauner.io>
Date: 2022-11-22 (Tue, 22 Nov 2022)

Changed paths:
M config/init/systemd/meson.build
M meson.build
M meson_options.txt
M src/lxc/cgroups/cgfsng.c
M src/lxc/cmd/meson.build
M src/lxc/conf.c
M src/lxc/conf.h
M src/lxc/meson.build
M src/lxc/mount_utils.c
M src/lxc/process_utils.h
M src/lxc/syscall_wrappers.h

Log Message:
-----------
Merge pull request #4215 from cyphar/lxc5.x-opensuse-build

[lxc-5.0.z] build: fix build issues on openSUSE


Compare: https://github.com/lxc/lxc/compare/0539095ac713...116c24ade68f
Reply all
Reply to author
Forward
0 new messages