From patchwork Thu Apr 1 15:44:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1461156 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::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=SzyU3Cga; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::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 4FB6wb05Rvz9sTD for ; Fri, 2 Apr 2021 02:46:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4612B60669; Thu, 1 Apr 2021 15:46:04 +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 4YrxPrvoqCtn; Thu, 1 Apr 2021 15:46:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id E2CCE606DB; Thu, 1 Apr 2021 15:46:01 +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 DA08E1C1187 for ; Thu, 1 Apr 2021 15:45:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CA01E84A70 for ; Thu, 1 Apr 2021 15:45:47 +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 CLxdC-o8ccaz for ; Thu, 1 Apr 2021 15:45:46 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by smtp1.osuosl.org (Postfix) with ESMTPS id B8DE484A4E for ; Thu, 1 Apr 2021 15:45:46 +0000 (UTC) Received: by mail-pj1-x102b.google.com with SMTP id kk2-20020a17090b4a02b02900c777aa746fso1228833pjb.3 for ; Thu, 01 Apr 2021 08:45:46 -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=zZDy/fBHE44HRr93yphsLC0RiiRpgmtY6m9974gr4UA=; b=SzyU3CgaN3lN1tBoJp1Yik6kbVY+6OM91BgkhkRwDEd2CcEqmkMAjQ7x2rZlgSV3lY ti+CL7rvj6XiOnv+uo1yh1A+Z1psLUwj+XOA/rCvhGb2MRQ9q6aogeRaxcnGhtDsafn0 5pte7MwiAhnqCB7f4ZT5JuprD03uj0uX9Kv99BAN+NV0I2RvlS8mEzUxlzRsdZXFlwmi qsPQi6ZIv37IrMapZ+GdbyvZkC3bdgyD/pO2GvA8jyr6tAFK/KcQ+QKU6zbDcc1zag+Q MkVS4gRNMqfJaYja4jKmV+8sCChB4lFjrj44TzQAkOaiZGYGnR6OGfyDemejX527Lu/T D8OQ== 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=zZDy/fBHE44HRr93yphsLC0RiiRpgmtY6m9974gr4UA=; b=o/49kkYd5Wh3W/RQ0UWkPqz58QSFj22WOlTLsfGOEpL9Btk7xfQChJvkWdmN1ZtaHA ycmf2Wp/hv5RmMYndXRDuGyxqKWrQ/GtGs7FXixdtgYeBXzKs/NWzW47A8GKwTVm+x/b QAO1SVOx4yos/TGoNPEKkD9zY7PWBxGVK1NhQSbHN+q32tcLl19SLbIo723Ykax8HZcT 8juUCTn6I7RFQy8s9zxJ2dnOnSRQqD8ssstLoEl5KVCPleUfn4n/F0Ju12MDrvnZ9nS3 +1AkGb5UJwcNRfqpS1rcGZkAArtowgSfHE/z8G+u+gUgNreW0YXW7/eXRQhU9RWXxOZQ VTNw== X-Gm-Message-State: AOAM5339OACH4fyp5HWbrlnPCqTH+GiBA41m/cv+QLV+tc+N8aYlTciG 2ZCe17Grxh5AHljBYU53BqZtYl/4CJWmSw== X-Google-Smtp-Source: ABdhPJyy48eiQ1fqPqbpGy92W6lyT9Fiu9xZmGYKe2MpVIo4Fa6LkBlC9rhtmDDF3BfQhiCAhTlKTA== X-Received: by 2002:a17:902:bf07:b029:e7:137c:2e25 with SMTP id bi7-20020a170902bf07b02900e7137c2e25mr8373817plb.67.1617291946113; Thu, 01 Apr 2021 08:45:46 -0700 (PDT) Received: from localhost.world ([12.231.12.194]) by smtp.gmail.com with ESMTPSA id 144sm5946721pfy.75.2021.04.01.08.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 08:45:45 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Thu, 1 Apr 2021 08:44:52 -0700 Message-Id: <20210401154453.144605-2-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210401154453.144605-1-aduskett@gmail.com> References: <20210401154453.144605-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/mender: make xz optional 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: Angelo Compagnucci , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" According to the README.md file, xz is optional. - Remove the dependency on the xz package. - If the xz package is not selected, add "nolzma" to MENDER_TAGS Signed-off-by: Adam Duskett --- package/mender/Config.in | 1 - package/mender/mender.mk | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/mender/Config.in b/package/mender/Config.in index accee4676a..5ac8bb1676 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_XZ help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 794dd4be8c..1ebd5a2e83 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -38,7 +38,7 @@ MENDER_LICENSE_FILES = \ vendor/github.com/mattn/go-isatty/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md -MENDER_DEPENDENCIES = host-pkgconf openssl xz +MENDER_DEPENDENCIES = host-pkgconf openssl MENDER_LDFLAGS = -X github.com/mendersoftware/mender/conf.Version=$(MENDER_VERSION) @@ -81,6 +81,12 @@ endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES +ifeq ($(BR2_PACKAGE_XZ),y) +MENDER_DEPENDENCIES += xz +else +MENDER_TAGS += nolzma +endif + ifeq ($(BR2_PACKAGE_DBUS),y) define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF $(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \