[haiku-commits] haiku: hrev48833 - build/jam/images/definitions build/jam/packages src/data/package_infos/x86_gcc2 src/data/package_infos/x86_64 src/data/package_infos/x86
- From: jerome.duval@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 26 Feb 2015 19:22:30 +0100 (CET)
hrev48833 adds 1 changeset to branch 'master'
old head: 609834be066e193db10b74185c18d4f7bcb37ced
new head: 85e5aa30b15cf47a82095f337bf6f6212f3870b6
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=85e5aa30b15c+%5E609834be066e
----------------------------------------------------------------------------
85e5aa30b15c: Add packages for unzip and use them.
* remove unzip Jamfile from the build, <build>unzip stays with us.
* clean up image and package definitions.
* added unzip in regular builds.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48833
Commit: 85e5aa30b15cf47a82095f337bf6f6212f3870b6
URL: http://cgit.haiku-os.org/haiku/commit/?id=85e5aa30b15c
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Thu Feb 26 18:18:03 2015 UTC
----------------------------------------------------------------------------
14 files changed, 10 insertions(+), 37 deletions(-)
Jamfile | 2 +-
build/jam/images/definitions/minimum | 6 +++---
build/jam/packages/Haiku | 1 -
build/jam/packages/HaikuBootstrap | 1 -
build/jam/repositories/HaikuPorts/x86 | 2 ++
build/jam/repositories/HaikuPorts/x86_64 | 2 ++
build/jam/repositories/HaikuPorts/x86_gcc2 | 2 ++
src/bin/Jamfile | 1 -
src/data/package_infos/arm/haiku | 5 -----
src/data/package_infos/m68k/haiku | 5 -----
src/data/package_infos/ppc/haiku | 5 -----
src/data/package_infos/x86/haiku | 5 -----
src/data/package_infos/x86_64/haiku | 5 -----
src/data/package_infos/x86_gcc2/haiku | 5 -----
----------------------------------------------------------------------------
diff --git a/Jamfile b/Jamfile
index efef211..5a05b78 100644
--- a/Jamfile
+++ b/Jamfile
@@ -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 {
diff --git a/build/jam/images/definitions/minimum
b/build/jam/images/definitions/minimum
index 095f82b..365dfed 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -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
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index aff56f9..9372686 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -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
diff --git a/build/jam/packages/HaikuBootstrap
b/build/jam/packages/HaikuBootstrap
index e12275f..ef610f0 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -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
diff --git a/build/jam/repositories/HaikuPorts/x86
b/build/jam/repositories/HaikuPorts/x86
index 273dc1e..0a5677e 100644
--- a/build/jam/repositories/HaikuPorts/x86
+++ b/build/jam/repositories/HaikuPorts/x86
@@ -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
diff --git a/build/jam/repositories/HaikuPorts/x86_64
b/build/jam/repositories/HaikuPorts/x86_64
index fc56eb7..2eb8ed1 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -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
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 5b7f41d..2e727bb 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -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
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index bd8b594..5ea4cf5 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -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 ;
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index ee3e79f..7446191 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -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
diff --git a/src/data/package_infos/m68k/haiku
b/src/data/package_infos/m68k/haiku
index f4ba03c..2a7603c 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -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
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index ceae41c..510da93 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -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
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 1c792a0..d54536e 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -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
diff --git a/src/data/package_infos/x86_64/haiku
b/src/data/package_infos/x86_64/haiku
index 7d987a1..e994957 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -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
diff --git a/src/data/package_infos/x86_gcc2/haiku
b/src/data/package_infos/x86_gcc2/haiku
index 2f9beee..dd908a8 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -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
Other related posts:
