package/iputils: add systemd dependency
PATCH 1/1 package/iputils: add systemd dependency
This is needed to ensure systemd services are installed.
--- package/iputils/iputils.mk | 4 ++++ 1 file changed, 4 insertions(+)
package/iputils/iputils.mk +4 -0
@@ -49,6 +49,10 @@ IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none IPUTILS_NINFOD = n endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +IPUTILS_DEPENDENCIES += systemd +endif + # ninfod requires <pthread.h> ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) IPUTILS_NINFOD = n
Signature · 1 line
2.20.1
PATCH 1/1 package/iputils: add systemd dependency
Hi James,
Quoted 12 lines
This is needed to ensure systemd services are installed.
Signed-off-by James Hilliard <[email protected]>--- package/iputils/iputils.mk | 4 ++++ 1 file changed, 4 insertions(+)package/iputils/iputils.mk +0
-0
package/iputils/iputils.mk IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none · line 54
Quoted 6 lines
package/iputils/iputils.mk +3
-0@@ -49,6 +49,10 @@ IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none IPUTILS_NINFOD = n endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +IPUTILS_DEPENDENCIES += systemd +endif
I'm trying to debug it with ./utils/test-pkg and it still does not install it.
It looks to me that other packages which defines dependency on systemd are doing it to pass some sort of --enable-systemd like flags.
But maybe I (again) miss something.
I tried to fix it in [1] (part of [2]), but adding prefix to systemd.get_pkgconfig_variable('systemdsystemunitdir') is probably wrong:
NetworkManager does not need that and I guess it's cross compilation works under buildroot. On the other hand running both builds locally with prefix /tmp/network-manager shows prefix used for systemdunitdir in autotools, but not in systemdunitdir.
I need to check meson sources, it looks to me as a bug (it should use prefix as it does for other directories).
AUTOTOOLS
System paths:
prefix: /tmp/network-manager
exec_prefix: ${prefix}
sysconfdir: ${prefix}/etc
localstatedir: ${prefix}/var
runstatedir: ${localstatedir}/run
datadir: ${datarootdir}
systemdunitdir: $(prefix)/lib/systemd/system
nmbinary: ${sbindir}/NetworkManager
nmconfdir: ${sysconfdir}/NetworkManager
nmlibdir: ${prefix}/lib/NetworkManager
nmdatadir: ${datadir}/NetworkManager
nmstatedir: ${localstatedir}/lib/NetworkManager
nmrundir: ${runstatedir}/NetworkManager
MESON
System paths:
prefix: /tmp/network-manager
exec_prefix: /tmp/network-manager
systemdunitdir: /lib/systemd/system
nmbinary: /tmp/network-manager/sbin/NetworkManager
nmconfdir: /tmp/network-manager/etc/NetworkManager
nmlibdir: /tmp/network-manager/lib/NetworkManager
nmdatadir: /tmp/network-manager/share/NetworkManager
nmstatedir: /tmp/network-manager/var/lib/NetworkManager
nmrundir: /tmp/network-manager/var/run/NetworkManager
nmvpndir: /tmp/network-manager/lib/x86_64-linux-gnu/NetworkManager
nmplugindir: /tmp/network-manager/lib/x86_64-linux-gnu/NetworkManager/1.21.1
Kind regards,
Petr
[1] https://github.com/iputils/iputils/pull/226/commits/6a585f96d638ae855ecd74180b4503e2ea45572d
[2] https://github.com/iputils/iputils/pull/226
Quoted 4 lines
package/iputils/iputils.mk +1
-0+ # ninfod requires <pthread.h> ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) IPUTILS_NINFOD = n
PATCH 1/1 package/iputils: add systemd dependency
Quoted 18 lines · Petr Vorel
Hi James,
Quoted 14 lines
This is needed to ensure systemd services are installed.
Signed-off-by James Hilliard <[email protected]>--- package/iputils/iputils.mk | 4 ++++ 1 file changed, 4 insertions(+)package/iputils/iputils.mk +0
-0@@ -49,6 +49,10 @@ IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none IPUTILS_NINFOD = n endif
Quoted 4 lines
package/iputils/iputils.mk IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none · line 54
Quoted 3 lines
package/iputils/iputils.mk +3
-0+ifeq ($(BR2_PACKAGE_SYSTEMD),y) +IPUTILS_DEPENDENCIES += systemd +endifI'm trying to debug it with ./utils/test-pkg and it still does not install it.
Are you able to reproduce this issue when doing a normal build?
I haven't been able to reproduce this, do you have a defconfig I can test with? I did a build with pc_x86_64_efi_defconfig modified to enable systemd and iputils
and the iputils systemd services were installed just fine.
my defconfig for reference:
BR2_x86_64=y
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
BR2_INIT_SYSTEMD=y
BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi-gpt.sh" BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
BR2_PACKAGE_ACPID=y
BR2_PACKAGE_CONNMAN=y
BR2_PACKAGE_CONNMAN_WIFI=y
BR2_PACKAGE_CONNMAN_CLIENT=y
BR2_PACKAGE_IPUTILS=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_GRUB2=y
BR2_TARGET_GRUB2_X86_64_EFI=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_MTOOLS=y
Quoted 53 lines
It looks to me that other packages which defines dependency on systemd are doing it to pass some sort of --enable-systemd like flags.
But maybe I (again) miss something.I tried to fix it in [1] (part of [2]), but adding prefix to
systemd.get_pkgconfig_variable('systemdsystemunitdir')is probably wrong:
NetworkManager does not need that and I guess it's cross compilation works under buildroot. On the other hand running both builds locally with prefix/tmp/network-managershows prefix used for systemdunitdir in autotools, but not in systemdunitdir.
I need to check meson sources, it looks to me as a bug (it should use prefix as it does for other directories).AUTOTOOLS
System paths:
prefix:/tmp/network-manager
exec_prefix: ${prefix}
sysconfdir: ${prefix}/etc
localstatedir: ${prefix}/var
runstatedir: ${localstatedir}/run
datadir: ${datarootdir}
systemdunitdir: $(prefix)/lib/systemd/system
nmbinary: ${sbindir}/NetworkManager
nmconfdir: ${sysconfdir}/NetworkManager
nmlibdir: ${prefix}/lib/NetworkManager
nmdatadir: ${datadir}/NetworkManager
nmstatedir: ${localstatedir}/lib/NetworkManager
nmrundir: ${runstatedir}/NetworkManagerMESON
System paths:
prefix:/tmp/network-manager
exec_prefix:/tmp/network-manager
systemdunitdir:/lib/systemd/system
nmbinary:/tmp/network-manager/sbin/NetworkManager
nmconfdir:/tmp/network-manager/etc/NetworkManager
nmlibdir:/tmp/network-manager/lib/NetworkManager
nmdatadir:/tmp/network-manager/share/NetworkManager
nmstatedir:/tmp/network-manager/var/lib/NetworkManager
nmrundir:/tmp/network-manager/var/run/NetworkManager
nmvpndir:/tmp/network-manager/lib/x86_64-linux-gnu/NetworkManager
nmplugindir:/tmp/network-manager/lib/x86_64-linux-gnu/NetworkManager/1.21.1Kind regards,
Petr[1] https://github.com/iputils/iputils/pull/226/commits/6a585f96d638ae855ecd74180b4503e2ea45572d
[2] https://github.com/iputils/iputils/pull/226Quoted 4 lines
package/iputils/iputils.mk +1
-0+ # ninfod requires <pthread.h> ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) IPUTILS_NINFOD = n
PATCH 1/1 package/iputils: add systemd dependency
Hi James,
Quoted 16 lines
Quoted 15 lines
Quoted 15 lines
This is needed to ensure systemd services are installed.
Signed-off-by James Hilliard <[email protected]>--- package/iputils/iputils.mk | 4 ++++ 1 file changed, 4 insertions(+)package/iputils/iputils.mk +0
-0@@ -49,6 +49,10 @@ IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none IPUTILS_NINFOD = n endif
Quoted 3 lines
Quoted 3 lines
package/iputils/iputils.mk IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none · line 54
Quoted 3 lines
package/iputils/iputils.mk +3
-0+ifeq ($(BR2_PACKAGE_SYSTEMD),y) +IPUTILS_DEPENDENCIES += systemd +endif
Hm, it works with your config, your patch is probably right.
I used more or less the same (make defconfig, but changed manually to glibc and systemd as init, which then also have BR2_PACKAGE_SYSTEMD=y and BR2_INIT_SYSTEMD=y).
I just wonder if it this should somehow depend on BR2_INIT_SYSTEMD.
Therefore last commit "meson: Use prefix for systemd directory" from PR#226 [1] is probably wrong.
Kind regards,
Petr
[1] https://github.com/iputils/iputils/pull/226
Quoted 51 lines
Quoted 1 line
I'm trying to debug it with ./utils/test-pkg and it still does not install it.
Are you able to reproduce this issue when doing a normal build?
I haven't been able to reproduce this, do you have a defconfig I can test with? I did a build withpc_x86_64_efi_defconfigmodified to enable systemd and iputils
and the iputils systemd services were installed just fine.
my defconfig for reference:
BR2_x86_64=y
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
BR2_INIT_SYSTEMD=y
BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi-gpt.sh" BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
BR2_PACKAGE_ACPID=y
BR2_PACKAGE_CONNMAN=y
BR2_PACKAGE_CONNMAN_WIFI=y
BR2_PACKAGE_CONNMAN_CLIENT=y
BR2_PACKAGE_IPUTILS=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
#BR2_TARGET_ROOTFS_TARis not set
BR2_TARGET_GRUB2=y
BR2_TARGET_GRUB2_X86_64_EFI=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_MTOOLS=y
Thomas Petazzoni
AppliedPATCH 1/1 package/iputils: add systemd dependency
In reply to James HilliardQuoted 6 lines · On Sun, 3 Nov 2019 00:07:43 -0600 James Hilliard <[email protected]>…
This is needed to ensure systemd services are installed.
Signed-off-by James Hilliard <[email protected]>--- package/iputils/iputils.mk | 4 ++++ 1 file changed, 4 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com