Mercurial > gub

changeset 5430:6728f17b4306

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
/GUB: remove '.' from GUB ROOT. Fixes fakechroot building of glibc-core!
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 27 Jul 2009 12:30:32 +0200
parents b3782861ff7e
children 92e701bdbf4d
files GNUmakefile
diffstat 1 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Mon Jul 27 12:30:04 2009 +0200
+++ b/GNUmakefile	Mon Jul 27 12:30:32 2009 +0200
@@ -81,7 +81,7 @@
 	pytt '#\nfrom gub import' '#\nfrom gub.syntax import printf\nfrom gub import' $$(grep -l printf $$(git diff --name-only))
 
 
-ROOT = ./GUB
+ROOT = GUB
 FAKEROOT = $(ROOT)/usr/bin/fakeroot -s fakeroot.save
 FAKECHROOT = $(ROOT)/usr/bin/fakechroot chroot $(ROOT)
 BUILD_ARCHITECTURE = $(shell $(PYTHON) bin/build-architecture)
@@ -89,6 +89,7 @@
 
 
 boot_packs =\
+ gub-utils\
  librestrict\
  dash\
  gawk\
@@ -105,9 +106,11 @@
  bash\
  tar\
  make\
+ patch\
  sed\
  findutils\
  libtool\
+ util-linux\
  fakeroot\
  fakechroot\
  expat\
@@ -126,15 +129,18 @@
  cross/gcc-core\
  dash\
  db\
+ expat\
  gdbm\
- expat\
+ gub-utils\
  fakechroot\
  fakeroot\
  glibc-core\
  make\
  makedev\
+ patch\
  python\
  tar\
+ util-linux\
  zlib\
 
 #
@@ -170,6 +176,16 @@
 run:
 	BOOTSTRAP=TRUE $(FAKECHROOT) bash -l -c 'gbin/gub --lax-checksums cross/gcc'
 
+# run test build in root
+rebuildrun:
+	rsync -az bin/ $(ROOT)/gbin
+	rsync -az gub librestrict nsis patches sourcefiles $(ROOT)
+	rm -f $(ROOT)/$(BUILD_ARCHITECTURE)/etc/gup/*
+	rsync -az ./BOOTSTRAP/ $(ROOT)
+	$(UNTAR)
+	BOOTSTRAP=TRUE $(FAKECHROOT) bash -l -c 'gbin/gub --fresh cross/gcc'
+#	BOOTSTRAP=TRUE $(FAKECHROOT) bash -l -c 'gbin/gub cross/gcc'
+
 # enter into root
 chroot:
 	BOOTSTRAP=TRUE $(FAKEROOT) $(FAKECHROOT) bash -l