From patchwork Thu Feb 21 14:45:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tunnicliffe X-Patchwork-Id: 15013 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 24AFA23DE1 for ; Thu, 21 Feb 2013 14:45:23 +0000 (UTC) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by fiordland.canonical.com (Postfix) with ESMTP id 6FA08A18524 for ; Thu, 21 Feb 2013 14:45:22 +0000 (UTC) Received: by mail-vc0-f181.google.com with SMTP id f13so2598602vcb.40 for ; Thu, 21 Feb 2013 06:45:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:content-type:mime-version:x-launchpad-project :x-launchpad-branch:x-launchpad-message-rationale :x-launchpad-branch-revision-number:x-launchpad-notification-type:to :from:subject:message-id:date:reply-to:sender:errors-to:precedence :x-generated-by:x-launchpad-hash:x-gm-message-state; bh=dmkf7H+ovlljfiQPtKnSpL+B6lBPBFlSSX+wLcMIyNo=; b=nZqmAoJtlj0UUBGzTJSLVrK0KWrtU8IEnknPUyykA6y8pzFhHURJfOLqzgeCpCyWRX jvXbU1ajoJkayDU0AGWd97BomOr66zfQ1kKcHQh1XFANxYvCqGVml5Te/FrA+IzoAulQ qZ5anYPu6dshtZmeTMyxpsKtbYIEmUxs1ygRG0IL4PNyKU61SoRsg8FW5p9SGVT25uZ/ 2Egs68sxJ5XevoEOzn3it6wzeeFy20EpIQUVPWMIlkL4FY4uz7c4sUKZSijtkIKvtwcn xJwE9LJrzXuN+YZ2MhNh5IKodtp0b9IosjguKgdmdEw5KYMdj7WVJHXTJbctdKRHbhDN xqrw== X-Received: by 10.52.29.18 with SMTP id f18mr22776248vdh.57.1361457921860; Thu, 21 Feb 2013 06:45:21 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp22451veb; Thu, 21 Feb 2013 06:45:20 -0800 (PST) X-Received: by 10.180.95.199 with SMTP id dm7mr27755276wib.20.1361457919630; Thu, 21 Feb 2013 06:45:19 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id id8si7467335wjb.157.2013.02.21.06.45.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 21 Feb 2013 06:45:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1U8XOg-0005oW-L2 for ; Thu, 21 Feb 2013 14:45:18 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 8BD46E02D9 for ; Thu, 21 Feb 2013 14:45:18 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 605 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 605: Merge in fix for old images that Ubuntu doesn't publish apt sources for. Message-Id: <20130221144518.14597.98834.launchpad@ackee.canonical.com> Date: Thu, 21 Feb 2013 14:45:18 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16491"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 145c557e45ade71f661bfa318cf6f0ca5017d5ac X-Gm-Message-State: ALoCoQn9FWj3NHdzWIWBQZ8Rot1A8gahBUsMYu9vT0XbnQpQENQPEJcVeSL2WhbcRw2ozqfIbohA Merge authors: James Tunnicliffe (dooferlad) Related merge proposals: https://code.launchpad.net/~dooferlad/linaro-image-tools/fix-hwpack-no-internet/+merge/149507 proposed by: James Tunnicliffe (dooferlad) review: Approve - Milo Casagrande (milo) ------------------------------------------------------------ revno: 605 [merge] committer: James Tunnicliffe branch nick: linaro-image-tools timestamp: Thu 2013-02-21 14:44:15 +0000 message: Merge in fix for old images that Ubuntu doesn't publish apt sources for. modified: linaro-hwpack-install linaro_image_tools/media_create/boards.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro-hwpack-install' --- linaro-hwpack-install 2012-12-03 08:19:48 +0000 +++ linaro-hwpack-install 2013-02-21 14:40:45 +0000 @@ -173,8 +173,16 @@ FORCE_OPTIONS="" fi + # Do two updates. The first doesn't try to download package lists: + # * First update doesn't access net + # - not allowed to fail. Image file + hwpack should contain all packages + # needed to create image. If this update fails we have problems. + # * Second update may fail + # - If can't download package updates (the only difference between the two + # commands), we should still be OK. echo "Updating apt package lists ..." - $sudo apt-get $FORCE_OPTIONS -o "$APT_GET_OPTIONS" update -q + $sudo apt-get $FORCE_OPTIONS -o "$APT_GET_OPTIONS" update -q --no-download --ignore-missing + $sudo apt-get $FORCE_OPTIONS -o "$APT_GET_OPTIONS" update -q || true } setup_ubuntu_rootfs() { @@ -282,7 +290,15 @@ if [ -x /sbin/initctl.REAL ]; then mv -f /sbin/initctl.REAL /sbin/initctl fi - $sudo apt-get update -qq + # Do two updates. The first doesn't try to download package lists: + # * First update doesn't access net + # - not allowed to fail. Image file + hwpack should contain all packages + # needed to create image. If this update fails we have problems. + # * Second update may fail + # - If can't download package updates (the only difference between the two + # commands), we should still be OK. + $sudo apt-get update -qq --no-download --ignore-missing + $sudo apt-get update -qq || true fi echo "Done" } === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2013-01-14 14:56:31 +0000 +++ linaro_image_tools/media_create/boards.py 2013-02-20 10:02:44 +0000 @@ -257,6 +257,7 @@ with self.hardwarepack_handler: self.hwpack_format = self.hardwarepack_handler.get_format() if (self.hwpack_format == self.hardwarepack_handler.FORMAT_1): + self.bootloader_copy_files = None return if (self.hwpack_format != self.hardwarepack_handler.FORMAT_1):