Mercurial > gub
changeset 5412:a0958b7099d0
Add 'BOOTSTRAP' switching for /GUB vs GUB -- disabled.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 24 Jul 2009 17:17:09 +0200 |
| parents | 4bfbd78397f4 |
| children | 68b4f2900856 |
| files | GNUmakefile gub/build.py gub/settings.py |
| diffstat | 3 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/GNUmakefile Fri Jul 24 17:04:02 2009 +0200 +++ b/GNUmakefile Fri Jul 24 17:17:09 2009 +0200 @@ -162,12 +162,12 @@ $(FAKEROOT) $(FAKECHROOT) /bin/bash -l -c 'cd /dev && ./MAKEDEV standard' # $(FAKEROOT) $(FAKECHROOT) /bin/bash -l -c '($UNTAR)' mv $(ROOT)/dev/urandom $(ROOT)/dev/urandom- - $(FAKECHROOT) bash -l -c 'gbin/gub cross/gcc' + BOOTSTRAP=TRUE $(FAKECHROOT) bash -l -c 'gbin/gub cross/gcc' # run test build in root run: - $(FAKECHROOT) bash -l -c 'gbin/gub --lax-checksums cross/gcc' + BOOTSTRAP=TRUE $(FAKECHROOT) bash -l -c 'gbin/gub --lax-checksums cross/gcc' # enter into root chroot: - $(FAKEROOT) $(FAKECHROOT) bash -l + BOOTSTRAP=TRUE $(FAKEROOT) $(FAKECHROOT) bash -l
--- a/gub/build.py Fri Jul 24 17:04:02 2009 +0200 +++ b/gub/build.py Fri Jul 24 17:17:09 2009 +0200 @@ -112,15 +112,10 @@ return [] def with_platform (self, name): - if 'BOOTSTRAP' in os.environ.keys (): + if 'BOOTSTRAP' in os.environ.keys () or True: if 'tools::' in name: return misc.with_platform (name.replace ('tools::', ''), - self.settings.platform) - elif 0: - print 'NEEM:', name - if not 'tools::' in name and not 'cross' in name and name not in ['bintuils', 'gcc']: - return misc.with_platform (name.replace (self.settings.platform, ''), - 'tools') + self.settings.build_platform) return misc.with_platform (name, self.settings.platform) def get_platform_build_dependencies (self):
--- a/gub/settings.py Fri Jul 24 17:04:02 2009 +0200 +++ b/gub/settings.py Fri Jul 24 17:17:09 2009 +0200 @@ -121,7 +121,10 @@ # workdir based; may be changed self.downloads = self.workdir + '/downloads' - self.alltargetdir = '/GUB' + self.alltargetdir = self.workdir + '/target' + if 'BOOTSTRAP' in os.environ.keys () or True: + # this is for: BOOTSTRAP *and* for running in [fake]chroot + self.alltargetdir = '/GUB' self.system_root = self.alltargetdir + self.root_dir if self.platform == 'tools' and GUB_TOOLS_PREFIX: