From patchwork Wed Dec 16 08:00:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1416930 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=none (p=none dis=none) header.from=paral.in 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 4Cwncr5JH0z9sRf for ; Wed, 16 Dec 2020 19:01:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ACDE786BAE; Wed, 16 Dec 2020 08:00:58 +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 4cEVak7vFdWj; Wed, 16 Dec 2020 08:00:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 74BF886B89; Wed, 16 Dec 2020 08:00:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A3D5E1BF298 for ; Wed, 16 Dec 2020 08:00:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8088222B6D for ; Wed, 16 Dec 2020 08:00:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7tM7acNl-X5o for ; Wed, 16 Dec 2020 08:00:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by silver.osuosl.org (Postfix) with ESMTPS id 1BB042153D for ; Wed, 16 Dec 2020 08:00:18 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id c12so16590272pgm.4 for ; Wed, 16 Dec 2020 00:00:18 -0800 (PST) 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=6gUuNaQLG2lm8OGq8VncHeciXsgyodEYduRpZZoS/n0=; b=TUZqEPhM5ab6KUuVpDvkuErYQ8yO50NsEPm/5sGNsWMfiktaTm+LsEJGthzGu/saek dV/PYsA0W/Q5G8ofhyJaKmC8jW/HO25rJJpCu+b+Bim6u1HfJlfB0ViNjNnlkOfbBYWQ 2XX5adNNn4QZGTvoFbSP2fPKiWEbl4LtzBZXS55nQhTniYXntX72INF0gb0nEfTpRP/M L9NK1MCjeiJgY08dT8szkEWosSXTm11NBi9zmE6y14OzLmERBS5oplNy7goVgPTwMPgw xrifyU/V8lpWj9Xc73mwc/r6DbvRG0MqsFfUhfmcY66N+hmPIWA/PYzERU8DGSjiX3Xw FLOg== X-Gm-Message-State: AOAM532jNz+1wCAjK3qlPe5Jbd8H6vVx7sZq5whbtKM/P0GXwT8rWYdo deE+HgJey6Lm7NL+LGQU22mWQkp/vwYLyPZj+VM= X-Google-Smtp-Source: ABdhPJxtRdCjpmP3pbfquDiRLjhVP59FZNbrgW4aDH+/NMkl/ZUuO8bV/hWnlObBRigd+COywPsikw== X-Received: by 2002:a63:4d5c:: with SMTP id n28mr5766235pgl.88.1608105618035; Wed, 16 Dec 2020 00:00:18 -0800 (PST) Received: from localhost.localdomain (ip70-191-80-27.sb.sd.cox.net. [70.191.80.27]) by smtp.gmail.com with ESMTPSA id j3sm1155835pjs.50.2020.12.16.00.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 00:00:17 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 16 Dec 2020 00:00:08 -0800 Message-Id: <20201216080013.547261-1-christian@paral.in> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/5] package/docker-containerd: fix version output ldflags 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: Peter Korsgaard , Christian Stewart , Tian Yuanhao , Asaf Kahlon , Peter Seiderer , Thomas Petazzoni , Tian Yuanhao <52117554+tianyuanhao@users.noreply.github.com>, "Yann E . MORIN" , Adam Duskett , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Tian Yuanhao <52117554+tianyuanhao@users.noreply.github.com> Fix the ldflags specifying the version info for "version" command. Signed-off-by: Christian Stewart Signed-off-by: Tian Yuanhao --- package/docker-containerd/docker-containerd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index d9a0eb28a6..6b79bd14ae 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -12,7 +12,7 @@ DOCKER_CONTAINERD_LICENSE_FILES = LICENSE DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd DOCKER_CONTAINERD_LDFLAGS = \ - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) + -X $(DOCKER_CONTAINERD_GOMOD)/version.Version=$(DOCKER_CONTAINERD_VERSION) DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim