From patchwork Fri Oct 18 03:30:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Voss X-Patchwork-Id: 1179100 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=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.b="moFI2/GU"; dkim-atps=neutral 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 46vWln4mjgz9sP6 for ; Fri, 18 Oct 2019 14:31:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9A9CC20397; Fri, 18 Oct 2019 03:31:12 +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 6GVgXmBXRfwR; Fri, 18 Oct 2019 03:31:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 29FD7204C4; Fri, 18 Oct 2019 03:31:11 +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 D4C051BF295 for ; Fri, 18 Oct 2019 03:31:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CBBD3204C4 for ; Fri, 18 Oct 2019 03:31:09 +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 DPLmpvYJlq-D for ; Fri, 18 Oct 2019 03:31:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) by silver.osuosl.org (Postfix) with ESMTPS id D67FF20397 for ; Fri, 18 Oct 2019 03:31:06 +0000 (UTC) Received: by mail-io1-f50.google.com with SMTP id n26so5711802ioj.8 for ; Thu, 17 Oct 2019 20:31:06 -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:mime-version :content-transfer-encoding; bh=IZC5gFBAP4SgTMnwHnNuatcGSybbS2ofJZ1Msc1z5wY=; b=moFI2/GU7qS5OEv6WdLD4lLOq7dLj9b36zCqqJ9LIQHnTIdOpAPFee+I8lpEXygyuj KDTniRWEbH4I0rpDjfOHgtRPsjUQUDm1YoNnlidv86Idf3/pJQXAMLlzS9VsfhhH64Vs +KYzFAQMoXALKoCRIMDf2A6pJ2j38eOcA4Ah3HFz2eMlvjXd6kHm6ItompeLB2uFKdd0 29MW9TFTRBpPdehQOobSK9rAFFGehpKwoZ/eNJkGdPq0fuR9nn+sYG+JgnHSO/z0/pxJ sVwwam+qTnTrZSV2RdDIsVRIr0Qnez8A1OjWvz3Ufp6IV4jnXWjpHuYVqP84DZZbLubd sEpA== 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=IZC5gFBAP4SgTMnwHnNuatcGSybbS2ofJZ1Msc1z5wY=; b=mjAVyFauAK5sN0G3NQLWRkqCDI29iDRYNvpqm6WoutFPhbzyCC/Un1MIuGnENFzYWs iJ/5Mn70LtuDhrLYNqlLdWj4bLs5lYn7d0mfzlzpvlSYw52L2xlCWBsYqb2TPwVcVeZd ocKurNxgWMmBMORGpyb5b9HkUAitpky/a6jbYsqZCdeEyZd8CESI2gyLp7k2n2hqlBym O8pMk03BOXA1MzRGoEOt/TxjvAgQgq9WkHqtydYMtHFQMkYgfq15bPhwgwKWaw1obGS7 w3WAkDp90F33OhnTkyXB1PGMAEBUZsxE3bGkJfERuc/OlOBWi2hUKqmjf3sM94jAdVNC xNvg== X-Gm-Message-State: APjAAAUAfkYc0/fxpq6uaorZ7AXWJ1tPF/DrEc4K23edizbVfcj18Dml Ge98xFmANpGGfhYKJzoTGeKNWB4wsqA= X-Google-Smtp-Source: APXvYqxNy14ZewE3uxLS9QWoJqWcByZDgmbdH/m7sFUWOq52d6khit43pYe2mm1vv73qiun1JTnabg== X-Received: by 2002:a02:bb85:: with SMTP id g5mr7042463jan.7.1571369465402; Thu, 17 Oct 2019 20:31:05 -0700 (PDT) Received: from blueberry.localdomain ([207.191.220.92]) by smtp.gmail.com with ESMTPSA id c8sm1982603ile.9.2019.10.17.20.31.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 20:31:04 -0700 (PDT) From: sam.voss@gmail.com To: buildroot@buildroot.org Date: Thu, 17 Oct 2019 22:30:46 -0500 Message-Id: <20191018033047.370820-1-sam.voss@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/util-linux: Add option for enabling wipefs 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: Carlos Santos , Sam Voss Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Sam Voss Add option to enable wipefs as a standalone app, so that it may be enabled when the flag --disable-all-packages is set. Signed-off-by: Sam Voss Tested-by: Carlos Santos --- ...w-explicit-wipefs-enable-disablement.patch | 33 +++++++++++++++++++ package/util-linux/Config.in | 11 +++++++ package/util-linux/util-linux.mk | 1 + 3 files changed, 45 insertions(+) create mode 100644 package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch diff --git a/package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch b/package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch new file mode 100644 index 0000000000..85021e2978 --- /dev/null +++ b/package/util-linux/0001-Allow-explicit-wipefs-enable-disablement.patch @@ -0,0 +1,33 @@ +From a76cd5f6abace269b60ef6f1b95526a2d09fd331 Mon Sep 17 00:00:00 2001 +From: Sam Voss +Date: Mon, 14 Oct 2019 21:19:16 -0500 +Subject: [PATCH] wipefs: Allow explicitly enable/disablement + +Currently if `--disable-all-packages` is set, there is no configure +option for re-enabling `wipefs`. + +As the current default for `wipefs` is "enabled", add `--disable-` flag +to maintain backward compatibility. + +Signed-off-by: Sam Voss +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fc8a9507f..f70f8d1ee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1286,7 +1286,11 @@ UL_BUILD_INIT([findfs], [check]) + UL_REQUIRES_BUILD([findfs], [libblkid]) + AM_CONDITIONAL([BUILD_FINDFS], [test "x$build_findfs" = xyes]) + +-UL_BUILD_INIT([wipefs], [check]) ++AC_ARG_ENABLE([wipefs], ++ AS_HELP_STRING([--disable-wipefs], [do not build wipefs]), ++ [], [UL_DEFAULT_ENABLE([wipefs], [check])] ++) ++UL_BUILD_INIT([wipefs]) + UL_REQUIRES_BUILD([wipefs], [libblkid]) + UL_REQUIRES_BUILD([wipefs], [libsmartcols]) + AM_CONDITIONAL([BUILD_WIPEFS], [test "x$build_wipefs" = xyes]) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 39eb2c03a0..3c64a19d84 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -407,6 +407,17 @@ config BR2_PACKAGE_UTIL_LINUX_WALL help Send a message to everybody's terminal +config BR2_PACKAGE_UTIL_LINUX_WIPEFS + bool "wipefs" + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + help + wipefs can erase filesystem, raid or partition-table + signatures (magic strings) from the specified device + to make the signatures invisible for libblkid. wipefs + does not erase the filesystem itself nor any other data + from the device. + config BR2_PACKAGE_UTIL_LINUX_WDCTL bool "wdctl" depends on BR2_USE_MMU # libsmartcols diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index ecc3ab62de..0374420b58 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -153,6 +153,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WIPEFS),--enable-wipefs,--disable-wipefs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl)