From d7fc0eb6f09908db8f3e658b9c402ab1827d8754 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 10 Jun 2019 21:44:02 +0100 Subject: [PATCH] procps-ng: free from busybox doesn't match top --- packages/sysutils/busybox/config/busybox-target.conf | 2 +- packages/tools/procps-ng/package.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index 335cdc181c..354d2593e9 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1007,7 +1007,7 @@ CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # -CONFIG_FREE=y +# CONFIG_FREE is not set CONFIG_FUSER=y CONFIG_IOSTAT=y CONFIG_KILL=y diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index dc7931cb8c..4794eaa43a 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -17,12 +17,13 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-modern-top \ --enable-static" -PKG_MAKE_OPTS_TARGET="top/top proc/libprocps.la proc/libprocps.pc" +PKG_MAKE_OPTS_TARGET="free top/top proc/libprocps.la proc/libprocps.pc" PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA" makeinstall_target() { mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/.$TARGET_NAME/free $INSTALL/usr/bin cp -P $PKG_BUILD/.$TARGET_NAME/top/top $INSTALL/usr/bin make DESTDIR=$SYSROOT_PREFIX -j1 $PKG_MAKEINSTALL_OPTS_TARGET