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 From patchwork Wed Dec 16 08:00:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1416929 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 4Cwncm2VGKz9sTX for ; Wed, 16 Dec 2020 19:00:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 07E2B8699B; Wed, 16 Dec 2020 08:00:54 +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 g_hoFC-cMpyZ; Wed, 16 Dec 2020 08:00:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 527A486672; Wed, 16 Dec 2020 08:00:53 +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 C1CE91BF298 for ; Wed, 16 Dec 2020 08:00:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A264987285 for ; Wed, 16 Dec 2020 08:00:51 +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 qhcJlhHNc3Ec for ; Wed, 16 Dec 2020 08:00:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1D05C874FC for ; Wed, 16 Dec 2020 08:00:20 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id t22so6698364pfl.3 for ; Wed, 16 Dec 2020 00:00:20 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rEhdftA116K5H3sJFdZhaJdwPi/dtxY7vVh6X4DV/3A=; b=NHLCFG2RP8JotEOcNmWA65F+HTLlBaDsR1YqjOY8hdFRhKdfmbER5FkLxe+G4asa6a T+6e3OhpN7BicVjPVw4jMC/G2mNycF9DKu7QEzEGOdfhdp4RjVcMiuxoGIwgki+J8rHn HUteSGkDNkcgWd+1PT8yD+vUiDl+fnEG6YKO2g9lZPfMgj5r6jkvwREdDiZZWmt+tnRA 3DuAj5s62bCAylIIWyc2e9c8FYeKPQYMufq7RESXOWuzamVfPyJWWLYsq/xC0XzshV6/ XR4lO4/xS2arCsMD5FWrHivyCZ4fRZx3OKEJLDPrBaZaCD9g1nRxuPKoAjeSBH2/RTkp lAzg== X-Gm-Message-State: AOAM532VpEV4/VVfcL8JlNl86ZNg4W/DZc7P809xBxWaM3mTOUt1ik/Y XQeKBhUOZUgLR+npIgD34d2+ehp9C453iwiNORM= X-Google-Smtp-Source: ABdhPJwalQpEtfM+kbL8jSX8fLd57PrmOyHgPbyaAwXHzYpEER+8BcFF1WbTIqxjUb3TmG1wfp8yrQ== X-Received: by 2002:a63:5c5e:: with SMTP id n30mr11634509pgm.397.1608105619498; Wed, 16 Dec 2020 00:00:19 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 00:00:19 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 16 Dec 2020 00:00:09 -0800 Message-Id: <20201216080013.547261-2-christian@paral.in> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201216080013.547261-1-christian@paral.in> References: <20201216080013.547261-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/5] package/runc: 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 , "Yann E . MORIN" , Adam Duskett , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fix the ldflags specifying the version info for "version" command. Signed-off-by: Christian Stewart Signed-off-by: Tian Yuanhao --- package/runc/runc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 3d177d23d5..393bd7b22f 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -9,7 +9,7 @@ RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE -RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) +RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) From patchwork Wed Dec 16 08:00:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1416933 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cwndy65FLz9sSs for ; Wed, 16 Dec 2020 19:01:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1CC802094E; Wed, 16 Dec 2020 08:01:57 +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 CYn4X08yOjXF; Wed, 16 Dec 2020 08:01:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0A343228E3; Wed, 16 Dec 2020 08:00:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D05DC1BF9B9 for ; Wed, 16 Dec 2020 08:00:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C85E986A85 for ; Wed, 16 Dec 2020 08:00:45 +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 9K2wgVhQ3DGh for ; Wed, 16 Dec 2020 08:00:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9001A86B2B for ; Wed, 16 Dec 2020 08:00:21 +0000 (UTC) Received: by mail-pf1-f170.google.com with SMTP id t22so6698405pfl.3 for ; Wed, 16 Dec 2020 00:00:21 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=8z13xk2tNUDwBYkX/kwSoFUrvvgYKB00MVt9IxFOX5Q=; b=Xv/61xiRI/HlrB+kPmEj+H0O26/DHqEVuiymc5SiQwdqSTwplNH20ew1RpzRcruOgp /6zekZJPDYEWfZEzbXE8UgQdgKw71/Q7rvu8OW7ctMdNjct4i4hmmTMEBcV1Nzg8Ehtw fMUHbEUeXvwdwSKW69ArGTgDl5zseDKy/bC9+dlUCM2XWOfqSGwC6scg+ohc2Rnqziq9 J+/9GKbqmZLUg1C/uPEM7vgRCnFnzgVYhLVfgt/3MOOdJEg71QsjWp2v2jnXftazd1Z7 0F+5nMA47Ge3lLU11dbbXNr0ZVRItNQCi6ZQtAtdoHtqwSdI4qt9s5ZoEK/MtpissVta +y+w== X-Gm-Message-State: AOAM5323jPA/0Ntot8w+wRXb1v76BjJR72BpKLmSnECDBbCs4TBEsgpY ziZlywtMLtWGtIrfZX82QZiqMxhrsJtfdWxEdYY= X-Google-Smtp-Source: ABdhPJyvUZ0hutNZsrUpc+Jw+n3TVGuXKvTmK/7wNgVkpGPUVe3DbeUEnkWH+WUgdACRjVFCAUNMzA== X-Received: by 2002:a65:5a8d:: with SMTP id c13mr32022891pgt.265.1608105620951; Wed, 16 Dec 2020 00:00:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 00:00:20 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 16 Dec 2020 00:00:10 -0800 Message-Id: <20201216080013.547261-3-christian@paral.in> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201216080013.547261-1-christian@paral.in> References: <20201216080013.547261-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/5] package/docker-containerd: specify correct build targets 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 , Asaf Kahlon , Peter Seiderer , Thomas Petazzoni , "Yann E . MORIN" , Adam Duskett , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adds build targets "ctr" cli and runc shims. Removes the outdated and now unnecessary symlinks to docker-runc docker-containerd etc as well. Signed-off-by: Christian Stewart --- .../docker-containerd/docker-containerd.mk | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 6b79bd14ae..89ffeb6651 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -11,13 +11,16 @@ DOCKER_CONTAINERD_LICENSE_FILES = LICENSE DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd +DOCKER_CONTAINERD_BUILD_TARGETS = \ + cmd/containerd \ + cmd/containerd-shim \ + cmd/containerd-shim-runc-v1 \ + cmd/containerd-shim-runc-v2 \ + cmd/ctr + DOCKER_CONTAINERD_LDFLAGS = \ -X $(DOCKER_CONTAINERD_GOMOD)/version.Version=$(DOCKER_CONTAINERD_VERSION) -DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim - -DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf DOCKER_CONTAINERD_TAGS += seccomp @@ -29,12 +32,6 @@ else DOCKER_CONTAINERD_TAGS += no_btrfs endif -define DOCKER_CONTAINERD_INSTALL_SYMLINKS - ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc - ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim - ln -fs containerd $(TARGET_DIR)/usr/bin/docker-containerd -endef - -DOCKER_CONTAINERD_POST_INSTALL_TARGET_HOOKS += DOCKER_CONTAINERD_INSTALL_SYMLINKS +DOCKER_CONTAINERD_INSTALL_BINS = $(notdir $(DOCKER_CONTAINERD_BUILD_TARGETS)) $(eval $(golang-package)) From patchwork Wed Dec 16 08:00:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1416928 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 4Cwncl5XVlz9sSf for ; Wed, 16 Dec 2020 19:00:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AB1B18651A; Wed, 16 Dec 2020 08:00:50 +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 i5F5hlZ5Ik3V; Wed, 16 Dec 2020 08:00:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 81CA0863D9; Wed, 16 Dec 2020 08:00:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6E1561BF298 for ; Wed, 16 Dec 2020 08:00:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6AA4A86A85 for ; Wed, 16 Dec 2020 08:00:46 +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 YcefX2y4ol+7 for ; Wed, 16 Dec 2020 08:00:43 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 0374286A72 for ; Wed, 16 Dec 2020 08:00:23 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id w16so17060721pga.9 for ; Wed, 16 Dec 2020 00:00:22 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rHgeXRHadVFwQenGueZD+dIpEgMyly2HOBDqVt38U6U=; b=PTp4g3C8ajdgRq3dTzdX4lVekQpr1elI0jNIXpx6gfs1btFV8ionPELp/ZF1PTZgfc o7XS+req0mDav5yPSiArKD6RdesLc5Wxa5dO1I03Y4uZQCjhjM/kEj6Sy2+5DO3MMGDR kvtlubwnynBgLU5a5TUPzfVIUsr9w3hFsgMcgm8BiHIdtTtFBHWNO5pSwb09GvXdoY0E P9qnEb0UScv9/HIswV985+ONQvUooK8dVCzNGZfisy9RrXlVkMAwyZOqMj4eY8t18Whv bYMtLeR61sCFR2GPMUbDtUjj7Hl7KvzV/SfUM8GuKk3fQBAkOjPItnwjGCY6RgkKQH00 aNUw== X-Gm-Message-State: AOAM532YF9/f0aANsdAnZjJbV51EAZ2PwNnQWkVasZd+b9IOq9tYAV8R sdcftOaduz+hR3n1mqRCzsrF/HPKo7pyHQMEpOk= X-Google-Smtp-Source: ABdhPJytfz5ukL5pk0EN1HBe8Tn+xWNeiWV5DZdrIOJsESKP/td/+k1tFdie0iuuOj3Bi+Ewb8fkbQ== X-Received: by 2002:a62:d142:0:b029:19e:6b61:7f80 with SMTP id t2-20020a62d1420000b029019e6b617f80mr22546468pfl.9.1608105622457; Wed, 16 Dec 2020 00:00:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 00:00:21 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 16 Dec 2020 00:00:11 -0800 Message-Id: <20201216080013.547261-4-christian@paral.in> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201216080013.547261-1-christian@paral.in> References: <20201216080013.547261-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/5] package/docker-cli: bump version to 20.10.1 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 , Asaf Kahlon , Peter Seiderer , Thomas Petazzoni , "Yann E . MORIN" , Adam Duskett , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 66abfe5224..4e14b5212a 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 21b88a00e8f7a3194c0ae1de5a31e3e1728ef6aa2804158dcb502a8b5fd6ae2b docker-cli-19.03.13.tar.gz +sha256 4ee7cc9c3f6287ca834166aaa1a945790c54d9a8345a1b449a193d9c739f2a7d docker-cli-20.10.1.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 86fffafdb8..0d1ec02ad7 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 19.03.13 +DOCKER_CLI_VERSION = 20.10.1 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From patchwork Wed Dec 16 08:00:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1416931 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CwndF1HPzz9sRf for ; Wed, 16 Dec 2020 19:01:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 004B02285E; Wed, 16 Dec 2020 08:01:16 +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 xjzD7RX0EccH; Wed, 16 Dec 2020 08:01:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 73EDC22654; Wed, 16 Dec 2020 08:00:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 53F461BF298 for ; Wed, 16 Dec 2020 08:00:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B9A5864F4 for ; Wed, 16 Dec 2020 08:00:25 +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 CsYiQmtH6Rf5 for ; Wed, 16 Dec 2020 08:00:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9E263863BB for ; Wed, 16 Dec 2020 08:00:24 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id w16so17060784pga.9 for ; Wed, 16 Dec 2020 00:00:24 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3oz0PCOvkBT4B+ZYPY49ZfQ05gmGCg1K4cfAD2ZCVqE=; b=Hxe7Rxw0pLbSBcfjbF1IA/Y3/FRPxC1SiSa9L8VGB7q/3SOhv5xVwq3aoS5lnjZTue azeO9bE+yyS0pCPO6nHhVdk/piEotpUDkvF8woa12zU4XtyMFpjyBujMrqHsYcjUGrdq QU3fWCZlRPPWlTmHA0VX4ZsX9z22O5a2eJ4uEWOHyZqz303Rfkx9rP3jACX/umyFmiOG ldOr0R8pCiMKxFcLx+Qh0Wj3UUZnEGs3/wMD7hDw/DJcxWWpmXnKiTEZ8/DN+fgmYFup vkGjtKlDm93Y2un6HNl6pu4OokIqXH5IvNDOydUnaVnnq8Kd7lrz9mGQ1nb1ty2ChTxr DYpg== X-Gm-Message-State: AOAM531yV244KfzNlfxmXBmFRWtL/1SXjIzAh2NF3f/DK5T5g4p9Dgex hZ0CFNSBDuwU0ZtzWrDsbU0Klmo+mA4muG0bLwM= X-Google-Smtp-Source: ABdhPJxBbF13yoqGSt6i9SIpFZonLXkPPc1UvwbmOVpthVjZVv87rDr5mJy1fILKvYU2qdHg7e/xlw== X-Received: by 2002:a62:6c2:0:b029:19e:b63a:91e9 with SMTP id 185-20020a6206c20000b029019eb63a91e9mr27924184pfg.79.1608105624006; Wed, 16 Dec 2020 00:00:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 00:00:23 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 16 Dec 2020 00:00:12 -0800 Message-Id: <20201216080013.547261-5-christian@paral.in> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201216080013.547261-1-christian@paral.in> References: <20201216080013.547261-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/5] package/docker-engine: bump version to 20.10.1 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 , Asaf Kahlon , Peter Seiderer , Thomas Petazzoni , "Yann E . MORIN" , Adam Duskett , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Additionally, fix the ldflags specification of the package version. The "autogen" script does not actually configure anything anymore, and instead exports a LDFLAGS environment variable which we can't use. Instead, specify the version information via LDFLAGS directly in the Buildroot makefile, similar to containerd and other packages. Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 25 +++++++++--------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index e7d5932687..a6313ce351 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f43331fef1d24e31f43392fc1fed72b48fc17fd432d341d6eb1f68ca11383406 docker-engine-19.03.13.tar.gz +sha256 f0fda46a82bf8f624eb349370358891d3bc65ef3e320675226f17dba8f62566d docker-engine-20.10.1.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 8cedf307ba..186aa4223f 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 19.03.13 +DOCKER_ENGINE_VERSION = 20.10.1 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -13,13 +13,16 @@ DOCKER_ENGINE_LICENSE_FILES = LICENSE DOCKER_ENGINE_DEPENDENCIES = host-pkgconf DOCKER_ENGINE_GOMOD = github.com/docker/docker -DOCKER_ENGINE_LDFLAGS = \ - -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ - -X main.Version=$(DOCKER_ENGINE_VERSION) - -DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen +DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_LDFLAGS = \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.BuildTime="" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.GitCommit="buildroot" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.IAmStatic="false" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.InitCommitID="" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_ENGINE_TAGS += seccomp DOCKER_ENGINE_DEPENDENCIES += libseccomp @@ -53,16 +56,6 @@ endif DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) -define DOCKER_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - BUILDTIME="$$(date)" \ - VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ - bash ./hack/make/.go-autogen -endef - -DOCKER_ENGINE_POST_CONFIGURE_HOOKS += DOCKER_ENGINE_RUN_AUTOGEN - define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service