Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add packages for unzip and use them.

Browse Source 
* remove unzip Jamfile from the build, <build>unzip stays with us.
* clean up image and package definitions.
* added unzip in regular builds.
This commit is contained in:
Jérôme Duval 2015-02-26 19:18:03 +01:00
parent 609834be06
commit 85e5aa30b1
14 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jamfile
View File

@ -29,7 +29,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
less libicns libpng libpng16 libwebp mesa mesa_devel mesa_swrast
sed sharutils
tar tiff wget which
tar tiff unzip wget which
}@
] ;
if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {

6
build/jam/images/definitions/minimum
View File

@ -9,7 +9,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
driveinfo dstcheck dumpcatalog
eject error
fdinfo ffm filepanel finddir findpaths fortune fstrim
ftp ftpd funzip
ftp ftpd
getarch groupadd groupdel groupmod gzip gzexe
hd hey
ideinfo@ide idestatus@ide ifconfig iroster isvolume
@ -30,11 +30,11 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
strace su sysinfo
tcpdump tcptester telnet telnetd top
traceroute trash
unchop unmount unzip unzipsfx
unchop unmount
uptime urlwrapper useradd userdel
version vmstat
waitfor watch writembr@x86,x86_64 xres
zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
zdiff zforce zgrep zip zipcloak zipnote zipsplit zmore znew
] ;
SYSTEM_APPS = [ FFilterByBuildFeatures

1
build/jam/packages/Haiku
View File

@ -125,7 +125,6 @@ AddSymlinkToPackage bin : less : more ;
AddSymlinkToPackage bin : gzip : gunzip ;
AddSymlinkToPackage bin : gzip : zcat ;
AddSymlinkToPackage bin : zdiff : zcmp ;
AddSymlinkToPackage bin : unzip : zipinfo ;
# scripts and data files
local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript

1
build/jam/packages/HaikuBootstrap
View File

@ -122,7 +122,6 @@ AddSymlinkToPackage bin : less : more ;
AddSymlinkToPackage bin : gzip : gunzip ;
AddSymlinkToPackage bin : gzip : zcat ;
AddSymlinkToPackage bin : zdiff : zcmp ;
AddSymlinkToPackage bin : unzip : zipinfo ;
# scripts and data files
local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript

2
build/jam/repositories/HaikuPorts/x86
View File

@ -197,6 +197,7 @@ RemotePackageRepository HaikuPorts
tinyxml_devel-2.6.2-1
transmission-2.84-3
unrar-5.1.5-1
unzip-6.0-1
vision-0.9.7.r949-1
vim-7.4-1
wget-1.15-1
@ -398,6 +399,7 @@ RemotePackageRepository HaikuPorts
tinyxml
transmission
unrar
unzip
vim
vision
wget

2
build/jam/repositories/HaikuPorts/x86_64
View File

@ -208,6 +208,7 @@ RemotePackageRepository HaikuPorts
tinyxml_devel-2.6.2-1
transmission-2.84-3
unrar-5.1.5-1
unzip-6.0-1
vim-7.4-2
vision-0.9.7.r949-2
wget-1.15-1
@ -338,6 +339,7 @@ RemotePackageRepository HaikuPorts
tinyxml
transmission
unrar
unzip
vim
vision
wget

2
build/jam/repositories/HaikuPorts/x86_gcc2
View File

@ -373,6 +373,7 @@ RemotePackageRepository HaikuPorts
tinyxml_devel-2.6.2-1
ubertuber-0.9.10-3
unrar-5.1.5-1
unzip-6.0-1
util_macros-1.19.0-2
vim-7.4-3
virtualbox_guest_additions-4.3.53_svn-1
@ -1012,6 +1013,7 @@ RemotePackageRepository HaikuPorts
transmission_x86
ubertuber
unrar
unzip
util_macros
vcmi_x86
vim

1
src/bin/Jamfile
View File

@ -297,7 +297,6 @@ SubInclude HAIKU_TOP src bin debug ;
SubInclude HAIKU_TOP src bin network ;
# Compression command line tools
SubInclude HAIKU_TOP src bin unzip ;
SubInclude HAIKU_TOP src bin zip ;
SubInclude HAIKU_TOP src bin gzip ;

5
src/data/package_infos/arm/haiku
View File

@ -31,7 +31,6 @@ provides {
cmd:diff3
cmd:ftp
cmd:ftpd
cmd:funzip
cmd:gunzip
cmd:gzexe
cmd:gzip
@ -56,8 +55,6 @@ provides {
cmd:traceroute
cmd:trash
cmd:unchop
cmd:unzip = 5.50
cmd:unzipsfx
cmd:useradd
cmd:watch
cmd:xres
@ -68,8 +65,6 @@ provides {
cmd:zgrep
cmd:zip = 2.32
cmd:zipcloak
cmd:zipgrep
cmd:zipinfo
cmd:zipnote
cmd:zipsplit
cmd:zmore

5
src/data/package_infos/m68k/haiku
View File

@ -31,7 +31,6 @@ provides {
cmd:diff3
cmd:ftp
cmd:ftpd
cmd:funzip
cmd:gunzip
cmd:gzexe
cmd:gzip
@ -56,8 +55,6 @@ provides {
cmd:traceroute
cmd:trash
cmd:unchop
cmd:unzip = 5.50
cmd:unzipsfx
cmd:useradd
cmd:watch
cmd:xres
@ -68,8 +65,6 @@ provides {
cmd:zgrep
cmd:zip = 2.32
cmd:zipcloak
cmd:zipgrep
cmd:zipinfo
cmd:zipnote
cmd:zipsplit
cmd:zmore

5
src/data/package_infos/ppc/haiku
View File

@ -31,7 +31,6 @@ provides {
cmd:diff3
cmd:ftp
cmd:ftpd
cmd:funzip
cmd:gunzip
cmd:gzexe
cmd:gzip
@ -56,8 +55,6 @@ provides {
cmd:traceroute
cmd:trash
cmd:unchop
cmd:unzip = 5.50
cmd:unzipsfx
cmd:useradd
cmd:watch
cmd:xres
@ -68,8 +65,6 @@ provides {
cmd:zgrep
cmd:zip = 2.32
cmd:zipcloak
cmd:zipgrep
cmd:zipinfo
cmd:zipnote
cmd:zipsplit
cmd:zmore

5
src/data/package_infos/x86/haiku
View File

@ -31,7 +31,6 @@ provides {
cmd:diff3
cmd:ftp
cmd:ftpd
cmd:funzip
cmd:gunzip
cmd:gzexe
cmd:gzip
@ -56,8 +55,6 @@ provides {
cmd:traceroute
cmd:trash
cmd:unchop
cmd:unzip = 5.50
cmd:unzipsfx
cmd:useradd
cmd:watch
cmd:xres
@ -68,8 +65,6 @@ provides {
cmd:zgrep
cmd:zip = 2.32
cmd:zipcloak
cmd:zipgrep
cmd:zipinfo
cmd:zipnote
cmd:zipsplit
cmd:zmore

5
src/data/package_infos/x86_64/haiku
View File

@ -30,7 +30,6 @@ provides {
cmd:diff3
cmd:ftp
cmd:ftpd
cmd:funzip
cmd:gunzip
cmd:gzexe
cmd:gzip
@ -55,8 +54,6 @@ provides {
cmd:traceroute
cmd:trash
cmd:unchop
cmd:unzip = 5.50
cmd:unzipsfx
cmd:useradd
cmd:watch
cmd:xres
@ -67,8 +64,6 @@ provides {
cmd:zgrep
cmd:zip = 2.32
cmd:zipcloak
cmd:zipgrep
cmd:zipinfo
cmd:zipnote
cmd:zipsplit
cmd:zmore

5
src/data/package_infos/x86_gcc2/haiku
View File

@ -31,7 +31,6 @@ provides {
cmd:diff3
cmd:ftp
cmd:ftpd
cmd:funzip
cmd:gunzip
cmd:gzexe
cmd:gzip
@ -56,8 +55,6 @@ provides {
cmd:traceroute
cmd:trash
cmd:unchop
cmd:unzip = 5.50
cmd:unzipsfx
cmd:useradd
cmd:watch
cmd:xres
@ -68,8 +65,6 @@ provides {
cmd:zgrep
cmd:zip = 2.32
cmd:zipcloak
cmd:zipgrep
cmd:zipinfo
cmd:zipnote
cmd:zipsplit
cmd:zmore