From patchwork Sun Nov 1 15:06:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1391749 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=JJSiFaCh; 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 4CPKC85VfRz9sSs for ; Mon, 2 Nov 2020 02:06:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9E38B2040B; Sun, 1 Nov 2020 15:06:56 +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 VOyGEi8NqBvS; Sun, 1 Nov 2020 15:06:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7EE1120354; Sun, 1 Nov 2020 15:06:55 +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 D550B1BF263 for ; Sun, 1 Nov 2020 15:06:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CC5CB20354 for ; Sun, 1 Nov 2020 15:06:53 +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 4IfUT7uye1Fj for ; Sun, 1 Nov 2020 15:06:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by silver.osuosl.org (Postfix) with ESMTPS id BCA082033F for ; Sun, 1 Nov 2020 15:06:51 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id b3so5747970wrx.11 for ; Sun, 01 Nov 2020 07:06:51 -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=VMQ7Mw9FPSmOLD1uIAX3zDrGz/e1EZ7PbxM31FZDTaQ=; b=JJSiFaChwkYgh1SCqGwNzdeHNBVRQXGbli4AtW2r3uwdvlcWoMm/OSLOkMKJ4LUv4O 07jFxFju7gt1Spp/rXDcjsP8tBz4voXIA3hGk2RV5FlaTc6O/kvbYy0USN6wIZHcN/xU 9upEbODpQ06/+0LrO2ywh3h6VWKWtny/lfA0/ZRQBSnIOxREUUNWcHaI71p3uc0aL7rF qF1Y1vKR3bb3xJz8lCgc+yH4Hf6eaWukTOGVzB0Hfl0zKFQoTpb2e3hYLzYpUA+uLoPV SO7lMQqUdtl+IziJ3fykXQjI/3H5dw/HMKs992ZaYAw3IJrP1ArOQYVNvOKZNeNN51Il KhzA== 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=VMQ7Mw9FPSmOLD1uIAX3zDrGz/e1EZ7PbxM31FZDTaQ=; b=IlIiD/5RXUGvmW+412Pmamsbw5Tnp0eaVJFLyusMzpXUTHofjvXGEWf4GWxsBE5/NK y62IZ6s/maJtv6S6x3ZCIRmSkRDu5+TNH8bZip8SMEEJkFXjjUfB7IAOaihZe+caUL13 ui8WFYG1mwNgUlllQTJS16b2O5jyc8IDqdbNe3r7MwjacV6ZFYG/VrjyapHGUZirN6be y24hz7W01mTgdA5NuWefVUnAFV7v+gtnqeeDINDotfk7PKS9CdsxPmBUtu6xec3rnPxR XW+DXcJ1V2Wz/Mq+/A9MbYn2ePAMATY4tn01pQpGOnE1hRu7IlfcWwrIAczOkOdqUggD rjfA== X-Gm-Message-State: AOAM531g1nGICDFNV8hk3mjY4+44fXa0O4nK5Q9z+G9SRkML0J8lX/C0 aK7igcSlQXf1KzuAwgnkw9YL20bTfrI= X-Google-Smtp-Source: ABdhPJweyGLoEqmcWKLnMn1OQHsZDrNkabn4StytnIUK7dSfjHpUc0XDq3B/SReHvGgt6PAEsZoHeA== X-Received: by 2002:adf:dc4b:: with SMTP id m11mr1690070wrj.328.1604243209897; Sun, 01 Nov 2020 07:06:49 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id z11sm19064160wrr.66.2020.11.01.07.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Nov 2020 07:06:49 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 1 Nov 2020 16:06:18 +0100 Message-Id: <20201101150619.1709959-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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: Bernd Kuhls , Eric Le Bihan , "Yann E . MORIN" , Julien Boibessot , Norbert Lange , Fabrice Fontaine , Maxime Hadjinlian 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 and drop select of BR2_PACKAGE_UTIL_LINUX_LIBS from eudev and systemd Signed-off-by: Fabrice Fontaine --- package/eudev/Config.in | 1 - package/libglib2/libglib2.mk | 4 ---- package/systemd/Config.in | 1 - package/util-linux/Config.in | 1 + 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 0e5bd0cee9..b0ce76171a 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_EUDEV select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_UDEV_GENTOO_SCRIPTS if BR2_INIT_OPENRC select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_KMOD help 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/systemd/Config.in b/package/systemd/Config.in index ec34478e3d..9188876d49 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -29,7 +29,6 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_DBUS # runtime dependency only select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 1f33eb5514..cee4649f67 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. From patchwork Sun Nov 1 15:06:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1391750 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=mQ8A28TD; 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 4CPKCB0qtSz9sSn for ; Mon, 2 Nov 2020 02:07:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C14BC872E6; Sun, 1 Nov 2020 15:06:58 +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 Yka04ICzQzSd; Sun, 1 Nov 2020 15:06:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 47B7A8738D; Sun, 1 Nov 2020 15:06:58 +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 60A671BF263 for ; Sun, 1 Nov 2020 15:06:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B0A88738D for ; Sun, 1 Nov 2020 15:06:57 +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 NKXhSExQtyO4 for ; Sun, 1 Nov 2020 15:06:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9897E872E6 for ; Sun, 1 Nov 2020 15:06:56 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id k18so7060935wmj.5 for ; Sun, 01 Nov 2020 07:06:56 -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=qT+6LNCjcIfxt3pRBEprl9s4qgX0RKyN2eCgrRnOsOo=; b=mQ8A28TD+DssOai4qaDHmpH+UW3LuWOfzQocvxUXuZveEqdC9N47lwbzsgbQUyUri+ bV8l48O5dNi3vzYVbyJqSaFn8iY6tdZNdwMHjwfpFIvY4rPRlu0lNBfmJmdBPvO/A6JR fiabw0v6Aj9HkfZYK8G7HBc2ADRKf5T/1RrwZn7FW86aKjm/WrMoBS3MYE13GY6eyjph krL+282wSsiszjNhck1EwDYz+Ha5bkBqc49hSSVm60kiYRLSrYYq61nkJJGi1bCG9Nqk 1wnrkvafubSV9jYS6WmS0Kau5DxSGtTdIWME3N1MAH8RebBv+83hYXcCd2xmZBW7j51e /KaQ== 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=qT+6LNCjcIfxt3pRBEprl9s4qgX0RKyN2eCgrRnOsOo=; b=bY4hFpVnmQWt3KqoI7/pfOqhtkwiB4cvv+E7oouUFsMiZA8JRpQqBzMzbfs3ZSfIlx qIW0FA0lH/ENRHpF0FrCdwi427kq0vzNm/XA+Ym6z/obn8LoJ0s0ETOrCUTvgYptf9AG 73QOed1P+bj7lVsSwPB7RtOuEiQxEwTI2YS1fQaAeJT5U4FzJ7PMcTCjqhIckKb/ULxD aIxIDA3I+8Hk4NGw73UEYZxT9sQzn5bG1uboiOwuCxL8Lavik2YpGOUSj9hkauTBP0HI s3DlpVlunUL+JMlOa8u+kUVMEKxFEXQxWqG2VfiMMqfD33RAWtbfQPlzzOayzvvOZjTC P8BQ== X-Gm-Message-State: AOAM533Fc3dLNXqXkBxr2V7SCJS/JcyIvd43FR+Bq6Fw3zXnADWzzfdZ G8PDXUTmBM8XR/CkCacn5AlifwxmjjM= X-Google-Smtp-Source: ABdhPJxqiGOayzeQmBIsP0jguGBRI990NykXICiQ7EwfKieAiP5xtU2mRf3zLWv6RKp3n1izl0/TXw== X-Received: by 2002:a1c:3d05:: with SMTP id k5mr530703wma.151.1604243214776; Sun, 01 Nov 2020 07:06:54 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id z11sm19064160wrr.66.2020.11.01.07.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Nov 2020 07:06:54 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 1 Nov 2020 16:06:19 +0100 Message-Id: <20201101150619.1709959-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201101150619.1709959-1-fontaine.fabrice@gmail.com> References: <20201101150619.1709959-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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: Bernd Kuhls , Eric Le Bihan , "Yann E . MORIN" , Julien Boibessot , Norbert Lange , Fabrice Fontaine , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" abootimg only needs libblkid from util-linux-libs Signed-off-by: Fabrice Fontaine --- package/abootimg/abootimg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)