From patchwork Thu Oct 17 16:52:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1178790 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="t4qJLQHp"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46vFZM5bHlz9sP3 for ; Fri, 18 Oct 2019 03:52:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 80C6F86B8E; Thu, 17 Oct 2019 16:52:09 +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 x6aDGNprF28l; Thu, 17 Oct 2019 16:52:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DBD3F86B6C; Thu, 17 Oct 2019 16:52:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id F04AF1BF4E3 for ; Thu, 17 Oct 2019 16:52:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id ED5A0885E8 for ; Thu, 17 Oct 2019 16:52:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xh6p55uitLeK for ; Thu, 17 Oct 2019 16:52:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 09E2B885E5 for ; Thu, 17 Oct 2019 16:52:07 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id r3so3172624wrj.6 for ; Thu, 17 Oct 2019 09:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=v3qFRyEDW1oDgvUqaY5D28osNpZ13Ty3o1Ed4jFL8u4=; b=t4qJLQHpaTptmGtK+xluNDofIh08g912tVNCs97bvei8PIC7sTDKA8cfVR/Rja5h1N qnDqziZ90cDfFvIH0S5aRV3ZhZy/Yo06eZXpPHKXN8I6ExUyynN2QCezJxpJGOAKiDDl 1Fs1mLPKHaOxBKC4+ahpZj8W2wRI978222w/BHAQ+z9cpTwFUrH6kEobj5Nt1UYq4IK7 kCa48Ov3aODDFNAHTcZvny/MB4aNLQXgEiGRUcRIM2XjogqhCoFmmMRcfAPIAaUDRv/O 0c6WAntuO+RF2+bRlpIKiIOafbupMuIiOgnWGEc+zzmIVIsqclIoDuB9HQK6PWch9eAE JpTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=v3qFRyEDW1oDgvUqaY5D28osNpZ13Ty3o1Ed4jFL8u4=; b=GrWJV7C8V/qehgMHgc4BABKnfrEfyh8KgDQXxPWDcOCWxaD1wJ8xs8XzRw5UceyyxL CzhY4GvRz4HNVX4SsDjUEG+8RCuV0uLZPShDZ0sTP0X/yhKVJd5UD277jvXHoAiXQfiV 6alqRa+2WAvysxcWY+WcgnUvjgxDI03IkdTVDzwecdyvuzWAceXPJx8feVppLiI2ezhG Wai9qYwPRjq+47Tp4Js1hHp2c9Yl1xhMbathPF8vi3BF9u5RxeEekE2aqP4xLtL3px8b 145jBbrczCZmYkdbTkdxPRrmBua1c25v4i+ojAM+aFZ1XA7cGgN9jXf7z1ArCj4Tety5 ZCKw== X-Gm-Message-State: APjAAAWviQp/IqeAHuDEuLJC8PqAr3yuIbXka/32CNwD+WJyRt/VqLS7 7mnJssHyGUeYFyx0fI+YtO8qJ+7b X-Google-Smtp-Source: APXvYqzzQfhbOdgvyWce+wuRwBQtqwUyQ6iOKhQs0Oj8tGh8Qy+UH8zoCe5Y/aI3jVIxF4n4RcNvkQ== X-Received: by 2002:adf:f744:: with SMTP id z4mr4065735wrp.22.1571331124998; Thu, 17 Oct 2019 09:52:04 -0700 (PDT) Received: from kali.home (lfbn-1-3732-187.w86-229.abo.wanadoo.fr. [86.229.230.187]) by smtp.gmail.com with ESMTPSA id b12sm2686828wrt.21.2019.10.17.09.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 09:52:04 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 17 Oct 2019 18:52:07 +0200 Message-Id: <20191017165207.9018-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/micropython: drop patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop patch and set GIT_DIR as suggested by upstream during review of an upstreamable solution, see https://github.com/micropython/micropython/pull/5002 Signed-off-by: Fabrice Fontaine Reviewed-by: Chris Packham --- package/micropython/0001-fix-version.patch | 22 ---------------------- package/micropython/micropython.mk | 11 ++++++++--- 2 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 package/micropython/0001-fix-version.patch diff --git a/package/micropython/0001-fix-version.patch b/package/micropython/0001-fix-version.patch deleted file mode 100644 index 1bf2992169..0000000000 --- a/package/micropython/0001-fix-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -Always use the fallback behaviour for determining the version number - -When built from within buildroot the micropython build process detects -that it is inside a git repository and ends up using the buildroot -version number instead of the correct micropython version number. - -Signed-off-by: Chris Packham ---- -diff -Naur micropython-v1.4.5-old/py/makeversionhdr.py micropython-v1.4.5/py/makeversionhdr.py ---- micropython-v1.4.5-old/py/makeversionhdr.py 2015-08-12 00:42:30.000000000 +1200 -+++ micropython-v1.4.5/py/makeversionhdr.py 2015-09-16 10:21:06.698962836 +1200 -@@ -70,9 +70,7 @@ - - def make_version_header(filename): - # Get version info using git, with fallback to docs/conf.py -- info = get_version_info_from_git() -- if info is None: -- info = get_version_info_from_docs_conf() -+ info = get_version_info_from_docs_conf() - - git_tag, git_hash, ver = info - diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index d636d0e869..5824b4ab18 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -10,6 +10,11 @@ MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE MICROPYTHON_DEPENDENCIES = host-pkgconf libffi +# Set GIT_DIR so package won't use buildroot's version number +MICROPYTHON_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + GIT_DIR=. + # Use fallback implementation for exception handling on architectures that don't # have explicit support. ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),) @@ -22,15 +27,15 @@ MICROPYTHON_MAKE_OPTS = MICROPY_PY_BTREE=0 MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0 define MICROPYTHON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross + $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) endef define MICROPYTHON_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \