On Mon, Aug 24, 2009 at 4:35 AM, Dieter Plaetinck<dieter@plaetinck.be> wrote:
On Sun, 23 Aug 2009 11:30:24 -0500 Christopher Brannon <cmbrannon@cox.net> wrote:
Git doesn't track empty directories, so there is no configs/install-iso/overlay/pacman.d/ directory when one clones the archiso project. This causes "make <IMAGENAME>" to fail when wget tries to fetch the mirrorlist. The fix is to make the directory just before calling wget. --- configs/install-iso/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index cdfd8a1..7e4ffe3 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -32,6 +32,9 @@ net-iso: overlay $(BOOTLOADER)
overlay: base-iso cp -r overlay $(WORKDIR)/ + if [ ! -d $(WORKDIR)/overlay/etc/pacman.d ]; then \ + mkdir -m755 $(WORKDIR)/overlay/etc/pacman.d; \ + fi wget -O $(WORKDIR)/overlay/etc/pacman.d/mirrorlist http://www.archlinux.org/mirrorlist/$(ARCH)/all/ sed -i "s/#Server/Server/g" "$(WORKDIR)/overlay/etc/pacman.d/mirrorlist"
Thanks for the patch. maybe you could add a note about why this is needed; or maybe better: maybe we should have some sort of policy about this? like putting '.empty' files in git: this tackles the problem closer to the root, makes things more clear, and doesn't complicate our scripts. And if someday tracking of empty directories is in git, we can just remove all .empty files without needing to review all our scripts.
This is fine, i mean the "if dir doesn't exist, make dir" check is useful most of the time anyway. Applied and pushed. Thanks