From patchwork Sat Mar 20 22:28:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1456212 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=2605:bc80:3010::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=h+jVQE9o; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::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 4F2wR06btxz9sVb for ; Sun, 21 Mar 2021 09:29:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 042404037B; Sat, 20 Mar 2021 22:28:58 +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 Y_krbMmOAPuv; Sat, 20 Mar 2021 22:28:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 03DEB40341; Sat, 20 Mar 2021 22:28:56 +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 44DF41BF588 for ; Sat, 20 Mar 2021 22:28:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 33A3840341 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 w91k_4Jzr8Pg for ; Sat, 20 Mar 2021 22:28:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by smtp4.osuosl.org (Postfix) with ESMTPS id 109674033C for ; Sat, 20 Mar 2021 22:28:40 +0000 (UTC) Received: by mail-pg1-x52c.google.com with SMTP id l1so6107374pgb.5 for ; Sat, 20 Mar 2021 15:28:40 -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=S9u01e2l+am5G61e/LSJzVJ383G8T8yBg3fXCpTEW0c=; b=h+jVQE9oi8XGCrj8S1BAe5ROxzo7zee1aosDh+9YXrKwIwJiRp+SATTCFTHQYdocVt VGwzuDEuPDWOIY27RSXs7YFmrgrXmVBSNR4uHVrTU77iuWhzzOQzyGbH63Y2YvHGl6aV j83RvoKHaTjTlHXNj8pgWcMk370r8M2iRFmseYbib3xiwBw1DZSyffz1bub6C+c1+d+K bRUQhjBcuKtSu+PWx4VBjIM9A4sOKAlSSG8a1xnDZTQCmo3eaLYZTDhtAR7IAqjX78aG eBz9qt9wjNFKUwTtxweFgk7TxzAhDqHJxODhd50hI1swpNuI+caz1IwzeZLeRVvctt8+ d0rA== 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=S9u01e2l+am5G61e/LSJzVJ383G8T8yBg3fXCpTEW0c=; b=rR465VN1L1pGG+0w6M68zO1mqe9gg/t/NQ7tqepttHJurxUbT2wGpadAxfKrAxrYuv pFbp+9RTe+as9XBaND5xRnPXkY/9xqDYfk+nenhr8Nj9+MsCbsVwC9zQmS+DPUdLyC92 O2J9t6f29gJTouOdoP6fheCFEvIe0c6qUBDWp+bFYBO1knWmkHeG/+2y/HHSEGCS0AVU CX//DHs/g0TIy2684ccS50TVeiKFDaWHdRN4EvQV4m0PhttiMBDvdQKfX2kiyP7/j+pA PW0sZahvFWDZbb7OL65f/oK2e15qVSdG7tHPR9lF+QK1KOibk8Zxwn1xi0TGirCZge6k 2+lg== X-Gm-Message-State: AOAM532i38WPoEk7pva2PIowWdYoLxJDjLtGOrO0NAvOKykhBt6nqLyg dgI9wvDyV8STVWxNAUsDsmVycHMN3ZfiKw== X-Google-Smtp-Source: ABdhPJxz0huRLVDJ1lyvGzMxaF9+QDxeZIfspoTctmQqW3a0dwpbLq8TNrsRp2crSoNu8p39yO3H2g== X-Received: by 2002:a62:3507:0:b029:1ed:a492:fda6 with SMTP id c7-20020a6235070000b02901eda492fda6mr14974498pfa.37.1616279320240; 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.39 (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:32 -0700 Message-Id: <20210320222835.3951325-2-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 1/4] package/mender/mender.mk: use MENDER_PKGDIR variable 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 Currently there is a mix of calls to package/mender and $(MENDER_PKGDIR) in the mender.mk file. Standardize the calls to only $(MENDER_PKGDIR). Signed-off-by: Adam Duskett --- package/mender/mender.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index bb37f2d8ed..3e82f556fb 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -62,10 +62,10 @@ define MENDER_INSTALL_CONFIG_FILES $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) - $(INSTALL) -D -m 0755 package/mender/artifact_info \ + $(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/artifact_info \ $(TARGET_DIR)/etc/mender/artifact_info - $(INSTALL) -D -m 0755 package/mender/device_type \ + $(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/device_type \ $(TARGET_DIR)/etc/mender/device_type mkdir -p $(TARGET_DIR)/var/lib @@ -84,7 +84,7 @@ define MENDER_INSTALL_INIT_SYSTEMD endef define MENDER_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/mender/S42mender \ + $(INSTALL) -D -m 755 $(MENDER_PKGDIR)/S42mender \ $(TARGET_DIR)/etc/init.d/S42mender endef 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 \ From patchwork Sat Mar 20 22:28:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1456214 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=smtp3.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=T+03lipI; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 4F2wRT5Xj7z9sVb for ; Sun, 21 Mar 2021 09:29:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2440260715; Sat, 20 Mar 2021 22:29:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aHHDRLaTsXtO; Sat, 20 Mar 2021 22:29:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 371416079E; Sat, 20 Mar 2021 22:29:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8D0021BF95A for ; Sat, 20 Mar 2021 22:28:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 7C07460715 for ; Sat, 20 Mar 2021 22:28:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wKtjEW06JcXQ for ; Sat, 20 Mar 2021 22:28:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by smtp3.osuosl.org (Postfix) with ESMTPS id 7043960703 for ; Sat, 20 Mar 2021 22:28:42 +0000 (UTC) Received: by mail-pl1-x632.google.com with SMTP id t20so4632923plr.13 for ; Sat, 20 Mar 2021 15:28:42 -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=B1wysvhzaGPjqD66LR0Xk7n9fUpd5pBDOZv8qJpehMU=; b=T+03lipISsZkG53t2FqgdkzszRnyZOFDjafZ6eZ6EBQCmmYXo70wKNf3KQnKd6bvZj /VZrSMOBGb5xuwFGK+GJpiEgqNWcvFRJ+FMwU2FlqtrDcHvIrfKek+yEIhtd6RQNAkUw yrXWfsJFY1vNE7hyjZwVtg98dyQQsZx6uCGiVNr4JCvMnVK41475UCasqY/erjuPoKTY wK3XKqo1ocoWNBlrqi4Xh5heTN6DmAkNLzcZqrGGosEwBBVYDUGL7E4ii52VoTqMoGW8 IuTsd8AzSllgu6lbTvItVqw8W/ueQrS3wkZ4qNztnc4tTKuNVzrnTYuMuNIb0JpM0Vtg 9swQ== 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=B1wysvhzaGPjqD66LR0Xk7n9fUpd5pBDOZv8qJpehMU=; b=lVoHFUIpPo41WTQURiCLie8GT2IdK1C8P52nEPURH7lR23ABbG6iomOucfov9Suy33 JChPwPoa7ziQb6huy/gcnaS/SoZDWAvjaYi3OsYDNslR3PuW+DBg4sxObKbOCjIlSxsY kjmKlMuDUUFPR2Zc8gWASf1/6kvPl89m7aw7IJXD1yTEEMDBiSbMZb380oDvZ+QnIvgs ZqCb2XEcpJlqyEQ3IBERNy+stNSc9LyLURh+OBaTjCdBFN2WMHH07SFdk7iUUlIDZiuD pfiFDSOpxJOH6uY+baFCXx8DKRTfOzxPBIur8OcObMCHrq+Qdn82eKDWdJUPF+cvCEJl C39Q== X-Gm-Message-State: AOAM5320Zw6iT8/D8i1m/fC44cVewZtKfkZUh11mqNJxfxL5bzqSQ/DR 4cdbdVkg7o4Fxfxeou8jgnyLiEFe6PZjFA== X-Google-Smtp-Source: ABdhPJxi3vv2rfK0lJeXf88lxh+z3vWZfrJ7AeCihuP7gK6GpeQd7/wBJhXcvWPZpguLuR1srF8sXQ== X-Received: by 2002:a17:90b:1198:: with SMTP id gk24mr5398074pjb.73.1616279321591; Sat, 20 Mar 2021 15:28:41 -0700 (PDT) Received: from localhost.localdomain ([47.149.18.245]) by smtp.gmail.com with ESMTPSA id y8sm9809919pfe.36.2021.03.20.15.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Mar 2021 15:28:41 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 20 Mar 2021 15:28:34 -0700 Message-Id: <20210320222835.3951325-4-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 3/4] package/mender: bump version to 2.5.0 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 Other changes: - Add host-pkgconf as a dependency. It's used to find OpenSSL. - Set new license hashes. Signed-off-by: Adam Duskett --- package/mender/mender.hash | 13 ++++++++----- package/mender/mender.mk | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package/mender/mender.hash b/package/mender/mender.hash index 43bb92d6ed..52e321f7e7 100644 --- a/package/mender/mender.hash +++ b/package/mender/mender.hash @@ -1,31 +1,33 @@ # Locally computed: -sha256 ff9dccef31b0c6c1710ee767f8f05bc8038034e50968b207ee1a09a10f801ab4 2.4.2.tar.gz +sha256 339bf97b3680315baf93143745b14b8638c5402094f94a4cc5a6ea63a2568da8 2.5.0.tar.gz # Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE -sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mendertesting/LICENSE sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE +sha256 f4a394d9345ba64dd2796dc552c31af99c4b686a46c0eeda6538038732f771a9 vendor/github.com/mendersoftware/progressbar/LICENSE # # BSD 2 Clause license. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE +sha256 e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128 vendor/github.com/godbus/dbus/LICENSE # # BSD 3 Clause license. +sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/text/LICENSE sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE # # ISC license. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE # # MIT license. +sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE @@ -33,9 +35,10 @@ sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor sha256 b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0 vendor/github.com/stretchr/objx/LICENSE sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE +sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE # # OpenLDAP Public License sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md # sha256 of all the vendor licenses combined -sha256 d872f963cdd188b384eb673bf11002e4afb94830710f420a3f3d322695801847 LIC_FILES_CHKSUM.sha256 +sha256 76417c090c1a53d6fb1409998346e59e43f13139732a46dfc8732e0b4aebba2b LIC_FILES_CHKSUM.sha256 diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 16d7178a6b..a5b5654ff9 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 2.4.2 +MENDER_VERSION = 2.5.0 MENDER_SITE = https://github.com/mendersoftware/mender/archive MENDER_SOURCE = $(MENDER_VERSION).tar.gz MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 @@ -35,7 +35,7 @@ MENDER_LICENSE_FILES = \ vendor/gopkg.in/yaml.v3/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md -MENDER_DEPENDENCIES = openssl xz +MENDER_DEPENDENCIES = host-pkgconf openssl xz MENDER_LDFLAGS = -X github.com/mendersoftware/mender/conf.Version=$(MENDER_VERSION) From patchwork Sat Mar 20 22:28:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1456213 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=smtp3.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=Uq5ZYs5Y; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 4F2wRF1Jhzz9sVb for ; Sun, 21 Mar 2021 09:29:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3B7D560786; Sat, 20 Mar 2021 22:29:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bbBuRqGcRL17; Sat, 20 Mar 2021 22:29:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 8CAAD60703; Sat, 20 Mar 2021 22:29:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6F7471BF588 for ; Sat, 20 Mar 2021 22:28:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6C5CA834B9 for ; Sat, 20 Mar 2021 22:28:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YKXPkv1N0aB2 for ; Sat, 20 Mar 2021 22:28:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by smtp1.osuosl.org (Postfix) with ESMTPS id E75D582F76 for ; Sat, 20 Mar 2021 22:28:42 +0000 (UTC) Received: by mail-pf1-x42e.google.com with SMTP id l3so8389951pfc.7 for ; Sat, 20 Mar 2021 15:28:42 -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=kdtfi3B89Hw79fYiMUC+mK2I5fToaHXK8iMOScXd0dQ=; b=Uq5ZYs5Ynx25JTi7GzG1h8Ea450PgGSvsU5vvyHkj4aNM4sLH38NsyYr2NsAQs+H+P E07sQocnHIu5t0nBN/N4EHfkBbuLnXUVlAhReFBibKQKPjYp40Yy/3ZNaJkFe99/Xbix nzrjyhF3ydqQ9a307mGmMlB/nsO4yquIsZ7ssPi5qqrcoBNb71kzQhVwOlc1FTyj1uHX UV8fmV3lT/WXYXbq0Hw2++dZV9r8prV3nuo6caJcr4Fy9nljHPkHAxdJDTWSI1jxnMIr Mq6o9KkecnUw53ZZxCUBJT6NVetgKE7qjXZcX6oVma3wlFxB6zz53s1GxKJV/FvSWVjT 9dfw== 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=kdtfi3B89Hw79fYiMUC+mK2I5fToaHXK8iMOScXd0dQ=; b=AYAQPgQU3n5kds8nE57z0LIpHlJlsn+Hpusb4miJOTnGIrfcXPz18cOQjkLV0h3Q0d XVUJszQeoD0B4lcGtSL+3BQ8K4FQs8raE29JoukOiRLVWCCD9fryjj1+cko9iydANPrQ 59vhbdCa1b2Mk8o20f+KSOFPXOKaPh8MJVYzq900msKQswcKlVXcwv3HIlLzPx4o8WH7 uBEwFVDRYlRn5tS7034G7VD2lhpx2Udyk9IjtX/umVODcD+NuCIyPhNStlpuyj91xBw4 6Ch30+pxdc6nbuN0UZ5YW/8SD+10futHJ2H3r+XjnuSQMu1r00ovxaZ0fcc3R43hx3Oa wg9g== X-Gm-Message-State: AOAM533/CEFpd+Usy/+nPmTYs9M9M55fkViYgTEq9pUhdxrQnr9Jd3bl mKwZzNWNolWt8wPq1hxwsmagdOP4WsNPMA== X-Google-Smtp-Source: ABdhPJyfOpYWRa5g3PqP4Ai4YKcQDwVSobeSBTKeWJWW89/MkA5s1UyRBw9RxG0vwWxgVqEHEYAzwQ== X-Received: by 2002:a62:3646:0:b029:205:2117:f339 with SMTP id d67-20020a6236460000b02902052117f339mr14926045pfa.32.1616279322246; Sat, 20 Mar 2021 15:28:42 -0700 (PDT) Received: from localhost.localdomain ([47.149.18.245]) by smtp.gmail.com with ESMTPSA id y8sm9809919pfe.36.2021.03.20.15.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Mar 2021 15:28:42 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 20 Mar 2021 15:28:35 -0700 Message-Id: <20210320222835.3951325-5-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 4/4] package/mender: install dbus authentication file if dbus is selected 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 While not a requirement to run mender itself, the mender-connect package requires this file to be installed to talk to mender. Signed-off-by: Adam Duskett --- package/mender/mender.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index a5b5654ff9..fc077c6fa2 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -78,6 +78,15 @@ endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES +ifeq ($(BR2_PACKAGE_DBUS),y) +MENDER_DEPENDENCIES += dbus +define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF + $(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf +endef +MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF +endif + define MENDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender-client.service \ $(TARGET_DIR)/usr/lib/systemd/system/mender-client.service