From patchwork Mon Apr 14 21:05:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 339067 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 4D0471400DA for ; Tue, 15 Apr 2014 07:06:22 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 61C9D8B96A; Mon, 14 Apr 2014 21:06:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ttH9afcXR35Y; Mon, 14 Apr 2014 21:06:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BC54E8B84E; Mon, 14 Apr 2014 21:06:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C855A1BF86E for ; Mon, 14 Apr 2014 21:06:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C49F38B183 for ; Mon, 14 Apr 2014 21:06:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W5IMPiupMWq8 for ; Mon, 14 Apr 2014 21:06:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 17EBD8B123 for ; Mon, 14 Apr 2014 21:06:09 +0000 (UTC) Received: by mail-we0-f178.google.com with SMTP id u56so8703034wes.9 for ; Mon, 14 Apr 2014 14:06:08 -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:in-reply-to:references; bh=styusBSNw62zYtfAVd4DxyTYbeIQ8MTH0K8hwQIUFM0=; b=QWFnnIRKcersvld4m/ovW9cdhFQ6q2JlkF18QR53PPcUHxMAllMLuruiSUb8H4h3qv V7zHchnQPErkvKytPPcaO81LZ68/tH9dtj4VgPBNtexuRbdFlfWbOpnlB0boSOZDVgwv GY57ewKVYQph2S/3gx4ZUZBfmakkKdfRcmnmOddWPLJVYeWKzIORM8i7NiEnnVHYmUMZ GSqD6uLdWEfjD5TOCTXm7JVNzLN7Z060DBujBFIQLpqVQWNVNgNU32A9K01KDY1NqzsA HL+0JBb/yyG09GKxZOJ8ieQoSCxA9+Vg1F3wo5esOPwoVi4zkmWbyX2cklsmCL25JiAT aNqA== X-Received: by 10.180.19.167 with SMTP id g7mr11295157wie.46.1397509568537; Mon, 14 Apr 2014 14:06:08 -0700 (PDT) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id u6sm25412882wif.6.2014.04.14.14.06.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Apr 2014 14:06:07 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.net Date: Mon, 14 Apr 2014 23:05:52 +0200 Message-Id: <1397509552-5278-6-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1397509552-5278-1-git-send-email-s.martin49@gmail.com> References: <1397509552-5278-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH 5/5] openpgm: make its build system python2/python3 friendly X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This patch fixes build issue when python3 is enabled, and host python2 interpreter is not available. Fixes: http://autobuild.buildroot.net/results/01f/01f886a073439c0639ed93e596b68bcadf1a5824/ Signed-off-by: Samuel Martin Cc: Baruch Siach --- Note that, though current openpgm trunk (svn+1508) supports python2 and python3, I have not backported the upstream patch because version_generator.py has been touched by several non-atomic change sets. --- ...on_generator.py-make-it-python3-compliant.patch | 42 ++++++++++++++++++++++ package/openpgm/openpgm.mk | 1 + 2 files changed, 43 insertions(+) create mode 100644 package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch diff --git a/package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch b/package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch new file mode 100644 index 0000000..97cff29 --- /dev/null +++ b/package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch @@ -0,0 +1,42 @@ +From e04f5c20fc1536f8e6d4faf32f2f4657d441f7c8 Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Mon, 14 Apr 2014 17:54:37 +0200 +Subject: [PATCH] version_generator.py: make it python3 compliant + +Signed-off-by: Samuel Martin +--- + openpgm/pgm/version_generator.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/openpgm/pgm/version_generator.py b/openpgm/pgm/version_generator.py +index 2265480..c31376f 100755 +--- a/openpgm/pgm/version_generator.py ++++ b/openpgm/pgm/version_generator.py +@@ -1,5 +1,7 @@ + #!/usr/bin/python + ++from __future__ import print_function ++ + import os + import platform + import time +@@ -8,7 +10,7 @@ build_date = time.strftime ("%Y-%m-%d") + build_time = time.strftime ("%H:%M:%S") + build_rev = filter (str.isdigit, "$Revision: 1369 $") + +-print """ ++print(""" + /* vim:ts=8:sts=8:sw=4:noai:noexpandtab + * + * OpenPGM version. +@@ -47,6 +49,6 @@ const char* pgm_build_revision = "%s"; + + + /* eof */ +-"""%(build_date, build_time, platform.system(), platform.machine(), build_rev) ++"""%(build_date, build_time, platform.system(), platform.machine(), build_rev)) + + # end of file +-- +1.9.2 + diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk index 3ec5c77..951effb 100644 --- a/package/openpgm/openpgm.mk +++ b/package/openpgm/openpgm.mk @@ -12,6 +12,7 @@ OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE OPENPGM_INSTALL_STAGING = YES OPENPGM_AUTORECONF = YES OPENPGM_SUBDIR = openpgm/pgm/ +OPENPGM_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) OPENPGM_CONF_ENV = ac_cv_file__proc_cpuinfo=yes ac_cv_file__dev_rtc=no \ ac_cv_file__dev_hpet=no