From 449e7cdde3711a50f80b405e416dfa51f9cb1622 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 5 Jan 2015 18:07:16 +0100
Subject: [PATCH] Actually remove RCS from the image.

---
 build/jam/images/definitions/minimum  | 6 +++---
 src/data/package_infos/arm/haiku      | 2 --
 src/data/package_infos/m68k/haiku     | 2 --
 src/data/package_infos/ppc/haiku      | 2 --
 src/data/package_infos/x86/haiku      | 2 --
 src/data/package_infos/x86_64/haiku   | 2 --
 src/data/package_infos/x86_gcc2/haiku | 2 --
 7 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum
index 6f0704b58e..0a53aa9a7d 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -13,18 +13,18 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
 	ftp ftpd funzip
 	getarch getlimits groupadd groupdel groupmod groups gzip gzexe
 	hd head hey hostname
-	id ideinfo@ide ident idestatus@ide ifconfig <bin>install iroster isvolume
+	id ideinfo@ide idestatus@ide ifconfig <bin>install iroster isvolume
 	join kernel_debugger keymap keystore kill
 	link linkcatkeys listarea listattr listimage listdev
 	listport listres listsem listusb ln locale logger login logname ls lsindex
-	makebootable md5sum merge message mimeset mkdir mkfifo mkfs mkindex mktemp
+	makebootable md5sum message mimeset mkdir mkfifo mkfs mkindex mktemp
 	modifiers mount mountvolume mv
 	netcat netstat nl nohup notify nproc
 	od open
 	package package_repo passwd paste patch pathchk pc ping ping6 pkgman
 	pr prio printenv printf profile ps ptx pwd
 	query quit
-	rc readlink reindex release renice rlog rm rmattr rmindex rmdir roster
+	rc readlink reindex release renice rm rmattr rmindex rmdir roster
 	route
 	safemode screen_blanker screeninfo screenmode sdiff setarch setmime settype
 	setversion setvolume seq sha1sum sha256sum shred shuf shutdown sleep
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index 24432a2a24..48d2b01bce 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -78,7 +78,6 @@ provides {
 	cmd:logname
 	cmd:ls
 	cmd:md5sum
-	cmd:merge
 	cmd:mkdir
 	cmd:mkfifo
 	cmd:mktemp
@@ -104,7 +103,6 @@ provides {
 	cmd:pwd
 	cmd:readlink
 	cmd:renice
-	cmd:rlog
 	cmd:rm
 	cmd:rmdir
 	cmd:sdiff
diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku
index d4d325c868..837f58701b 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -78,7 +78,6 @@ provides {
 	cmd:logname
 	cmd:ls
 	cmd:md5sum
-	cmd:merge
 	cmd:mkdir
 	cmd:mkfifo
 	cmd:mktemp
@@ -104,7 +103,6 @@ provides {
 	cmd:pwd
 	cmd:readlink
 	cmd:renice
-	cmd:rlog
 	cmd:rm
 	cmd:rmdir
 	cmd:sdiff
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index e3fe9f25da..a7d196e5a4 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -78,7 +78,6 @@ provides {
 	cmd:logname
 	cmd:ls
 	cmd:md5sum
-	cmd:merge
 	cmd:mkdir
 	cmd:mkfifo
 	cmd:mktemp
@@ -104,7 +103,6 @@ provides {
 	cmd:pwd
 	cmd:readlink
 	cmd:renice
-	cmd:rlog
 	cmd:rm
 	cmd:rmdir
 	cmd:sdiff
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index c88f10a9c4..641894339b 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -78,7 +78,6 @@ provides {
 	cmd:logname
 	cmd:ls
 	cmd:md5sum
-	cmd:merge
 	cmd:mkdir
 	cmd:mkfifo
 	cmd:mktemp
@@ -104,7 +103,6 @@ provides {
 	cmd:pwd
 	cmd:readlink
 	cmd:renice
-	cmd:rlog
 	cmd:rm
 	cmd:rmdir
 	cmd:sdiff
diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
index a8752bb2d3..4717f6112d 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -77,7 +77,6 @@ provides {
 	cmd:logname
 	cmd:ls
 	cmd:md5sum
-	cmd:merge
 	cmd:mkdir
 	cmd:mkfifo
 	cmd:mktemp
@@ -103,7 +102,6 @@ provides {
 	cmd:pwd
 	cmd:readlink
 	cmd:renice
-	cmd:rlog
 	cmd:rm
 	cmd:rmdir
 	cmd:sdiff
diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
index c5b801bba3..97bc4a4ee0 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -78,7 +78,6 @@ provides {
 	cmd:logname
 	cmd:ls
 	cmd:md5sum
-	cmd:merge
 	cmd:mkdir
 	cmd:mkfifo
 	cmd:mktemp
@@ -104,7 +103,6 @@ provides {
 	cmd:pwd
 	cmd:readlink
 	cmd:renice
-	cmd:rlog
 	cmd:rm
 	cmd:rmdir
 	cmd:sdiff