From patchwork Wed Jul 18 12:41:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 945705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41VxcW4CDpz9s21 for ; Wed, 18 Jul 2018 22:42:19 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41VxcW1T2pzF3J0 for ; Wed, 18 Jul 2018 22:42:19 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=redhat.com (client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=thuth@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41Vxby1488zF35L for ; Wed, 18 Jul 2018 22:41:50 +1000 (AEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1898CB4DF; Wed, 18 Jul 2018 12:41:48 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-200-180.str.redhat.com [10.33.200.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9202E2026D69; Wed, 18 Jul 2018 12:41:47 +0000 (UTC) From: Thomas Huth To: slof@lists.ozlabs.org Date: Wed, 18 Jul 2018 14:41:44 +0200 Message-Id: <1531917704-21355-5-git-send-email-thuth@redhat.com> In-Reply-To: <1531917704-21355-1-git-send-email-thuth@redhat.com> References: <1531917704-21355-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 18 Jul 2018 12:41:48 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 18 Jul 2018 12:41:48 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' Subject: [SLOF] [PATCH 4/4] Makefile: Set a proper DRIVER_NAME when building from a git tree X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" The DRIVER_NAME environment variable is not set up correctly for the build_romfs tool in case we build from a git tree, so the field in the rom header did not contain much useful data. Let's use the revision string from git as DRIVER_NAME in this case. Signed-off-by: Thomas Huth --- Makefile.gen | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.gen b/Makefile.gen index 2fdf23f..f18c57a 100644 --- a/Makefile.gen +++ b/Makefile.gen @@ -23,6 +23,7 @@ export DRIVER_NAME=$(shell cat ../VERSION | sed -e "s/-/./g" | awk -F . '{ print else ifneq (,$(wildcard ../.git)) RELEASE=git-$(shell git rev-parse --short=16 HEAD) +export DRIVER_NAME=git-$(shell git rev-parse --short=12 HEAD) else ifneq (,$(shell cat ../VERSION)) RELEASE="$(USER)@$(HOSTNAME) release $(shell cat ../VERSION)"