From 8601b971af4604e106c46348e26c5b08a18de04d Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sat, 17 Jan 2009 19:09:55 -0600 Subject: Use pacman to download core packages This uses the configured mirror, so it makes things faster when building. Yay! Signed-off-by: Aaron Griffin --- configs/install-iso/Makefile | 6 ++--- configs/install-iso/download-repo.sh | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100755 configs/install-iso/download-repo.sh diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index 7f98605..4d867cb 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -1,5 +1,5 @@ -ver=2008.12 -kver=2.6.27-ARCH +ver=2009.01 +kver=2.6.28-ARCH WORKDIR=work @@ -47,7 +47,7 @@ base-iso: root-image core-pkgs: base-iso mkdir $(WORKDIR)/core-pkgs/ - wget --mirror -P $(WORKDIR)/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH) + ./download-repo.sh core "$(WORKDIR)/core-pkgs" # Bootloaders grub-gfx: diff --git a/configs/install-iso/download-repo.sh b/configs/install-iso/download-repo.sh new file mode 100755 index 0000000..b5a09bd --- /dev/null +++ b/configs/install-iso/download-repo.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# This script downloads a entire pacman repo to a dir +# using the locally configured best mirror. +# +# Copyright (c) 2009 Aaron Griffin +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +REPO="$1" +DEST="$2" + +if [ -z "$REPO" -o -z "$DEST" ]; then + echo "usage: $(basename $0) " + exit 1 +fi + +if [ $EUID -ne 0 ]; then + echo "This script must be run as root (for pacman -Sp)" + exit 1 +fi + +[ -d "$DEST" ] || mkdir -p "$DEST" + +PKGS=$(/usr/bin/pacman -Slq $REPO) + +if [ -n "$PKGS" ]; then + for url in $(/usr/bin/pacman -Sp $PKGS | grep '://'); do + pkgname="$(basename "$url")" + wget -nv "$url" -O "$DEST/$pkgname" + done +else + echo "No packages to download... what'd you break?" + exit 1 +fi -- cgit v1.2.3-70-g09d2 From 773571c479c8c2c8150de804a01e3df3fcebefa6 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 19 Jan 2009 22:32:57 -0600 Subject: Make sure download-repo.sh also gets the db file Whoopsie Signed-off-by: Aaron Griffin --- configs/install-iso/download-repo.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/install-iso/download-repo.sh b/configs/install-iso/download-repo.sh index b5a09bd..31a3c79 100755 --- a/configs/install-iso/download-repo.sh +++ b/configs/install-iso/download-repo.sh @@ -35,10 +35,13 @@ fi PKGS=$(/usr/bin/pacman -Slq $REPO) if [ -n "$PKGS" ]; then + baseurl="" for url in $(/usr/bin/pacman -Sp $PKGS | grep '://'); do + baseurl="$(dirname "$url")" #save for later pkgname="$(basename "$url")" wget -nv "$url" -O "$DEST/$pkgname" done + wget -nv "$baseurl/$REPO.db.tar.gz" -O "$DEST/$REPO.db.tar.gz" else echo "No packages to download... what'd you break?" exit 1 -- cgit v1.2.3-70-g09d2 From b9fb4f858b113b7f0c4e217ec7c61ff345ebd4fc Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 19 Jan 2009 23:28:42 -0600 Subject: Fix some typos in isolinux files flavour -> flavor (USA!) Arch Linux -> ArchLinux Signed-off-by: Aaron Griffin --- configs/install-iso/boot-files/isolinux/boot.msg | 2 +- configs/install-iso/boot-files/isolinux/help.msg | 2 +- configs/install-iso/boot-files/isolinux/options.msg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/install-iso/boot-files/isolinux/boot.msg b/configs/install-iso/boot-files/isolinux/boot.msg index 15091a9..551956a 100644 --- a/configs/install-iso/boot-files/isolinux/boot.msg +++ b/configs/install-iso/boot-files/isolinux/boot.msg @@ -1,6 +1,6 @@ splash.rle -Arch Linux Install and LiveCD (0e2009.0107) +ArchLinux Install and LiveCD (0e2009.0107) 0eF207 -> more boot options 0eF307 -> Troubleshooting, Help diff --git a/configs/install-iso/boot-files/isolinux/help.msg b/configs/install-iso/boot-files/isolinux/help.msg index b60163a..d2e749c 100644 --- a/configs/install-iso/boot-files/isolinux/help.msg +++ b/configs/install-iso/boot-files/isolinux/help.msg @@ -9,7 +9,7 @@ Usefull kernelparameters in case of trouble: 0eacpi=off07 0enoapic07 0epci=routeirq07 -Append these to the available flavours, ex. arch noapic +Append these to the available flavors, ex. arch noapic 0eF107 -> Start screen, 0eF207 -> Boot options diff --git a/configs/install-iso/boot-files/isolinux/options.msg b/configs/install-iso/boot-files/isolinux/options.msg index 9c7704d..86a6af4 100644 --- a/configs/install-iso/boot-files/isolinux/options.msg +++ b/configs/install-iso/boot-files/isolinux/options.msg @@ -1,7 +1,7 @@ splashsmall.rle 0e2009.0107 -Boot flavours on this ISO: +Boot flavors on this ISO: ---------------------------------- 0earch07 : ArchLinux LiveCD [pata] (the Default) 0earchide07 : ArchLinux LiveCD [legacy IDE mode] -- cgit v1.2.3-70-g09d2 From f87259b3b839b46aacd23cb6dda57d9f96a2e79d Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 19 Jan 2009 23:33:47 -0600 Subject: Add aif to the packages.list Signed-off-by: Aaron Griffin --- configs/install-iso/packages.list | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/install-iso/packages.list b/configs/install-iso/packages.list index 41d2219..f85f973 100644 --- a/configs/install-iso/packages.list +++ b/configs/install-iso/packages.list @@ -1,4 +1,5 @@ archlinux-installer +aif base dnsutils dosfstools -- cgit v1.2.3-70-g09d2 From c2b2a30b81c7be718e6c2de8114f3b648ee875e9 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 20 Jan 2009 00:33:38 -0600 Subject: Fix core package format to include repo If testing is enabled, -Sp will give us testing URLs. Use the $repo/$pkgname format for packages so we get the right files Signed-off-by: Aaron Griffin --- configs/install-iso/download-repo.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/install-iso/download-repo.sh b/configs/install-iso/download-repo.sh index 31a3c79..35029fe 100755 --- a/configs/install-iso/download-repo.sh +++ b/configs/install-iso/download-repo.sh @@ -32,7 +32,8 @@ fi [ -d "$DEST" ] || mkdir -p "$DEST" -PKGS=$(/usr/bin/pacman -Slq $REPO) +#Ensure we have core/pkgname format, so we don't get crap from other repos +PKGS=$(/usr/bin/pacman -Sl $REPO | cut -d' ' -f1,2 | tr ' ' '/') if [ -n "$PKGS" ]; then baseurl="" -- cgit v1.2.3-70-g09d2