From 62801481e7a30c2b51d2d20563c45ff91eeb03b5 Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Fri, 5 Nov 2010 10:52:04 -0400 Subject: [PATCH] Make stage3 tarball always have the same filename --- .hgignore | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.hgignore b/.hgignore index 111c1f1..b5072da 100644 --- a/.hgignore +++ b/.hgignore @@ -4,4 +4,4 @@ loop\/.* Makefile\.[^(inc)] latest-stage3\.txt portage-latest\.tar\.bz2 -stage3-.*-\d{8}.tar.bz2 +stage3-.*-latest\.tar\.bz2 diff --git a/Makefile b/Makefile index 1af9213..71bfc05 100644 --- a/Makefile +++ b/Makefile @@ -72,8 +72,8 @@ preproot: stage3 mounts portage stage3: chroot rsync $(RSYNC_MIRROR)/releases/$(ARCH)/autobuilds/latest-stage3.txt . - rsync $(RSYNC_MIRROR)/releases/$(ARCH)/autobuilds/`tail -n 1 latest-stage3.txt` . - stage3=`tail -n 1 latest-stage3.txt` ; tar xjpf `basename $$stage3` -C $(CHROOT) + rsync $(RSYNC_MIRROR)/releases/$(ARCH)/autobuilds/`tail -n 1 latest-stage3.txt` stage3-$(ARCH)-latest.tar.bz2 + tar xjpf stage3-$(ARCH)-latest.tar.bz2 -C $(CHROOT) touch stage3 compile_options: portage make.conf locale.gen $(PACKAGE_FILES)