Page MenuHomeFreeBSD
Files F154647323

D38344.id116235.diff
No OneTemporary
Actions

D38344.id116235.diff
View Options

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -52,6 +52,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20230201: timeout moved from /usr/bin to /bin
+OLD_FILES+=usr/tests/usr.bin/timeout/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/timeout/timeout_test
+
# 20230124: rtalloc.9 removed
OLD_FILES+=usr/share/man/man9/rtalloc.9.gz
diff --git a/bin/Makefile b/bin/Makefile
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -38,6 +38,7 @@
stty \
sync \
test \
+ timeout \
uuidgen
SUBDIR.${MK_SENDMAIL}+= rmail
diff --git a/usr.bin/timeout/Makefile b/bin/timeout/Makefile
rename from usr.bin/timeout/Makefile
rename to bin/timeout/Makefile
--- a/usr.bin/timeout/Makefile
+++ b/bin/timeout/Makefile
@@ -4,6 +4,8 @@
PROG= timeout
+SYMLINKS= ../..${BINDIR}/timeout /usr/bin/timeout
+
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
diff --git a/usr.bin/timeout/Makefile.depend b/bin/timeout/Makefile.depend
rename from usr.bin/timeout/Makefile.depend
rename to bin/timeout/Makefile.depend
diff --git a/usr.bin/timeout/tests/Makefile b/bin/timeout/tests/Makefile
rename from usr.bin/timeout/tests/Makefile
rename to bin/timeout/tests/Makefile
diff --git a/usr.bin/timeout/tests/Makefile.depend b/bin/timeout/tests/Makefile.depend
rename from usr.bin/timeout/tests/Makefile.depend
rename to bin/timeout/tests/Makefile.depend
diff --git a/usr.bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh
rename from usr.bin/timeout/tests/timeout_test.sh
rename to bin/timeout/tests/timeout_test.sh
diff --git a/usr.bin/timeout/timeout.1 b/bin/timeout/timeout.1
rename from usr.bin/timeout/timeout.1
rename to bin/timeout/timeout.1
diff --git a/usr.bin/timeout/timeout.c b/bin/timeout/timeout.c
rename from usr.bin/timeout/timeout.c
rename to bin/timeout/timeout.c
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -62,6 +62,8 @@
..
test
..
+ timeout
+ ..
..
cddl
lib
@@ -1104,8 +1106,6 @@
..
tar
..
- timeout
- ..
tr
..
truncate
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -152,7 +152,6 @@
tcopy \
tee \
time \
- timeout \
tip \
top \
touch \

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 3:20 AM (14 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32439360
Default Alt Text
D38344.id116235.diff (2 KB)

Event Timeline