From patchwork Sat Mar 20 22:28:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1456215 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=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=CZxnpSnw; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F2wRk6yD5z9sVb for ; Sun, 21 Mar 2021 09:29:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 042F840204; Sat, 20 Mar 2021 22:29:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 41EJubSDP3wN; Sat, 20 Mar 2021 22:29:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 29C4E40223; Sat, 20 Mar 2021 22:29:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D68591BF588 for ; Sat, 20 Mar 2021 22:28:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BD8B44033C for ; Sat, 20 Mar 2021 22:28:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GPL4DP5Zrq8r for ; Sat, 20 Mar 2021 22:28:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9A15C4033A for ; Sat, 20 Mar 2021 22:28:41 +0000 (UTC) Received: by mail-pj1-x1036.google.com with SMTP id x7-20020a17090a2b07b02900c0ea793940so8477251pjc.2 for ; Sat, 20 Mar 2021 15:28:41 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=bDhFysZHPr+FxPem2UcMIVXHwIALhO4rm0vkxsq3XpM=; b=CZxnpSnwULl0B+eo+y+NoiXgIlqKaCgqifAxvSnrivzK5u/coEN1WPXWRQlkVxmMTu 2Uo0nTkJVXldtESyxpUjl20VItF064k+rwNx/M3vVJLbUIF1w3SNKTGOA+dzXYp/n629 bSRrs1DGMezY8Aa1szAirjE0lOFRvXf3bCXOx2mF+6JUD9xcgUxhUT9HrYEDoKmNY6xZ 6G+AltQMTZiK/BgxROnDbk9aiv4yT6UqS5TVnRiVslZ6Kd1pLpctDadaZMy+TFn1Fkki PEAQYv0S3+TYjYYO6WYXJu7tt+idb4RiK7S7BaEZl0A/O8Fr9Mn3Tkw+Y5mHlccqWA4f VqRQ== 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=bDhFysZHPr+FxPem2UcMIVXHwIALhO4rm0vkxsq3XpM=; b=GfsTLWAdaqlXC4zOH9d1DJtbYcYNis05375BmNBnGyFGRlDKW3HiAu1BBKsBqxHFfr hvdhc8V8/9Be4XK/QW5VbSC3fwbp/oCQjim0BXCSCOyXMRZEMBTeLmrZNYI/oBEhMA1M QUcm3tPufFDLBDhM1Ci/5pv4k98aqiEcoWOvXbB1in4T5270qzG5y0jAHS62AQgmhFrQ WxUsIRdeXKTejCaKwxOYypg5ExNwy3U8FcZJNCIfRiscZ7VpCzi1dQlmCiblOWJwJQNz vf4tlTtok9btNuUz32Mzl0rD5WpqKQr/4AEWMC2W8IbvA+xyBylZSNcReMGetCFXH5an nhEg== X-Gm-Message-State: AOAM533i0GmLvJ2Nr+smx4Oc+0Wgjqztc5D0QhFxqFYc/bShUv8ah7oW meFlpZSWZ/slAbVtg9gEBnCR/2rfSy/jdg== X-Google-Smtp-Source: ABdhPJzmbWbTOJZ9+KSgIVK92pCgszDP76fEJfTdON0sElsH3RRSG1ufrxhI3HV6FmPK1tRqFx0BHA== X-Received: by 2002:a17:90a:f184:: with SMTP id bv4mr5209834pjb.43.1616279320960; Sat, 20 Mar 2021 15:28:40 -0700 (PDT) Received: from localhost.localdomain ([47.149.18.245]) by smtp.gmail.com with ESMTPSA id y8sm9809919pfe.36.2021.03.20.15.28.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Mar 2021 15:28:40 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 20 Mar 2021 15:28:33 -0700 Message-Id: <20210320222835.3951325-3-aduskett@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210320222835.3951325-1-aduskett@gmail.com> References: <20210320222835.3951325-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/4] package/mender/mender.mk: fix linker version argument 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: Mirza Krak , Angelo Compagnucci , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett The current linker flag "-X main.Version=$(MENDER_VERSION)" no longer points to the correct location, which results in "version: unknown" when runnning "mender -version." Update the linker flag to point to the correct location. Signed-off-by: Adam Duskett --- package/mender/mender.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 3e82f556fb..16d7178a6b 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -37,7 +37,7 @@ MENDER_LICENSE_FILES = \ MENDER_DEPENDENCIES = openssl xz -MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION) +MENDER_LDFLAGS = -X github.com/mendersoftware/mender/conf.Version=$(MENDER_VERSION) MENDER_UPDATE_MODULES_FILES = \ directory \