On 2016-07-16 19:11 +0100, Steven Chamberlain wrote:
> Sven Joachim wrote:
>> Attached is a patch which should fix that. I am fairly confident that
>> it works, but as I don't have a kfreebsd system it is not tested.
>
> I've tested this from procps Git, but currently not working:
>
> | mkdir /home/steven/procps/debian/tmp/bbin
> | mv /home/steven/procps/debian/tmp/bin/kill
> /home/steven/procps/debian/tmp/bbin/
> | mv /home/steven/procps/debian/tmp/bin/ps
> /home/steven/procps/debian/tmp/bbin/
> | # Rename w as there are two of them
> | (cd /home/steven/procps/debian/tmp/bin && mv w w.procps )
> | (cd /home/steven/procps/debian/tmp/usr/share/man/man1 && mv w.1 w.procps.1 )
> | rm -f \
> | /home/steven/procps/debian/tmp/bin/slabtop \
> | /home/steven/procps/debian/tmp/usr/share/man/man1/slabtop.1 \
> | /home/steven/procps/debian/tmp/sbin/sysctl \
> | /home/steven/procps/debian/tmp/usr/share/man/man8/sysctl.8 \
> | /home/steven/procps/debian/tmp/usr/share/man/man5/sysctl.conf.5 \
> |
> | (cd /home/steven/procps/debian/tmp/bin && mv kill kill.procps )
> | mv: cannot stat ‘kill’: No such file or directory
> | debian/rules:44: recipe for target 'override_dh_auto_install' failed
> | make[1]: *** [override_dh_auto_install] Error 1
> | make[1]: Leaving directory '/home/steven/procps'
> | debian/rules:24: recipe for target 'binary-arch' failed
> | make: *** [binary-arch] Error 2
>
> $ ls debian/tmp/bin
> free pkill pwdx snice top vmstat w.procps
> pgrep pmap skill tload uptime watch
>
> $ ls debian/tmp/bbin
> kill ps
Thanks for testing! The attached patch should take care of this.
Cheers,
Sven
>From 5c2293e8a2e8b3e1611bcf3a57f2ab3abccebf3c Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenj...@gmx.de>
Date: Sat, 16 Jul 2016 20:23:34 +0200
Subject: [PATCH] Fix renaming kill and ps in debian/rules
Thanks to Steven Chamberlain for noticing this.
---
debian/rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 0414541..82f9a9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ ifneq ($(DEB_HOST_ARCH_OS), linux)
$(NULL)
# Rename kill as there are two of them
- (cd $(DEBROOT)/bin && mv kill kill.procps )
+ (cd $(DEBROOT)/bbin && mv kill kill.procps )
(cd $(DEBROOT)/usr/share/man/man1 && mv kill.1 kill.procps.1 )
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -79,7 +79,7 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
(cd $(DEBROOT)/usr/share/man/man1 && mv uptime.1 uptime.procps.1 )
# Rename ps as there are two of them
- (cd $(DEBROOT)/bin && mv ps ps.procps )
+ (cd $(DEBROOT)/bbin && mv ps ps.procps )
(cd $(DEBROOT)/usr/share/man/man1 && mv ps.1 ps.procps.1 )
endif
--
2.8.1
