From patchwork Tue Apr 6 22:47:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D. Olsson" X-Patchwork-Id: 1463044 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::137; helo=smtp4.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=senzilla.io header.i=@senzilla.io header.a=rsa-sha256 header.s=protonmail3 header.b=ERahvKdW; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4FFN2r4t05z9sRK for ; Wed, 7 Apr 2021 08:47:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4A1FC40F96; Tue, 6 Apr 2021 22:47:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lz3qG0e4hK5N; Tue, 6 Apr 2021 22:47:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id DF95F414DE; Tue, 6 Apr 2021 22:47:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 87ED51BF573 for ; Tue, 6 Apr 2021 22:47:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8441440F8B for ; Tue, 6 Apr 2021 22:47:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ggpjt28s5mZy for ; Tue, 6 Apr 2021 22:47:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by smtp4.osuosl.org (Postfix) with ESMTPS id E62BF405A8 for ; Tue, 6 Apr 2021 22:47:24 +0000 (UTC) Date: Tue, 06 Apr 2021 22:47:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=senzilla.io; s=protonmail3; t=1617749241; bh=KBIFx87JDpOZj7UnJbzajPx16Tg4PoMCrDILMZtVQhs=; h=Date:To:From:Cc:Reply-To:Subject:From; b=ERahvKdWBmdrbCuxjwzadGl5KHm6PT/amd6pFmqvMEEoEyiaaeexcx7rvmBz5sgI5 4JHuMa9yYyYTa9mRcaIoUW4S/n0p6+aqYrjYNEFpwQJplKfWDTmsbSpPH9ROlqfD6l XwBRtzYRwF4FEqIs17GuzycfRerM29oUqBGNNX7wBtdzmwoQDLWShk2bcumJVYri2x 0/CZWi1GPAxMCtXsvO/BmGOD/bEojZzJIeYLQ9NikAyqijgihGXRT/91QFMUGuJzZ/ ih/lV69OTacPo4Mb54jnfSUx+rH92rfZERv1HXrvaSO7Jey2j5SUIs3exEo59fep9K EsxnXF19Bvwig== To: buildroot@buildroot.org Message-ID: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/4] package/s6-*: use shared options and cleanup dependencies 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: , From: Dick Olsson via buildroot Reply-To: Dick Olsson Cc: Eric Le Bihan , Dick Olsson Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use shared options provided as variables by each dependency. To enhance code clarity, be explicit of each dependency and remove dependencies that are not hard dependencies. Signed-off-by: Dick Olsson --- package/mdevd/mdevd.mk | 11 +------- package/s6-linux-init/Config.in | 2 -- package/s6-linux-init/s6-linux-init.mk | 14 +++------- package/s6-linux-utils/s6-linux-utils.mk | 11 +------- package/s6-networking/s6-networking.mk | 16 ++++------- .../s6-portable-utils/s6-portable-utils.mk | 11 +------- package/s6-rc/s6-rc.mk | 28 ++++--------------- 7 files changed, 18 insertions(+), 75 deletions(-) diff --git a/package/mdevd/mdevd.mk b/package/mdevd/mdevd.mk index e2924009f5..b2961c9bef 100644 --- a/package/mdevd/mdevd.mk +++ b/package/mdevd/mdevd.mk @@ -11,17 +11,8 @@ MDEVD_LICENSE_FILES = COPYING MDEVD_INSTALL_STAGING = YES MDEVD_DEPENDENCIES = skalibs -MDEVD_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ - $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ - $(SHARED_STATIC_LIBS_OPTS) - define MDEVD_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(MDEVD_CONF_OPTS)) + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(SHARED_SKALIBS_CONF_OPTS)) endef define MDEVD_BUILD_CMDS diff --git a/package/s6-linux-init/Config.in b/package/s6-linux-init/Config.in index b56b861f99..b2858d2958 100644 --- a/package/s6-linux-init/Config.in +++ b/package/s6-linux-init/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_S6_LINUX_INIT bool "s6-linux-init" depends on BR2_USE_MMU # s6 select BR2_PACKAGE_S6 - select BR2_PACKAGE_S6_LINUX_UTILS - select BR2_PACKAGE_S6_PORTABLE_UTILS help s6-linux-init is a set of minimalistic tools to create a s6-based init system, including a /sbin/init binary, on a diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index efd4984085..ff7b9c0dfd 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -8,18 +8,12 @@ S6_LINUX_INIT_VERSION = 1.0.6.1 S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING -S6_LINUX_INIT_DEPENDENCIES = s6 s6-linux-utils s6-portable-utils +S6_LINUX_INIT_DEPENDENCIES = skalibs s6 execline S6_LINUX_INIT_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/execline \ - --with-lib=$(STAGING_DIR)/usr/lib/s6 \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ - $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ - $(SHARED_STATIC_LIBS_OPTS) + $(SHARED_SKALIBS_CONF_OPTS) \ + $(SHARED_EXECLINE_CONF_OPTS) \ + $(SHARED_S6_CONF_OPTS) define S6_LINUX_INIT_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_LINUX_INIT_CONF_OPTS)) diff --git a/package/s6-linux-utils/s6-linux-utils.mk b/package/s6-linux-utils/s6-linux-utils.mk index dcc4f9e4b2..c2f8a7e71f 100644 --- a/package/s6-linux-utils/s6-linux-utils.mk +++ b/package/s6-linux-utils/s6-linux-utils.mk @@ -10,17 +10,8 @@ S6_LINUX_UTILS_LICENSE = ISC S6_LINUX_UTILS_LICENSE_FILES = COPYING S6_LINUX_UTILS_DEPENDENCIES = skalibs -S6_LINUX_UTILS_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ - $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ - $(SHARED_STATIC_LIBS_OPTS) - define S6_LINUX_UTILS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_LINUX_UTILS_CONF_OPTS)) + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(SHARED_SKALIBS_CONF_OPTS)) endef define S6_LINUX_UTILS_BUILD_CMDS diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk index d687c567cd..7f7da1fb71 100644 --- a/package/s6-networking/s6-networking.mk +++ b/package/s6-networking/s6-networking.mk @@ -9,19 +9,13 @@ S6_NETWORKING_SITE = http://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING S6_NETWORKING_INSTALL_STAGING = YES -S6_NETWORKING_DEPENDENCIES = s6-dns s6 +S6_NETWORKING_DEPENDENCIES = skalibs execline s6 s6-dns S6_NETWORKING_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/execline \ - --with-lib=$(STAGING_DIR)/usr/lib/s6 \ - --with-lib=$(STAGING_DIR)/usr/lib/s6-dns \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ - $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ - $(SHARED_STATIC_LIBS_OPTS) + $(SHARED_SKALIBS_CONF_OPTS) \ + $(SHARED_EXECLINE_CONF_OPTS) \ + $(SHARED_S6_CONF_OPTS) \ + $(SHARED_S6_DNS_CONF_OPTS) ifeq ($(BR2_PACKAGE_LIBRESSL),y) S6_NETWORKING_CONF_OPTS += --enable-ssl=libressl diff --git a/package/s6-portable-utils/s6-portable-utils.mk b/package/s6-portable-utils/s6-portable-utils.mk index 9da165b49b..adfcc5d451 100644 --- a/package/s6-portable-utils/s6-portable-utils.mk +++ b/package/s6-portable-utils/s6-portable-utils.mk @@ -10,17 +10,8 @@ S6_PORTABLE_UTILS_LICENSE = ISC S6_PORTABLE_UTILS_LICENSE_FILES = COPYING S6_PORTABLE_UTILS_DEPENDENCIES = skalibs -S6_PORTABLE_UTILS_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ - $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ - $(SHARED_STATIC_LIBS_OPTS) - define S6_PORTABLE_UTILS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_PORTABLE_UTILS_CONF_OPTS)) + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(SHARED_SKALIBS_CONF_OPTS)) endef define S6_PORTABLE_UTILS_BUILD_CMDS diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk index 4e0ef57d7a..5a6ddca8ea 100644 --- a/package/s6-rc/s6-rc.mk +++ b/package/s6-rc/s6-rc.mk @@ -9,18 +9,12 @@ S6_RC_SITE = http://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING S6_RC_INSTALL_STAGING = YES -S6_RC_DEPENDENCIES = s6 +S6_RC_DEPENDENCIES = skalibs s6 execline S6_RC_CONF_OPTS = \ - --prefix=/usr \ - --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ - --with-include=$(STAGING_DIR)/usr/include \ - --with-dynlib=$(STAGING_DIR)/usr/lib \ - --with-lib=$(STAGING_DIR)/usr/lib/execline \ - --with-lib=$(STAGING_DIR)/usr/lib/s6 \ - --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ - $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ - $(SHARED_STATIC_LIBS_OPTS) + $(SHARED_SKALIBS_CONF_OPTS) \ + $(SHARED_EXECLINE_CONF_OPTS) \ + $(SHARED_S6_CONF_OPTS) define S6_RC_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_RC_CONF_OPTS)) @@ -44,20 +38,10 @@ define S6_RC_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef -HOST_S6_RC_DEPENDENCIES = host-s6 - -HOST_S6_RC_CONF_OPTS = \ - --prefix=$(HOST_DIR) \ - --libexecdir=/usr/libexec \ - --with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \ - --with-include=$(HOST_DIR)/include \ - --with-dynlib=$(HOST_DIR)/lib \ - --disable-static \ - --enable-shared \ - --disable-allstatic +HOST_S6_RC_DEPENDENCIES = host-skalibs host-s6 host-execline define HOST_S6_RC_CONFIGURE_CMDS - (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(HOST_S6_RC_CONF_OPTS)) + (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(SHARED_HOST_SKALIBS_CONF_OPTS)) endef define HOST_S6_RC_BUILD_CMDS