From patchwork Fri Oct 12 11:56:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 12185 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 2A77323FB2 for ; Fri, 12 Oct 2012 11:56:15 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id BBCDCA183F6 for ; Fri, 12 Oct 2012 11:56:14 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so4509444iej.11 for ; Fri, 12 Oct 2012 04:56:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to: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=1R09kiq3Ly0Bee++bvws5i9qEGJoZY0egpUd2IoqvHc=; b=ULXyTuGzT72WTlz26yJnTJuE/Bk3N1oxLL8yb4k/zZnkjasdoe3xFxZb2edPB/Q6g+ bxsvuKZzg2qYqflmaGBVzRabyyVKvg1/k/Wr0QNP0bDoT6gdNSdRztuuSTbnyJvxALbc VYa4N7i4Q7DuO85fRmlYYmtPxtGggnt2m+s/Qs0nRkzVvKy0BNcqPwH5f7kF/ry6yKlB 1YkfVJX8t5B0RY836iv2YA3RuzsnEC6Yu1Q9Js0IwK8Voi1C3XPLLy78fNd6KqeHUHYP fCMBYbFj9ZQos+IQ/9K8wLibMSF3HYOOjRzMRnZqHYnbEbcnNgoABSRmAfxvjbudywXc e+UQ== Received: by 10.43.7.132 with SMTP id oo4mr3249539icb.6.1350042974540; Fri, 12 Oct 2012 04:56:14 -0700 (PDT) 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.50.67.148 with SMTP id n20csp185379igt; Fri, 12 Oct 2012 04:56:13 -0700 (PDT) Received: by 10.216.213.152 with SMTP id a24mr2624076wep.224.1350042971943; Fri, 12 Oct 2012 04:56:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id r47si8529815wea.47.2012.10.12.04.56.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 12 Oct 2012 04:56:11 -0700 (PDT) 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 1TMdqd-0007NO-9U for ; Fri, 12 Oct 2012 11:56:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 39D6AE02EC for ; Fri, 12 Oct 2012 11:56:11 +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: 574 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 574: Build-Info support: Message-Id: <20121012115611.633.63011.launchpad@ackee.canonical.com> Date: Fri, 12 Oct 2012 11:56:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16137"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 878bf4f60415420374df9621cf4219efba1c69d6 X-Gm-Message-State: ALoCoQl1dOS7tr2JDeS1WW3sP3Sae/MzQbDpQ4gCKyuFFK6mXQl1pYvqOBTMqmtprDxkfKhBs25H Merge authors: Fathi Boudra (fboudra) Related merge proposals: https://code.launchpad.net/~fboudra/linaro-image-tools/open-build-info-support/+merge/129130 proposed by: Fathi Boudra (fboudra) ------------------------------------------------------------ revno: 574 [merge] committer: Fathi Boudra branch nick: linaro-image-tools timestamp: Fri 2012-10-12 14:55:03 +0300 message: Build-Info support: * manifest file isn't license protected (open). * create an open BUILD-INFO.txt when no protected files are available. modified: linaro_image_tools/hwpack/builder.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_image_tools/hwpack/builder.py' --- linaro_image_tools/hwpack/builder.py 2012-10-04 16:54:48 +0000 +++ linaro_image_tools/hwpack/builder.py 2012-10-11 09:24:36 +0000 @@ -362,14 +362,22 @@ 'warnings:\n%s' % stderrdata) # Concatenate BUILD-INFO.txt files + dst_file = open('BUILD-INFO.txt', 'wb') if build_info_available > 0: - dst_file = open('BUILD-INFO.txt', 'wb') build_info_path = \ r'%s/usr/share/doc/*/BUILD-INFO.txt' % \ build_info_dir for src_file in iglob(build_info_path): with open(src_file, 'rb') as f: - dst_file.write('Files-Pattern: %s\n' % \ + dst_file.write('\nFiles-Pattern: %s\n' % \ out_name) shutil.copyfileobj(f, dst_file) - dst_file.close() + dst_file.write('\nFiles-Pattern: %s\n' + 'License-Type: open\n' %\ + manifest_name) + else: + dst_file.write('Format-Version: 0.1\n' + 'Files-Pattern: %s, %s\n' + 'License-Type: open\n' % \ + (out_name, manifest_name)) + dst_file.close()