Skip to content

Commit 0e27696

Browse files
committed
lxc: fix meson.build on esoteric host systems
When building lxc's meson.build tries to infer something for the target system out of the host build OS. This isn't reproducible and can actually fail on some OS' like NixOS. The failure looked like this, early in the building stage of lxc: > ../../../../build_dir/target-aarch64_cortex-a53_musl/lxc-6.0.5/meson.build:166:8: ERROR: Problem encountered: "distrosysconfdir" is not set The /etc/default seems to be something that is derived on most host systems, so use that as the explicit config. This fixes building lxc on NixOS and similar. This also makes the build more pure and reproducible. Before this commit building the same set of checkouts, same config would yield different lxc artifacts on RedHat and Ubuntu. It was probably harmless though. This also removes inactive maintainer from the Makefile. Signed-off-by: Michal Kazior <michal@plume.com>
1 parent 01ac296 commit 0e27696

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

utils/lxc/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
1010

1111
PKG_NAME:=lxc
1212
PKG_VERSION:=6.0.5
13-
PKG_RELEASE:=1
13+
PKG_RELEASE:=2
1414

1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1616
PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
1717
PKG_HASH:=2e540c60b9dd49e7ee1a4efa5e9c743b05df911b81b375ed5043d9dd7ee0b48a
1818

19-
PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
19+
PKG_MAINTAINER:=
2020
PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0
2121
PKG_LICENSE_FILES:=COPYING LICENSE.GPL2 LICENSE.LGPL2.1
2222
PKG_CPE_ID:=cpe:/a:linuxcontainers:lxc
@@ -32,6 +32,7 @@ MESON_ARGS += \
3232
-Dman=false \
3333
-Dapparmor=false \
3434
-Dselinux=false \
35+
-Ddistrosysconfdir=/etc/default \
3536
-Dseccomp=$(if $(CONFIG_LXC_SECCOMP),true,false) \
3637
-Dexamples=false \
3738
-Db_pie=true \

0 commit comments

Comments
 (0)