diff --git a/Jamfile b/Jamfile index a995ae3b39..efef211a53 100644 --- a/Jamfile +++ b/Jamfile @@ -23,7 +23,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { # Include required packages: # primary architecture AddHaikuImagePackages [ FFilterByBuildFeatures - bash curl freetype icu libsolv zlib + bash coreutils curl freetype icu libsolv zlib regular_image @{ bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 0a53aa9a7d..11061d5947 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -1,41 +1,39 @@ # This file defines the content of the minimum Haiku image. SYSTEM_BIN = [ FFilterByBuildFeatures - "[" addattr alert arp - base64 basename bc beep bfsinfo - cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear - clockconfig cmp collectcatkeys comm compress copyattr cp csplit cut - date dc dd desklink df diff diff3 dircolors dirname diskimage draggers - driveinfo dstcheck du dumpcatalog - echo eject env error expand expr - factor false fdinfo ffm filepanel finddir findpaths fmt fold fortune fstrim + bc beep bfsinfo + catattr checkfs checkitout chop clear + clockconfig cmp collectcatkeys compress copyattr + dc desklink df diff diff3 diskimage draggers + driveinfo dstcheck dumpcatalog + eject error + fdinfo ffm filepanel finddir findpaths fortune fstrim ftp ftpd funzip - getarch getlimits groupadd groupdel groupmod groups gzip gzexe - hd head hey hostname - id ideinfo@ide idestatus@ide ifconfig 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 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 + getarch groupadd groupdel groupmod gzip gzexe + hd hey + ideinfo@ide idestatus@ide ifconfig iroster isvolume + kernel_debugger keymap keystore + linkcatkeys listarea listattr listimage listdev + listport listres listsem listusb locale logger login lsindex + makebootable message mimeset mkfs mkindex + modifiers mount mountvolume + netcat netstat notify + open + package package_repo passwd patch pc ping ping6 pkgman + prio profile ps query quit - rc readlink reindex release renice rm rmattr rmindex rmdir roster + rc reindex release renice rmattr rmindex roster route safemode screen_blanker screeninfo screenmode sdiff setarch setmime settype - setversion setvolume seq sha1sum sha256sum shred shuf shutdown sleep - sort split stat strace stty su sum sync sysinfo - tac tail tcpdump tcptester tee telnet telnetd test timeout top touch - tr traceroute trash true truncate tsort tty - uname unchop unexpand unmount uniq unlink unzip unzipsfx + setversion setvolume shutdown + strace su sysinfo + tcpdump tcptester telnet telnetd top + traceroute trash + unchop unmount unzip unzipsfx uptime urlwrapper useradd userdel - vdir version vmstat - waitfor watch wc whoami writembr@x86,x86_64 xres - yes + version vmstat + waitfor watch writembr@x86,x86_64 xres zdiff zforce zgrep zip zipcloak zipgrep zipnote zipsplit zmore znew ] ; diff --git a/build/jam/repositories/HaikuPorts/x86 b/build/jam/repositories/HaikuPorts/x86 index 665617fce4..415fffaaca 100644 --- a/build/jam/repositories/HaikuPorts/x86 +++ b/build/jam/repositories/HaikuPorts/x86 @@ -34,6 +34,7 @@ RemotePackageRepository HaikuPorts clang-3.4-3 clang_analysis-3.4-3 cmake-3.0.0_rc3-1 + coreutils-8.22-1 cpio-2.10-1 ctags-5.8-3 curl-7.39.0-1 @@ -296,6 +297,7 @@ RemotePackageRepository HaikuPorts cdrtools clang cmake + coreutils cpio ctags curl @@ -405,6 +407,7 @@ RemotePackageRepository HaikuPorts zlib : # debuginfo packages + coreutils grep sed tar diff --git a/build/jam/repositories/HaikuPorts/x86_64 b/build/jam/repositories/HaikuPorts/x86_64 index 6e46a76c90..c3557ec1cf 100644 --- a/build/jam/repositories/HaikuPorts/x86_64 +++ b/build/jam/repositories/HaikuPorts/x86_64 @@ -32,6 +32,7 @@ RemotePackageRepository HaikuPorts clang-3.5.1-1 clang_analysis-3.5.1-1 cmake-3.0.0_rc6-1 + coreutils-8.22-1 ctags-5.8-3 curl-7.39.0-1 curl_devel-7.39.0-1 @@ -232,6 +233,7 @@ RemotePackageRepository HaikuPorts cdrtools clang cmake + coreutils ctags curl cvs @@ -345,4 +347,5 @@ RemotePackageRepository HaikuPorts zlib : # debuginfo packages + coreutils ; diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2 index a189e62e5d..9e1540f54c 100644 --- a/build/jam/repositories/HaikuPorts/x86_gcc2 +++ b/build/jam/repositories/HaikuPorts/x86_gcc2 @@ -63,6 +63,7 @@ RemotePackageRepository HaikuPorts clockwerk-git-3 ctags-5.8-3 colors-2.3-1 + coreutils-8.22-1 curl-7.39.0-1 curl_devel-7.39.0-1 cvs-1.12.13.1-6 @@ -711,6 +712,7 @@ RemotePackageRepository HaikuPorts colors confuse_x86 copynametoclipboard + coreutils ctags curl cvs @@ -1005,6 +1007,7 @@ RemotePackageRepository HaikuPorts zsh : # debuginfo packages + coreutils grep sed tar diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 641894339b..6fc5e07f3d 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -18,139 +18,51 @@ flags system_package provides { haiku=%HAIKU_VERSION% compat>=R1~alpha1 - coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 cmd:arp - cmd:base64 - cmd:basename cmd:bc - cmd:cat - cmd:chgrp - cmd:chmod cmd:chop - cmd:chown - cmd:chroot - cmd:cksum cmd:clear cmd:cmp - cmd:comm cmd:compress - cmd:cp = 8.4 - cmd:csplit - cmd:cut - cmd:date cmd:dc - cmd:dd cmd:df cmd:diff = 2.8.1 cmd:diff3 - cmd:dirname - cmd:du - cmd:echo - cmd:env - cmd:expand - cmd:expr - cmd:factor - cmd:false - cmd:fmt - cmd:fold - cmd:frcode cmd:ftp cmd:ftpd cmd:funzip cmd:gdb - cmd:getlimits - cmd:groups cmd:gunzip cmd:gzexe cmd:gzip cmd:hd - cmd:head cmd:hey - cmd:hostname - cmd:id - cmd:install - cmd:join - cmd:kill - cmd:link - cmd:ln = 8.4 cmd:login - cmd:logname - cmd:ls - cmd:md5sum - cmd:mkdir - cmd:mkfifo - cmd:mktemp cmd:more - cmd:mv = 8.4 cmd:netcat - cmd:nl - cmd:nohup - cmd:nproc - cmd:od cmd:passwd - cmd:paste cmd:patch - cmd:pathchk cmd:ping cmd:ping6 - cmd:pr - cmd:printenv - cmd:printf cmd:prio cmd:ps - cmd:ptx - cmd:pwd - cmd:readlink cmd:renice - cmd:rm - cmd:rmdir cmd:sdiff - cmd:seq - cmd:sha1sum - cmd:sha256sum - cmd:shred - cmd:shuf - cmd:sleep - cmd:sort - cmd:split - cmd:stat - cmd:stty cmd:su - cmd:sum - cmd:sync - cmd:tac - cmd:tail cmd:tcpdump - cmd:tee cmd:telnet cmd:telnetd - cmd:test - cmd:timeout cmd:top - cmd:touch cmd:tput - cmd:tr cmd:traceroute cmd:trash - cmd:true - cmd:truncate - cmd:tsort - cmd:tty - cmd:uname cmd:unchop - cmd:unexpand - cmd:uniq - cmd:unlink cmd:unzip = 5.50 cmd:unzipsfx cmd:useradd - cmd:vdir cmd:watch - cmd:wc - cmd:whoami cmd:xres - cmd:yes cmd:zcat cmd:zcmp cmd:zdiff diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 4717f6112d..6699e399ad 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -17,139 +17,51 @@ licenses { provides { haiku=%HAIKU_VERSION% compat>=R1~alpha1 - coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 cmd:arp - cmd:base64 - cmd:basename cmd:bc - cmd:cat - cmd:chgrp - cmd:chmod cmd:chop - cmd:chown - cmd:chroot - cmd:cksum cmd:clear cmd:cmp - cmd:comm cmd:compress - cmd:cp = 8.4 - cmd:csplit - cmd:cut - cmd:date cmd:dc - cmd:dd cmd:df cmd:diff = 2.8.1 cmd:diff3 - cmd:dirname - cmd:du - cmd:echo - cmd:env - cmd:expand - cmd:expr - cmd:factor - cmd:false - cmd:fmt - cmd:fold - cmd:frcode cmd:ftp cmd:ftpd cmd:funzip cmd:gdb - cmd:getlimits - cmd:groups cmd:gunzip cmd:gzexe cmd:gzip cmd:hd - cmd:head cmd:hey - cmd:hostname - cmd:id - cmd:install - cmd:join - cmd:kill - cmd:link - cmd:ln = 8.4 cmd:login - cmd:logname - cmd:ls - cmd:md5sum - cmd:mkdir - cmd:mkfifo - cmd:mktemp cmd:more - cmd:mv = 8.4 cmd:netcat - cmd:nl - cmd:nohup - cmd:nproc - cmd:od cmd:passwd - cmd:paste cmd:patch - cmd:pathchk cmd:ping cmd:ping6 - cmd:pr - cmd:printenv - cmd:printf cmd:prio cmd:ps - cmd:ptx - cmd:pwd - cmd:readlink cmd:renice - cmd:rm - cmd:rmdir cmd:sdiff - cmd:seq - cmd:sha1sum - cmd:sha256sum - cmd:shred - cmd:shuf - cmd:sleep - cmd:sort - cmd:split - cmd:stat - cmd:stty cmd:su - cmd:sum - cmd:sync - cmd:tac - cmd:tail cmd:tcpdump - cmd:tee cmd:telnet cmd:telnetd - cmd:test - cmd:timeout cmd:top - cmd:touch cmd:tput - cmd:tr cmd:traceroute cmd:trash - cmd:true - cmd:truncate - cmd:tsort - cmd:tty - cmd:uname cmd:unchop - cmd:unexpand - cmd:uniq - cmd:unlink cmd:unzip = 5.50 cmd:unzipsfx cmd:useradd - cmd:vdir cmd:watch - cmd:wc - cmd:whoami cmd:xres - cmd:yes cmd:zcat cmd:zcmp cmd:zdiff diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index 97bc4a4ee0..2a4038753c 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -18,139 +18,51 @@ flags system_package provides { haiku=%HAIKU_VERSION% compat>=R1~alpha1 - coreutils = 8.4 compat >= 0 diffutils = 2.8.1 compat >= 0 cmd:arp - cmd:base64 - cmd:basename cmd:bc - cmd:cat - cmd:chgrp - cmd:chmod cmd:chop - cmd:chown - cmd:chroot - cmd:cksum cmd:clear cmd:cmp - cmd:comm cmd:compress - cmd:cp = 8.4 - cmd:csplit - cmd:cut - cmd:date cmd:dc - cmd:dd cmd:df cmd:diff = 2.8.1 cmd:diff3 - cmd:dirname - cmd:du - cmd:echo - cmd:env - cmd:expand - cmd:expr - cmd:factor - cmd:false - cmd:fmt - cmd:fold - cmd:frcode cmd:ftp cmd:ftpd cmd:funzip cmd:gdb - cmd:getlimits - cmd:groups cmd:gunzip cmd:gzexe cmd:gzip cmd:hd - cmd:head cmd:hey - cmd:hostname - cmd:id - cmd:install - cmd:join - cmd:kill - cmd:link - cmd:ln = 8.4 cmd:login - cmd:logname - cmd:ls - cmd:md5sum - cmd:mkdir - cmd:mkfifo - cmd:mktemp cmd:more - cmd:mv = 8.4 cmd:netcat - cmd:nl - cmd:nohup - cmd:nproc - cmd:od cmd:passwd - cmd:paste cmd:patch - cmd:pathchk cmd:ping cmd:ping6 - cmd:pr - cmd:printenv - cmd:printf cmd:prio cmd:ps - cmd:ptx - cmd:pwd - cmd:readlink cmd:renice - cmd:rm - cmd:rmdir cmd:sdiff - cmd:seq - cmd:sha1sum - cmd:sha256sum - cmd:shred - cmd:shuf - cmd:sleep - cmd:sort - cmd:split - cmd:stat - cmd:stty cmd:su - cmd:sum - cmd:sync - cmd:tac - cmd:tail cmd:tcpdump - cmd:tee cmd:telnet cmd:telnetd - cmd:test - cmd:timeout cmd:top - cmd:touch cmd:tput - cmd:tr cmd:traceroute cmd:trash - cmd:true - cmd:truncate - cmd:tsort - cmd:tty - cmd:uname cmd:unchop - cmd:unexpand - cmd:uniq - cmd:unlink cmd:unzip = 5.50 cmd:unzipsfx cmd:useradd - cmd:vdir cmd:watch - cmd:wc - cmd:whoami cmd:xres - cmd:yes cmd:zcat cmd:zcmp cmd:zdiff