Use bash_bootstrap for the bootstrap build.
* don't build the in-tree bash. * bash doesn't need to be a mandatory package, it's now a dependency of the haiku package.
This commit is contained in:
@@ -25,12 +25,8 @@ 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 @{
|
||||||
bash bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
|
bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
|
||||||
less libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils
|
less libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils
|
||||||
tar tiff wget which
|
tar tiff wget which
|
||||||
}@
|
}@
|
||||||
|
|||||||
@@ -3,10 +3,6 @@
|
|||||||
# 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 ]
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
autoconf_bootstrap-2.69-2
|
autoconf_bootstrap-2.69-2
|
||||||
automake_bootstrap-1.13.1-1
|
automake_bootstrap-1.13.1-1
|
||||||
libtool_cross_generic-2.4
|
libtool_cross_generic-2.4
|
||||||
|
bash_bootstrap-4.3.27-1
|
||||||
binutils_bootstrap-2.24_2014_03_19-1
|
binutils_bootstrap-2.24_2014_03_19-1
|
||||||
bison_bootstrap-2.4.3-1
|
bison_bootstrap-2.4.3-1
|
||||||
curl_bootstrap-7.26.0-1
|
curl_bootstrap-7.26.0-1
|
||||||
@@ -45,6 +46,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# source packages
|
# source packages
|
||||||
autoconf_bootstrap
|
autoconf_bootstrap
|
||||||
automake_bootstrap
|
automake_bootstrap
|
||||||
|
bash_bootstrap
|
||||||
binutils_bootstrap
|
binutils_bootstrap
|
||||||
bison_bootstrap
|
bison_bootstrap
|
||||||
curl_bootstrap
|
curl_bootstrap
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# repository architecture packages (stage 1)
|
# repository architecture packages (stage 1)
|
||||||
autoconf_bootstrap-2.69-2
|
autoconf_bootstrap-2.69-2
|
||||||
automake_bootstrap-1.13.1-1
|
automake_bootstrap-1.13.1-1
|
||||||
|
bash_bootstrap-4.3.27-1
|
||||||
binutils_bootstrap-2.24_2014_03_19-1
|
binutils_bootstrap-2.24_2014_03_19-1
|
||||||
bison_bootstrap-2.4.3-1
|
bison_bootstrap-2.4.3-1
|
||||||
flex_bootstrap-2.5.35-1
|
flex_bootstrap-2.5.35-1
|
||||||
@@ -40,6 +41,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# source packages
|
# source packages
|
||||||
autoconf_bootstrap
|
autoconf_bootstrap
|
||||||
automake_bootstrap
|
automake_bootstrap
|
||||||
|
bash_bootstrap
|
||||||
binutils_bootstrap
|
binutils_bootstrap
|
||||||
bison_bootstrap
|
bison_bootstrap
|
||||||
flex_bootstrap
|
flex_bootstrap
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# repository architecture packages (stage 1)
|
# repository architecture packages (stage 1)
|
||||||
autoconf_bootstrap-2.69-2
|
autoconf_bootstrap-2.69-2
|
||||||
automake_bootstrap-1.13.1-1
|
automake_bootstrap-1.13.1-1
|
||||||
|
bash_bootstrap-4.3.27-1
|
||||||
binutils_bootstrap-2.24_2014_03_19-1
|
binutils_bootstrap-2.24_2014_03_19-1
|
||||||
bison_bootstrap-2.4.3-1
|
bison_bootstrap-2.4.3-1
|
||||||
findutils_bootstrap-4.4.2-1
|
findutils_bootstrap-4.4.2-1
|
||||||
@@ -63,6 +64,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# source packages
|
# source packages
|
||||||
autoconf_bootstrap
|
autoconf_bootstrap
|
||||||
automake_bootstrap
|
automake_bootstrap
|
||||||
|
bash_bootstrap
|
||||||
binutils_bootstrap
|
binutils_bootstrap
|
||||||
bison_bootstrap
|
bison_bootstrap
|
||||||
findutils_bootstrap
|
findutils_bootstrap
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# repository architecture packages (stage 1)
|
# repository architecture packages (stage 1)
|
||||||
autoconf_bootstrap-2.69-2
|
autoconf_bootstrap-2.69-2
|
||||||
automake_bootstrap-1.13.1-1
|
automake_bootstrap-1.13.1-1
|
||||||
|
bash_bootstrap-4.3.27-1
|
||||||
binutils_bootstrap-2.24_2014_03_19-1
|
binutils_bootstrap-2.24_2014_03_19-1
|
||||||
bison_bootstrap-2.4.3-1
|
bison_bootstrap-2.4.3-1
|
||||||
curl_bootstrap-7.26.0-1
|
curl_bootstrap-7.26.0-1
|
||||||
@@ -44,6 +45,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# source packages
|
# source packages
|
||||||
autoconf_bootstrap
|
autoconf_bootstrap
|
||||||
automake_bootstrap
|
automake_bootstrap
|
||||||
|
bash_bootstrap
|
||||||
binutils_bootstrap
|
binutils_bootstrap
|
||||||
bison_bootstrap
|
bison_bootstrap
|
||||||
curl_bootstrap
|
curl_bootstrap
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# repository architecture packages (stage 1)
|
# repository architecture packages (stage 1)
|
||||||
autoconf_bootstrap-2.69-2
|
autoconf_bootstrap-2.69-2
|
||||||
automake_bootstrap-1.13.1-1
|
automake_bootstrap-1.13.1-1
|
||||||
|
bash_bootstrap-4.3.27-1
|
||||||
binutils_bootstrap-2.17_2013_04_21-3
|
binutils_bootstrap-2.17_2013_04_21-3
|
||||||
bison_bootstrap-2.4.3-1
|
bison_bootstrap-2.4.3-1
|
||||||
findutils_bootstrap-4.4.2-1
|
findutils_bootstrap-4.4.2-1
|
||||||
@@ -63,6 +64,7 @@ BootstrapPackageRepository HaikuPortsCross
|
|||||||
# source packages
|
# source packages
|
||||||
autoconf_bootstrap
|
autoconf_bootstrap
|
||||||
automake_bootstrap
|
automake_bootstrap
|
||||||
|
bash_bootstrap
|
||||||
binutils_bootstrap
|
binutils_bootstrap
|
||||||
bison_bootstrap
|
bison_bootstrap
|
||||||
findutils_bootstrap
|
findutils_bootstrap
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ provides {
|
|||||||
cmd:arp
|
cmd:arp
|
||||||
cmd:base64
|
cmd:base64
|
||||||
cmd:basename
|
cmd:basename
|
||||||
#ifdef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
|
||||||
#endif
|
|
||||||
cmd:bc
|
cmd:bc
|
||||||
cmd:cat
|
cmd:cat
|
||||||
cmd:chgrp
|
cmd:chgrp
|
||||||
@@ -172,9 +169,7 @@ provides {
|
|||||||
}
|
}
|
||||||
|
|
||||||
requires {
|
requires {
|
||||||
#ifndef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
cmd:bash
|
||||||
#endif
|
|
||||||
lib:libfreetype
|
lib:libfreetype
|
||||||
lib:libgcc_s
|
lib:libgcc_s
|
||||||
lib:libicudata
|
lib:libicudata
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ provides {
|
|||||||
cmd:arp
|
cmd:arp
|
||||||
cmd:base64
|
cmd:base64
|
||||||
cmd:basename
|
cmd:basename
|
||||||
#ifdef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
|
||||||
#endif
|
|
||||||
cmd:bc
|
cmd:bc
|
||||||
cmd:cat
|
cmd:cat
|
||||||
cmd:chgrp
|
cmd:chgrp
|
||||||
@@ -172,9 +169,7 @@ provides {
|
|||||||
}
|
}
|
||||||
|
|
||||||
requires {
|
requires {
|
||||||
#ifndef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
cmd:bash
|
||||||
#endif
|
|
||||||
lib:libfreetype
|
lib:libfreetype
|
||||||
lib:libgcc_s
|
lib:libgcc_s
|
||||||
#ifdef HAIKU_REGULAR_BUILD
|
#ifdef HAIKU_REGULAR_BUILD
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ provides {
|
|||||||
cmd:arp
|
cmd:arp
|
||||||
cmd:base64
|
cmd:base64
|
||||||
cmd:basename
|
cmd:basename
|
||||||
#ifdef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
|
||||||
#endif
|
|
||||||
cmd:bc
|
cmd:bc
|
||||||
cmd:cat
|
cmd:cat
|
||||||
cmd:chgrp
|
cmd:chgrp
|
||||||
@@ -172,9 +169,7 @@ provides {
|
|||||||
}
|
}
|
||||||
|
|
||||||
requires {
|
requires {
|
||||||
#ifndef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
cmd:bash
|
||||||
#endif
|
|
||||||
lib:libfreetype
|
lib:libfreetype
|
||||||
lib:libgcc_s
|
lib:libgcc_s
|
||||||
lib:libicudata
|
lib:libicudata
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ provides {
|
|||||||
cmd:arp
|
cmd:arp
|
||||||
cmd:base64
|
cmd:base64
|
||||||
cmd:basename
|
cmd:basename
|
||||||
#ifdef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
|
||||||
#endif
|
|
||||||
cmd:bc
|
cmd:bc
|
||||||
cmd:cat
|
cmd:cat
|
||||||
cmd:chgrp
|
cmd:chgrp
|
||||||
@@ -172,9 +169,7 @@ provides {
|
|||||||
}
|
}
|
||||||
|
|
||||||
requires {
|
requires {
|
||||||
#ifndef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
cmd:bash
|
||||||
#endif
|
|
||||||
lib:libcurl
|
lib:libcurl
|
||||||
lib:libfreetype
|
lib:libfreetype
|
||||||
lib:libgcc_s
|
lib:libgcc_s
|
||||||
|
|||||||
@@ -22,9 +22,6 @@ provides {
|
|||||||
cmd:arp
|
cmd:arp
|
||||||
cmd:base64
|
cmd:base64
|
||||||
cmd:basename
|
cmd:basename
|
||||||
#ifdef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
|
||||||
#endif
|
|
||||||
cmd:bc
|
cmd:bc
|
||||||
cmd:cat
|
cmd:cat
|
||||||
cmd:chgrp
|
cmd:chgrp
|
||||||
@@ -171,9 +168,7 @@ provides {
|
|||||||
}
|
}
|
||||||
|
|
||||||
requires {
|
requires {
|
||||||
#ifndef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
cmd:bash
|
||||||
#endif
|
|
||||||
lib:libcurl
|
lib:libcurl
|
||||||
lib:libgcc_s
|
lib:libgcc_s
|
||||||
lib:libfreetype
|
lib:libfreetype
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ provides {
|
|||||||
cmd:arp
|
cmd:arp
|
||||||
cmd:base64
|
cmd:base64
|
||||||
cmd:basename
|
cmd:basename
|
||||||
#ifdef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
|
||||||
#endif
|
|
||||||
cmd:bc
|
cmd:bc
|
||||||
cmd:cat
|
cmd:cat
|
||||||
cmd:chgrp
|
cmd:chgrp
|
||||||
@@ -173,9 +170,7 @@ provides {
|
|||||||
}
|
}
|
||||||
|
|
||||||
requires {
|
requires {
|
||||||
#ifndef HAIKU_BOOTSTRAP_BUILD
|
|
||||||
cmd:bash
|
cmd:bash
|
||||||
#endif
|
|
||||||
lib:libcurl
|
lib:libcurl
|
||||||
lib:libfreetype
|
lib:libfreetype
|
||||||
lib:libicudata
|
lib:libicudata
|
||||||
|
|||||||
Reference in New Issue
Block a user