From patchwork Sat Dec 7 18:00:46 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: 1205503 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="HzFJHB3X"; 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 47Vchg4FSbz9sNx for ; Sun, 8 Dec 2019 05:01:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 05E2B86D33; Sat, 7 Dec 2019 18:01:14 +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 RWqNBI4c9eOu; Sat, 7 Dec 2019 18:01:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 70CAF870CF; Sat, 7 Dec 2019 18:01:13 +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 5E5051BF3BE for ; Sat, 7 Dec 2019 18:01:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 59300870EB for ; Sat, 7 Dec 2019 18:01: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 tzxkeV6k6H0k for ; Sat, 7 Dec 2019 18:01:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 08F8186DF7 for ; Sat, 7 Dec 2019 18:01:03 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id p9so11203181wmg.0 for ; Sat, 07 Dec 2019 10:01:02 -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=lXMbEy6CocOUxuPaytWbZuZ2rG3eerU3vqyxpGNU/Wk=; b=HzFJHB3XHDCbc/fkPx3yIfrXa6dyvognKyJWk7BXvyLa1jhKaNABK2Ews6El/nKcGw 3bsrTohVT5D6P6Y1NgZNGQ1TkqaCtf8xTK32iJ4hUln7Vq2LAyw41UM85ngI0/yW6nH5 UTIaFp67cNTk041zQj524Fd1lJE2b89KaigxAkMLZ6FXMuzMKhkPwiwesSVw2vz56zsA Yda5HQNyfWCE+suSQtp0yGJrLl25TRWGtHkZ4cG/bsb0GQVzWjWxGhgj/vrBjMhgGYHU I0LjuxwxgVZpdiyHNIKS4I0rskhpsMt7OcAxlN0FZZlmGOYTHba+pAREqFjk4nGHkn70 4pxg== 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=lXMbEy6CocOUxuPaytWbZuZ2rG3eerU3vqyxpGNU/Wk=; b=Nq/2dZaUraDQ2cIktZxf1v5dGYNI62q3yN/65USpMlaPicyVFpxlIkvtFT2WihYy27 2z3k3WWOh17DmiQIxWIfHZ6kzNdN+m+3VncdK+tmT87AdIlydeZS1JYHlz3/+W1o+E2S IedMJyFI6jqKJJj2LYYuHmLCDSBliOmmg1//x/4jlkr83qH2x95TqnaZAMvwVRfw4ZEC Ll1kFRCvLdJFwdgIUjN+duUQZvIgFIvJmx4hs43N1sfLabumlPFrs50D+SQb1/bpYlUR 4uy4F2m+BtmbkMwNqv/Yj/njpEURX/KXuHG6UzIl0WSOYh/U8HV0sNfs5mCDdhA5oP49 HsNg== X-Gm-Message-State: APjAAAWSJ8uwzox1fS8EJjXo0ThHhVonJgoSfVsLgF0JYWjND+kixhpA 1rPDKLqiULjHdYbOz5pG+kU8YcjnDA== X-Google-Smtp-Source: APXvYqz101jQnpV8iD/F7nDPJKlX6iDVqEn4z0c3MCv1KX56dd5scZwW0PLYOR7vuCxLhO1jNmsA9g== X-Received: by 2002:a1c:3941:: with SMTP id g62mr16092022wma.165.1575741661333; Sat, 07 Dec 2019 10:01:01 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id z4sm7558964wme.17.2019.12.07.10.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Dec 2019 10:01:00 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sat, 7 Dec 2019 19:00:46 +0100 Message-Id: <20191207180049.3245578-11-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191207180049.3245578-1-jeremy.rosen@smile.fr> References: <20191207180049.3245578-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 10/13] package/sysrepo: update to new 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" sysrepo provides it's own services so just remove the section Also fix sysrepo not installing the files in the correct directory Signed-off-by: Jérémy Rosen --- package/sysrepo/sysrepo.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 8676158a19..c9c9ad2ddc 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -24,7 +24,7 @@ SYSREPO_CONF_OPTS = \ -DCALL_SYSREPOCFG_BIN=$(HOST_DIR)/bin/sysrepocfg \ -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ $(if $(BR2_INIT_SYSTEMD),-DWITH_SYSTEMD=ON) \ - $(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=usr/lib/systemd/system) + $(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=/usr/lib/systemd/system) # On ARM, this is needed to prevent unaligned memory access with an optimized # build .. https://github.com/sysrepo/sysrepo/issues/947 @@ -41,14 +41,6 @@ define SYSREPO_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S51sysrepo-plugind endef -define SYSREPO_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/systemd/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sysrepod.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sysrepo-plugind.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants -endef - HOST_SYSREPO_CONF_OPTS = \ -DGEN_PYTHON2_TESTS=OFF \ -DENABLE_TESTS=OFF \