From patchwork Tue Nov 3 20:57:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1393411 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.a=rsa-sha256 header.s=20161025 header.b=Zw/8a+1v; 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 4CQhvV4j4vz9sVK for ; Wed, 4 Nov 2020 07:58:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 016F4226D4; Tue, 3 Nov 2020 20:58: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 IOC4otMAiQ79; Tue, 3 Nov 2020 20:58:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E4AB921526; Tue, 3 Nov 2020 20:58:08 +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 3545E1BF309 for ; Tue, 3 Nov 2020 20:58:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2EE0E86BEA for ; Tue, 3 Nov 2020 20:58:07 +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 r6d3jmDsq9ZG for ; Tue, 3 Nov 2020 20:58:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4298A86BE8 for ; Tue, 3 Nov 2020 20:58:06 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id p22so578024wmg.3 for ; Tue, 03 Nov 2020 12:58:06 -0800 (PST) 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=aIVBb7aX0Z2ss0OmQpeLJqaTQFoXF4phgmyEwTit8kI=; b=Zw/8a+1vDXXIeKhNnQ9Xq5EerFeudeiSRr0yXsFnkEr3uzBglUr1RW3rFEFGtyMlWX U/NKzyJmLyVArLDldDocwnc92DlVyMhwAB4rj4JrHuh4Cr8+BoSv2Dd2bBnCDyU9Xj1q BYyopM5ZZZ8JWUGJG1MYyoYCDNXW6hDnjh6KzNqU/AhKzTRudGONrpdpfgcP8Ux5OXda aUdGXtNX96pmzHw3oQGP3FmKbi+tPb9fm8AmIHNhm97a1rgqDF7sKnwJpvHPFEynvFR9 Jk/HcIFo/lfn9hJNzS7s2M6x29skNVK/g60HLCloFKZh1vkQ4kiIdL7HCuYD+NZVZFkl lu9g== 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=aIVBb7aX0Z2ss0OmQpeLJqaTQFoXF4phgmyEwTit8kI=; b=TzDhMFBKL180NE97VSo9VvQGEdSE/8zMuBYvx2EzK45oo3VeGKXJnxEkGVr1LraabD sDUawMuC8PRPsJalHnEeuk6oS7d7uf2NWDkiyLyYnTOaPAJVADv/ezyhfzVPF9CGF65a flS1qpgJJqkRvWXrrd58Fn4Omq/0NMjCTrrPugLjpi1fAg6GOTNDaE57Mzl+twUudhbw irmjP2mQn9JGEI1lxYXS6kwSBkjeomU1FtQRd8dW8juzhzfQTZuXfRjldCRnf9v2NU30 g8C4Q9tmmQ3Anm6Ph0EIRC0oEnvf5YxWlJ0EVWN0olRByuCaj6+WHfH/JWJObo4YDwMX 4wGg== X-Gm-Message-State: AOAM5329e2qHjAWJ0PlHa2YPzvTb0H1sWbhctZx+WowAHr80hw3+jIjQ XPFQVahHeMffxWyCetQAi5IX9oQRVr8= X-Google-Smtp-Source: ABdhPJxx6AWk+W+BNQlIqhm2QVuBCtFWePPV75txYwtmxhNQDKn9GhNQQz1Cg+63TM0GUZbBqlAqJA== X-Received: by 2002:a1c:790b:: with SMTP id l11mr1070409wme.53.1604437084449; Tue, 03 Nov 2020 12:58:04 -0800 (PST) Received: from kali.home (lfbn-ren-1-923-220.w83-197.abo.wanadoo.fr. [83.197.237.220]) by smtp.gmail.com with ESMTPSA id z6sm4025658wmi.1.2020.11.03.12.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 12:58:03 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 3 Nov 2020 21:57:44 +0100 Message-Id: <20201103205745.123950-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 1/2] package/util-linux: select BR2_PACKAGE_UTIL_LINUX_LIBS 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: Fabrice Fontaine , Julien Boibessot Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When util-linux is enabled, select BR2_PACKAGE_UTIL_LINUX_LIBS as suggested by Yann E. Morin in https://patchwork.ozlabs.org/project/buildroot/patch/20201101121536.1089498-1-fontaine.fabrice@gmail.com/ As a result, drop BR2_PACKAGE_UTIL_LINUX_LIBS workaround from libglib2 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Drop eudev and systemd updates - Make BR2_PACKAGE_UTIL_LINUX_LIBS a visible option package/libglib2/libglib2.mk | 4 ---- package/util-linux/Config.in | 10 +++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 6e9dbd7b26..43fcb27fae 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -86,12 +86,8 @@ endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) LIBGLIB2_CONF_OPTS += -Dlibmount=enabled -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBS),y) LIBGLIB2_DEPENDENCIES += util-linux-libs else -LIBGLIB2_DEPENDENCIES += util-linux -endif -else LIBGLIB2_CONF_OPTS += -Dlibmount=disabled endif diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 1f33eb5514..252de5c91b 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -1,5 +1,6 @@ menuconfig BR2_PACKAGE_UTIL_LINUX bool "util-linux" + select BR2_PACKAGE_UTIL_LINUX_LIBS help Various useful/essential linux libraries and utilities. @@ -7,10 +8,13 @@ menuconfig BR2_PACKAGE_UTIL_LINUX http://www.kernel.org/pub/linux/utils/util-linux/ -if BR2_PACKAGE_UTIL_LINUX - config BR2_PACKAGE_UTIL_LINUX_LIBS - bool + bool "util-linux-libs" + help + Only the libraries provided by util-linux; if you need the + tools too, select util-linux. + +if BR2_PACKAGE_UTIL_LINUX config BR2_PACKAGE_UTIL_LINUX_LIBBLKID bool "libblkid" From patchwork Tue Nov 3 20:57:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1393410 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.133; helo=hemlock.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=S+ovVJED; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQhvS5Ytvz9sTL for ; Wed, 4 Nov 2020 07:58:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2A58A873ED; Tue, 3 Nov 2020 20:58:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kN3A3tSmgGn3; Tue, 3 Nov 2020 20:58:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6798C873F1; Tue, 3 Nov 2020 20:58:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 416071BF309 for ; Tue, 3 Nov 2020 20:58:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3E260862C1 for ; Tue, 3 Nov 2020 20:58:09 +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 MF5qMIoqoZce for ; Tue, 3 Nov 2020 20:58:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 64C1A860D5 for ; Tue, 3 Nov 2020 20:58:08 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id d142so574435wmd.4 for ; Tue, 03 Nov 2020 12:58:08 -0800 (PST) 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=lNRiVM+H+LZpkBclGL674kiCE+WI5MT7JqjSEA6vIDU=; b=S+ovVJEDOKzpq0/3gVebgKb97B49pFC4AbT2/GQZ5peRnJngMZsMYB0A4xRvqgszA7 RHl6hYZvwfySdwl7jECSKshSk9BXSso5m8RpcKYqq0CnSmmxyTFK2GuRsd87okcf1Wsm Tp0t9B/iBdRTulsO+X+t9ov/EfXJ11c0PZXQ+Cm/YUN7Vy5XfmhclnDCy41/YaoIxk5H 53iD4PpBB9VAo5SYgR7mK+Ssi6kMjOcKJvVtSdZzYp2k8D8Urp/J9s/wYmI+sL/lNNS0 KbBZ+U1ZgVgudjQ+nfeeX8XhDpwAFucocwWp/eYu60OlPmcRpPA4LxQRzwwkc+az6KsN wokw== 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=lNRiVM+H+LZpkBclGL674kiCE+WI5MT7JqjSEA6vIDU=; b=TLY6E61aUvnfwvC+0MBM+rbTedrZtzs9LAOAHemBmb2MB+upGd3Q2Askstddx3BvJp ZJbC7u4nuy/bPoWDK8FSLeYhZ/qQ5hAk/cKUcvp3O1vC2UVZvkHNTATMuCyQwvnPn4Ya kfD5RMBM3Xvm7OQYnABHqXpPBkygBWi06q7yg06py0OtdrqWBG6DBakdArfj8R27xUue ttFRURKxdprX4XuQb1GoefNKPbUxJguX83BDEsTFZsvSLfcQttVO+MPcPBtJARTPApgq PQGdCmMT3+/V7v5sJBGl7uUO3jAHQwNd8UMNPWWGQWWqNkZfCky1Hf5yAEHHt5OHaiv6 AjhA== X-Gm-Message-State: AOAM533b1nAmU2+eJcxNbucAsiDa2wcyz7ieDMIZw5FQLomD8ofBK1Z6 HG5uJxcc69XuGIHAQsjhEZZ2rhAf5UI= X-Google-Smtp-Source: ABdhPJzeZAV8hDSklWWJquIVdcU6C3lympwXRaWrr/7z4MXRFOHlsBorEyMymgCjnQljcm8fCfsARg== X-Received: by 2002:a1c:8095:: with SMTP id b143mr1037484wmd.147.1604437086669; Tue, 03 Nov 2020 12:58:06 -0800 (PST) Received: from kali.home (lfbn-ren-1-923-220.w83-197.abo.wanadoo.fr. [83.197.237.220]) by smtp.gmail.com with ESMTPSA id z6sm4025658wmi.1.2020.11.03.12.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 12:58:06 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 3 Nov 2020 21:57:45 +0100 Message-Id: <20201103205745.123950-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201103205745.123950-1-fontaine.fabrice@gmail.com> References: <20201103205745.123950-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2,2/2] package/abootimg: use util-linux-libs 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: Fabrice Fontaine , Julien Boibessot Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" abootimg only needs libblkid from util-linux-libs Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Select util-linux-libs instead of util-linux package/abootimg/Config.in | 2 +- package/abootimg/abootimg.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/abootimg/Config.in b/package/abootimg/Config.in index 30e5bd1fb0..8aa4cb414c 100644 --- a/package/abootimg/Config.in +++ b/package/abootimg/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ABOOTIMG bool "abootimg" depends on BR2_USE_MMU # libblkid - select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID help Tool to manipulate Android Boot Images, either on files diff --git a/package/abootimg/abootimg.mk b/package/abootimg/abootimg.mk index e906546948..d139d58ceb 100644 --- a/package/abootimg/abootimg.mk +++ b/package/abootimg/abootimg.mk @@ -9,8 +9,8 @@ ABOOTIMG_SITE = $(call github,ggrandou,abootimg,$(ABOOTIMG_VERSION)) ABOOTIMG_LICENSE = GPL-2.0+ ABOOTIMG_LICENSE_FILES = LICENSE -# depends on libblkid from util-linux -ABOOTIMG_DEPENDENCIES = util-linux +# depends on libblkid from util-linux-libs +ABOOTIMG_DEPENDENCIES = util-linux-libs define ABOOTIMG_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)