Commit dab4fcdf authored by Vicente Olivert Riera's avatar Vicente Olivert Riera Committed by Peter Korsgaard
Browse files

procps-ng: install binaries in /bin and /sbin 



This way the busybox counterparts are overwritten and we will not end up
with procps-ng binaries in /usr/bin and /usr/sbin, and busybox symlinks
for the same tools in /bin and /sbin.

Signed-off-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 15886619

package/procps-ng/procps-ng.mk

+14 −2
Original line number Diff line number Diff line
@@ -19,6 +19,18 @@ PROCPS_NG_GETTEXTIZE = YES 
# wins the fight over who gets to have their utils actually installed.

ifeq ($(BR2_PACKAGE_BUSYBOX),y)

PROCPS_NG_DEPENDENCIES += busybox

# Also overwrite the remaining busybox symlinks for tools which are now

# provided by procps-ng and got installed in /usr/bin instead of /bin.

# Currently these tools are only pidof and watch. We only need to do

# this if the /usr/bin and /bin directories are not merged.

ifeq ($(BR2_ROOTFS_MERGED_USR),)

define PROCPS_NG_MOVE_BINARIES

	for i in pidof watch; do \

		mv $(TARGET_DIR)/usr/bin/$$i $(TARGET_DIR)/bin/; \

	done

endef

PROCPS_NG_POST_INSTALL_TARGET_HOOKS += PROCPS_NG_MOVE_BINARIES

endif

endif



ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
@@ -40,8 +52,8 @@ PROCPS_NG_CONF_OPTS += \ 
	--exec-prefix=/ \

	--sysconfdir=/etc \

	--libdir=/usr/lib \

	--bindir=/usr/bin \

	--sbindir=/usr/sbin

	--bindir=/bin \

	--sbindir=/sbin



# Allows unicode characters to show in 'watch'

ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)