| index : docker | |
| Archlinux32 docker scripts | gitolite user |
| summaryrefslogtreecommitdiff |
| -rwxr-xr-x | build-all-images.sh | 12 | ||||
| -rwxr-xr-x | mkimage-arch.sh | 2 |
diff --git a/build-all-images.sh b/build-all-images.sh index 2715740..a7e763b 100755 --- a/build-all-images.sh +++ b/build-all-images.sh @@ -2,6 +2,18 @@ cd "$(dirname "$(readlink -e "$0")")" +if [ "x$1" = 'x--pull' ]; then + git pull --rebase + shift +fi + +if [ $# -ne 0 ]; then + >&2 printf 'usage: %s [--pull]\n\n' "$0" + >&2 echo 'unknown parameters:' + >&2 printf ' "%s"\n' "$@" + exit 1 +fi + for ARCHITECTURE in i486 i686 pentium4; do ARCHITECTRUE=$ARCHITECTURE sudo --preserve-env=ARCHITECTURE ./mkimage-arch.sh done diff --git a/mkimage-arch.sh b/mkimage-arch.sh index 7b26266..63aeb01 100755 --- a/mkimage-arch.sh +++ b/mkimage-arch.sh @@ -77,7 +77,7 @@ case "$arch" in fi PACMAN_CONF=$(mktemp ${TMPDIR:-/var/tmp}/pacman-conf-archlinux-XXXXXXXXX) sed "s/Architecture.*/Architecture = ${ARCHITECTURE}/" './mkimage-arch-pacman.conf' > "${PACMAN_CONF}" - echo 'Server = http://pkgcache.eckner.net/arch/$arch/$repo' | sed pppp > mirrorlist32 + echo 'Server = http://pkgcache.eckner.net/arch/$arch/$repo' | sed 'p;p;p;p' > mirrorlist32 sed -i "s|/etc/pacman.d/mirrorlist|mirrorlist32|g" "${PACMAN_CONF}" PACMAN_MIRRORLIST='Server = http://pkgcache.eckner.net/arch/$arch/$repo' PACMAN_EXTRA_PKGS='archlinux32-keyring' |