NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/busybox: invert dependency with procps-ng

Browse Source 
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Yann E. MORIN 2018-07-08 11:45:43 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent d1a6280fe6
commit bb47802fac
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/busybox/busybox.mk
View File

@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
# Packages that provide commands that may also be busybox applets: # Packages that provide commands that may also be busybox applets:
BUSYBOX_DEPENDENCIES = \ BUSYBOX_DEPENDENCIES = \
$(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \
$(if $(BR2_PACKAGE_PSMISC),psmisc) \ $(if $(BR2_PACKAGE_PSMISC),psmisc) \
$(if $(BR2_PACKAGE_RSYSLOGD),rsyslog) \ $(if $(BR2_PACKAGE_RSYSLOGD),rsyslog) \
$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \ $(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \

10
package/procps-ng/procps-ng.mk
View File

@ -13,12 +13,6 @@ PROCPS_NG_INSTALL_STAGING = YES
PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES)
PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS)
# If both procps-ng and busybox are selected, make certain procps-ng
# wins the fight over who gets to have their utils actually installed.
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
PROCPS_NG_DEPENDENCIES += busybox
endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y) ifeq ($(BR2_PACKAGE_SYSTEMD),y)
PROCPS_NG_DEPENDENCIES += systemd PROCPS_NG_DEPENDENCIES += systemd
PROCPS_NG_CONF_OPTS += --with-systemd PROCPS_NG_CONF_OPTS += --with-systemd
@ -26,8 +20,8 @@ else
PROCPS_NG_CONF_OPTS += --without-systemd PROCPS_NG_CONF_OPTS += --without-systemd
endif endif
# Make sure binaries get installed in /bin, so that they overwrite # Make sure binaries get installed in /bin, as busybox does, so that we
# their busybox counterparts. # don't end up with two versions.
# Make sure libprocps.pc is installed in STAGING_DIR/usr/lib/pkgconfig/ # Make sure libprocps.pc is installed in STAGING_DIR/usr/lib/pkgconfig/
# otherwise it's installed in STAGING_DIR/lib/pkgconfig/ breaking # otherwise it's installed in STAGING_DIR/lib/pkgconfig/ breaking
# pkg-config --libs libprocps. # pkg-config --libs libprocps.