From 85e5aa30b15cf47a82095f337bf6f6212f3870b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 26 Feb 2015 19:18:03 +0100 Subject: [PATCH] Add packages for unzip and use them. * remove unzip Jamfile from the build, unzip stays with us. * clean up image and package definitions. * added unzip in regular builds. --- 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 ----- 14 files changed, 10 insertions(+), 37 deletions(-) diff --git a/Jamfile b/Jamfile index efef211a53..5a05b78be9 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 095f82bf76..365dfedaeb 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 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 aff56f9b37..9372686f13 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 e12275fad8..ef610f0689 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 273dc1e54d..0a5677e8d0 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 fc56eb7b07..2eb8ed11bc 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 5b7f41d9a7..2e727bbeaa 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 bd8b59494e..5ea4cf55ac 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 ee3e79f163..7446191643 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 f4ba03c44c..2a7603c3bd 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 ceae41c755..510da93ad3 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 1c792a0115..d54536eb75 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 7d987a13ab..e99495784e 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 2f9beee4e2..dd908a81b5 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