X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id DF638DC0193 for ; Thu, 25 Sep 2014 06:14:21 +0000 (UTC) Received: by mail-pa0-f50.google.com with SMTP id lj1so1830855pab.37 for ; Wed, 24 Sep 2014 23:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ZDIubhHS9IpYS9+L9qbKuzuRS6Frh9qOP2sAXqUM9iQ=; b=ETonCQvo5MTGxnJu5PAqi8awTz4LmI8sjvH5lvEhOdzaypry+hRVmnnJHCh8Nmdg0m M3HbLVwhMmAOHk5mIp8CnhB2GRTopswEOobhrtYMjIg2h+7dZK2EBIGObYLieGiIEae3 d3JcrcIFHFoR7owQWryAgNoxPJx+MYTezk+3hwY8Uh1/uMiKEkeuyf4QuqgmLjv5jIM6 fS3muFv08DBuIC8PL8rDn7RPJ9Lm6Ltzqu89PHcQIk4KIBrVaot+5tcfVMIDx/mhnZtt lNLO6KSNTpgoOcnLnkNyN41DGux4rOYjaj3xO3LpMj95PcFMmZpBev6NDFO9/cmJzMe/ c3iQ== X-Received: by 10.68.135.2 with SMTP id po2mr16027675pbb.6.1411625660162; Wed, 24 Sep 2014 23:14:20 -0700 (PDT) Received: from ultraviolet.localdomain ([74.82.134.59]) by mx.google.com with ESMTPSA id ja2sm1016629pbb.82.2014.09.24.23.14.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Sep 2014 23:14:19 -0700 (PDT) From: systmkor To: alpine-devel@lists.alpinelinux.org Cc: systmkor Subject: [alpine-devel] [PATCH] alpine-chroot fixing a few bugs Date: Wed, 24 Sep 2014 23:14:15 -0700 Message-Id: <1411625655-1774-1-git-send-email-systmkor@gmail.com> X-Mailer: git-send-email 2.1.0 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Out of date apk static file, chroot directory, fixed '.latest.txt' file Changed the file name of the APK_TOOL to the current version. The chroot used by the APK_TOOl no longer forces the chroot directory to be a sub directory of the executing current working directory. The '.latest.txt' file now uses the mirrors format of having the architecture in the file name Changes to be committed: modified: alpine-chroot --- alpine-chroot | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/alpine-chroot b/alpine-chroot index 49555d6..8fe9114 100644 --- a/alpine-chroot +++ b/alpine-chroot @@ -20,7 +20,7 @@ # http://wiki.alpinelinux.org/wiki/Setting_up_the_build_environment_in_chroot MIRROR=http://dl-5.alpinelinux.org/alpine -APK_TOOL=apk-tools-static-2.4.3-r0.apk +APK_TOOL=apk-tools-static-2.4.4-r0.apk usage() { cat <<__EOF__ @@ -52,10 +52,6 @@ while getopts ":h:a:d:r:" opt; do esac done -if [ "$RELEASE" = "" ]; then - LATEST=`curl --silent $MIRROR/.latest.txt` - RELEASE=${LATEST:31:3} -fi if [ "$ARCH" = "" ]; then ARCH=`uname -i` @@ -66,6 +62,13 @@ if [ "$ARCH" != "x86" ] && [ "$ARCH" != "x86_64" ]; then exit 1 fi +if [ "$RELEASE" = "" ]; then + echo "$MIRROR/.latest.$ARCH.txt" + LATEST=`curl --silent "$MIRROR/.latest.$ARCH.txt"` + RELEASE=${LATEST:31:3} + echo $RELEASE +fi + if [ "$CHROOT" = "" ]; then CHROOT="alpinechroot-$RELEASE" fi @@ -85,13 +88,14 @@ else fi build_chroot() { + echo "$MIRROR/v$RELEASE/main/$ARCH/$APK_TOOL" curl --silent $MIRROR/v$RELEASE/main/$ARCH/$APK_TOOL -o $APK_TOOL tar -xzf $APK_TOOL ./sbin/apk.static \ -X $MIRROR/v$RELEASE/main \ -U \ --allow-untrusted \ - --root ././$CHROOT \ + --root $CHROOT \ --initdb add alpine-base alpine-sdk mkdir -p $CHROOT{/root,/etc/apk,/proc} -- 2.1.0 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---