From patchwork Sat Jul 25 23:06:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1336362 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=fail (p=none dis=none) header.from=gmail.com 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=UvwXGPBq; dkim-atps=neutral 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 4BDhXS5N9bz9sSn for ; Sun, 26 Jul 2020 09:06:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4F44B86277; Sat, 25 Jul 2020 23:06:47 +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 3Oj9r_s3UA1c; Sat, 25 Jul 2020 23:06:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C6DDE862A9; Sat, 25 Jul 2020 23:06:46 +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 9BA8B1BF59E for ; Sat, 25 Jul 2020 23:06:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 98A8D86759 for ; Sat, 25 Jul 2020 23:06:31 +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 GwdNpGn5boq7 for ; Sat, 25 Jul 2020 23:06:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 092A181ADE for ; Sat, 25 Jul 2020 23:06:31 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id s26so7135586pfm.4 for ; Sat, 25 Jul 2020 16:06:31 -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=bV9vQK9LS5xSFAXWgMLWZcs26JSuJAs3+fb1+ubj2XM=; b=UvwXGPBqc6phsrANexBAeHaDDRtRO+paDQZjm3lnN2os2ZZZ8KLOrT9tFoaZHX6Hqd gCn6toWm3EO+L/yCU3UcGNEviTJWMbAvpTp2Gs8Wzk3FV4KnLxY6PKQFz7yJ6lWgJpAF SEopvy350W85zZWP5Fl6vk0az15vifdXsYjZKKCcyeLB9ql2Mc8mmzo3kX5fEOdScrUG oe6L+Delg1jTfwWLZXE5LsYcOo8Sj1WubBlgLkczn4pdn8aC6rLUbQBT3/kIcvc6683R T/usfb5Kon2LTj1Q5ricUX9Ul0xRlmFacyPftWVEa5sbjMaeUGkcDMxnMTu9Iiw+JQWp aFWA== 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=bV9vQK9LS5xSFAXWgMLWZcs26JSuJAs3+fb1+ubj2XM=; b=S0GDvxITlRNAya5kQ8C/rBLzJA8PoCeHqEYZpz0dO3iRlbcuJiEJHpPECLOsrtad6X jbQkTmAVgH8i6/mvm0RLMDOthg7PkYI8SZJtv+0Jg2h7SIMAbhtuWnR5hc+5HxMUEF/E TObgTJDyWhmra0vffVl5+EPWhYdltByCw3LsLx8m2l1okYFd+ZmxZ7KtMY8PsYr0YjHc sPd2As5yiIZh5+7y2Yg6OF8qylb6ahmrdjMQBBC/QDbE+PvsFLZkfZyaavbBwwccSJC0 EodaFlHYREYhnk3M5TkBFPwi4SFRKDu7TuO6l6388o+AcNQw5JHtPk1LRv2foJ+PRTTo Y1dA== X-Gm-Message-State: AOAM532JBH0gmT+/JnA3uxdYxERB5W7J6HodPoyd57yyUA5qwd3LZvdr kYCnwa4S5JqJvSmod2OvbGt54aQvJt8= X-Google-Smtp-Source: ABdhPJzApaG7NP1kjCBP+AFK0FrPRjsma1ai0omQxd3idawV+BzLqUJtElbKHc/8YIz5Fvuy71K4Lw== X-Received: by 2002:a63:e114:: with SMTP id z20mr12215236pgh.300.1595718390389; Sat, 25 Jul 2020 16:06:30 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id w64sm10160999pgd.67.2020.07.25.16.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2020 16:06:29 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 25 Jul 2020 16:06:15 -0700 Message-Id: <20200725230618.3640682-11-aduskett@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200725230618.3640682-1-aduskett@gmail.com> References: <20200725230618.3640682-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 10/13] package/libblockdev: add support for swap plugin 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: Giulio Benetti , Adam Duskett , Marek Belisko Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Add missing dependency on util-linux and also select util-linux and util-linux-libblkdit in the Config.in file. (Thomas) package/libblockdev/Config.in | 5 +++++ package/libblockdev/libblockdev.mk | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index ffc92a89d1..8b7b832795 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -57,6 +57,11 @@ config BR2_PACKAGE_LIBBLOCKDEV_PART comment "part plugin needs a toolchain w/ locale" depends on !BR2_ENABLE_LOCALE +config BR2_PACKAGE_LIBBLOCKDEV_SWAP + bool "swap" + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + endif comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 41c64acc9c..b9eb0571f6 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -26,7 +26,6 @@ LIBBLOCKDEV_CONF_OPTS = \ --without-python2 \ --without-python3 \ --without-s390 \ - --without-swap \ --without-tools \ --without-vdo @@ -71,4 +70,11 @@ else LIBBLOCKDEV_CONF_OPTS += --without-part endif +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SWAP),y) +LIBBLOCKDEV_DEPENDENCIES += util-linux +LIBBLOCKDEV_CONF_OPTS += --with-swap +else +LIBBLOCKDEV_CONF_OPTS += --without-swap +endif + $(eval $(autotools-package))