From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id 3D9066FFCD for ; Thu, 18 Aug 2016 13:44:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id u7IDi0nv004080; Thu, 18 Aug 2016 14:44:00 +0100 Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 34aR7GDZjKDx; Thu, 18 Aug 2016 14:44:00 +0100 (BST) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id u7IDhvhQ004070 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 18 Aug 2016 14:43:59 +0100 Message-ID: <1471527837.16712.3.camel@linuxfoundation.org> From: Richard Purdie To: openembedded-core Date: Thu, 18 Aug 2016 14:43:57 +0100 X-Mailer: Evolution 3.16.5-1ubuntu3.1 Mime-Version: 1.0 Cc: Joe Slater Subject: [PATCH] systemd-compat-units: Only enable for systemd in DISTRO_FEATURES X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2016 13:44:01 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit This recipe only makes sense when systemd is enabled and otherwise causes world build failures. Signed-off-by: Richard Purdie diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 90811da..f246e83 100644 --- a/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/meta/recipes-core/systemd/systemd-compat-units.bb @@ -9,10 +9,12 @@ DEPENDS = "systemd-systemctl-native" S = "${WORKDIR}" -inherit allarch +inherit allarch distro_features_check ALLOW_EMPTY_${PN} = "1" +REQUIRED_DISTRO_FEATURES = "systemd" + SYSTEMD_DISABLED_SYSV_SERVICES = " \ busybox-udhcpc \ hwclock \