From patchwork Sun Nov 3 16:56:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsOpbXkgUk9TRU4=?= X-Patchwork-Id: 1188582 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=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="wVL4PAAR"; 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 475ht66sBMz9sP3 for ; Mon, 4 Nov 2019 03:57:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1EA1F8968F; Sun, 3 Nov 2019 16:57:00 +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 m8raz6RSRswj; Sun, 3 Nov 2019 16:56:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 128E88968A; Sun, 3 Nov 2019 16:56:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 959041BF398 for ; Sun, 3 Nov 2019 16:56:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 928738788B for ; Sun, 3 Nov 2019 16:56:58 +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 rTQ9Wh+J2nqZ for ; Sun, 3 Nov 2019 16:56:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id 05FA287829 for ; Sun, 3 Nov 2019 16:56:57 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id z19so9491119wmk.3 for ; Sun, 03 Nov 2019 08:56:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OthcikRWjL7TriYeDhlkXr81QaPHvnkV0rXJiqyF/gQ=; b=wVL4PAARODseW7Bvzzvse45tiGZx1kkoFj0emVBsPIwU07jRDJjE2cgpFBTnUP7o+a PKKz2Jir3ACjbh35etVtTeHX3GfhN7RvFONAqw88k+aGxqWII7lcGlvP+E6Z3CLrNJD+ s1wK5oNW4uWgdWp3oR7HSADWEY8v6HovKrZjTSM6eT9ztPcenxQWnO8kwjfyfhiONwB2 +UE9mK6l1fZz4jvrx2DvBVj/Lg9k4NN3Wc7gcnZR20FXnM8/39b99kTOjVqD7d9lexFF 71W8iWBHlvgAhNMKzov4LagxmTOfjuYAMDeT32NsFsAhw4Dh3Mwi/FcXWeVUBFLoHUfR uzKw== 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=OthcikRWjL7TriYeDhlkXr81QaPHvnkV0rXJiqyF/gQ=; b=aa/JOfLH+/f0Mi2gpLQs6xN6ioq0qTIZqozXCF9uRKBqtd5UH2PvGZgysfQoHLygHT DMgkvkjCXRFQAIh6HXekimiZK1R5gkB/iPx32fPX+2Jako2gZZYRgU1vTZQIRZfiqXVp MxgHFmtLt2QTsLkSRwO1qJV6YNWAql8phNML8CKshfNyHlAmYUyxdFdOqAowZ1y2tHIu sxzRGk9AFnOWgK+7lBo6/kRrvHL1JhqZIxfOwn0NGTJ8P/2pPJZEBRVCBsu2Q2hSMS3t PgI384+gyK6Lf8wiFwSO5hjIeQpvYaNIhiJrGWp4VMxUEby0Q2QQm7Tszco10Sk5rBjW ZWzw== X-Gm-Message-State: APjAAAWNpme+qITf7mTCtkHceCdiDcSU4LEyLv2aXZ4acK2Rmll3LNbL tzvl27mOP015qib/EI8vUoWxVfVtRQ== X-Google-Smtp-Source: APXvYqyrMV5gpGJzJpUpiwz3cNL1lLVn1ZXhfWQ+U953pZaXdDljAHPzOVy+/QKL7FUnTqNlhfnVaA== X-Received: by 2002:a1c:e40b:: with SMTP id b11mr19294316wmh.152.1572800215259; Sun, 03 Nov 2019 08:56:55 -0800 (PST) Received: from localhost.localdomain (221.86.207.77.rev.sfr.net. [77.207.86.221]) by smtp.googlemail.com with ESMTPSA id 14sm1850430wrc.65.2019.11.03.08.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:56:54 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:26 +0100 Message-Id: <20191103165640.21819-2-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0.rc1 In-Reply-To: <20191103165640.21819-1-jeremy.rosen@smile.fr> References: <20191103165640.21819-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 01/15] new recipe : host-systemd 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: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add the infrastructure to build the host version of systemd * disable all optional features, they can be re-added when needed * systemd has creative way of dealing with cross compile we build a "normal" host systemd, but install it in $HOST_DIR we use systemctl --root to correctly act on TARGET_DIR * we need to adjust RPATH using patchelf because meson can't do it correctly by itsel Signed-off-by: Jérémy Rosen --- package/Config.in.host | 1 + package/systemd/Config.in.host | 4 ++ package/systemd/systemd.mk | 92 ++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 package/systemd/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index c0ac4fbbcc..d4e31ade2d 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,6 +69,7 @@ menu "Host utilities" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" + source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" source "package/ti-cgt-pru/Config.in.host" source "package/uboot-tools/Config.in.host" diff --git a/package/systemd/Config.in.host b/package/systemd/Config.in.host new file mode 100644 index 0000000000..09099752d2 --- /dev/null +++ b/package/systemd/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_SYSTEMD + bool "host systemd tools" + help + Systemd command-line tools for the host diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 94d5f703cd..1e4f706517 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -550,3 +550,95 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) $(eval $(meson-package)) + + + +# +# Host-systemd configuration +# +HOST_SYSTEMD_CONF_OPTS= \ + -Dsplit-bin=true \ + -Dsplit-usr=false \ + -Dutmp=false \ + -Dhibernate=false \ + -Dldconfig=false \ + -Dresolve=false \ + -Defi=false \ + -Dtpm=false \ + -Denvironment-d=false \ + -Dbinfmt=false \ + -Dcoredump=false \ + -Dpstore=false \ + -Dlogind=false \ + -Dhostnamed=false \ + -Dlocaled=false \ + -Dmachined=false \ + -Dportabled=false \ + -Dnetworkd=false \ + -Dtimedated=false \ + -Dtimesyncd=false \ + -Dremote=false \ + -Dcreate-log-dirs=false \ + -Dnss-myhostname=false \ + -Dnss-mymachines=false \ + -Dnss-resolve=false \ + -Dnss-systemd=false \ + -Dfirstboot=false \ + -Drandomseed=false \ + -Dbacklight=false \ + -Dvconsole=false \ + -Dquotacheck=false \ + -Dsysusers=false \ + -Dtmpfiles=false \ + -Dimportd=false \ + -Dhwdb=false \ + -Drfkill=false \ + -Dman=false \ + -Dhtml=false \ + -Dsmack=false \ + -Dpolkit=false \ + -Dblkid=false \ + -Didn=false \ + -Dadm-group=false \ + -Dwheel-group=false \ + -Dzlib=false \ + -Dgshadow=false \ + -Dima=false \ + -Dtests=false \ + -Dglib=false \ + -Dacl=false \ + -Dsysvinit-path='' \ + --prefix=/usr \ + --libdir=lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + + +HOST_SYSTEMD_DEPENDENCIES = \ + host-util-linux \ + host-patchelf \ + host-libcap \ + host-gperf \ + +# Fix RPATH After installation +# * systemd provides a install_rpath instruction to meson because the binaries need to link with +# libsystemd which is not in a standard path +# * meson can only replace the RPATH, not append to it +# * the original rpatch is thus lost. +# * the original path had been tweaked by buildroot vial LD_FLAGS to add $(HOST_DIR)/lib +# * thus re-tweak rpath after the installation for all binaries that need it +#buildroot detects incorrect RPATH, so adding new binaries should be safe (it won't compile +#unless properly integrated). +HOST_SYSTEMD_HOST_TOOLS = \ + systemd-analyze systemd-mount systemctl + +define HOST_SYSTEMD_FIX_RPATH + $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f) + ) +endef + +HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) + +$(eval $(host-meson-package))