bash: use outsourced package for non-bootstrap builds.

* the bootstrap build keeps on building the in-tree bash.
This commit is contained in:
Jérôme Duval
2014-10-01 19:08:27 +02:00
parent 9577c31bfe
commit 8b21b2b910
9 changed files with 24 additions and 4 deletions
+7 -3
View File
@@ -25,10 +25,14 @@ for architectureObject in [ MultiArchSubDirSetup ] {
AddHaikuImagePackages [ FFilterByBuildFeatures AddHaikuImagePackages [ FFilterByBuildFeatures
curl freetype icu libsolv zlib curl freetype icu libsolv zlib
minimum_image @{
bash
}@
regular_image @{ regular_image @{
bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg less bash bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils tar less libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils
tiff wget which tar tiff wget which
}@ }@
] ; ] ;
if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 { if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {
+4
View File
@@ -3,6 +3,10 @@
# import everything from the minimum image # import everything from the minimum image
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images definitions minimum ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) images definitions minimum ] ;
SYSTEM_BIN += [ FFilterByBuildFeatures
bash
] ;
# build and add the source package directory and a haikuports.config file # build and add the source package directory and a haikuports.config file
CopyDirectoryToHaikuImage home haikuports CopyDirectoryToHaikuImage home haikuports
: [ BuildHaikuPortsSourcePackageDirectory ] : [ BuildHaikuPortsSourcePackageDirectory ]
+1 -1
View File
@@ -3,7 +3,7 @@
SYSTEM_BIN = [ FFilterByBuildFeatures SYSTEM_BIN = [ FFilterByBuildFeatures
"[" "["
addattr alert arp addattr alert arp
base64 basename bash bc beep bfsinfo base64 basename bc beep bfsinfo
cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
clockconfig cmp collectcatkeys comm compress copyattr cp csplit cut clockconfig cmp collectcatkeys comm compress copyattr cp csplit cut
date dc dd desklink df diff diff3 dircolors dirname diskimage draggers date dc dd desklink df diff diff3 dircolors dirname diskimage draggers
+2
View File
@@ -23,7 +23,9 @@ provides {
cmd:arp cmd:arp
cmd:base64 cmd:base64
cmd:basename cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash cmd:bash
#endif
cmd:bc cmd:bc
cmd:cat cmd:cat
cmd:chgrp cmd:chgrp
+2
View File
@@ -23,7 +23,9 @@ provides {
cmd:arp cmd:arp
cmd:base64 cmd:base64
cmd:basename cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash cmd:bash
#endif
cmd:bc cmd:bc
cmd:cat cmd:cat
cmd:chgrp cmd:chgrp
+2
View File
@@ -23,7 +23,9 @@ provides {
cmd:arp cmd:arp
cmd:base64 cmd:base64
cmd:basename cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash cmd:bash
#endif
cmd:bc cmd:bc
cmd:cat cmd:cat
cmd:chgrp cmd:chgrp
+2
View File
@@ -23,7 +23,9 @@ provides {
cmd:arp cmd:arp
cmd:base64 cmd:base64
cmd:basename cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash cmd:bash
#endif
cmd:bc cmd:bc
cmd:cat cmd:cat
cmd:chgrp cmd:chgrp
+2
View File
@@ -22,7 +22,9 @@ provides {
cmd:arp cmd:arp
cmd:base64 cmd:base64
cmd:basename cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash cmd:bash
#endif
cmd:bc cmd:bc
cmd:cat cmd:cat
cmd:chgrp cmd:chgrp
+2
View File
@@ -23,7 +23,9 @@ provides {
cmd:arp cmd:arp
cmd:base64 cmd:base64
cmd:basename cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash cmd:bash
#endif
cmd:bc cmd:bc
cmd:cat cmd:cat
cmd:chgrp cmd:chgrp