From 8b33a9531c4e64a53bfe9fbd59ef454ebd5128e3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 10 Sep 2014 15:30:06 +0100 Subject: [PATCH] procps-ng: Fix installation and take precedence over busybox Currently procps-ng binaries are installed under $(TARGET_DIR)/usr/usr instead of $(TARGET_DIR)/usr, which would be the expected. This is caused because the default value of the --exec-prefix configure option is /usr, and Buildroot always adds --prefix=/usr to the configure option. We fix this by setting --exec-prefix to an empty value. At the same time we make sure the procps-ng binaries have precedence over the busybox ones. Signed-off-by: Vicente Olivert Riera Reviewed-by: Markos.Chandras Acked-by: Thomas Petazzoni Tested-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/procps-ng/procps-ng.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index c327b4fa3..cedd667c5 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -13,9 +13,19 @@ PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses +# 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_NEEDS_GETTEXT_IF_LOCALE),y) PROCPS_NG_DEPENDENCIES += gettext PROCPS_NG_CONF_OPT += LIBS=-lintl endif +# We need this to make procps-ng binaries installed in $(TARGET_DIR)/usr +# instead of $(TARGET_DIR)/usr/usr +PROCPS_NG_CONF_OPT += --exec-prefix= + $(eval $(autotools-package))