From patchwork Thu Dec 12 07:53:57 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: 1208198 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.133; helo=hemlock.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="ArSaqcnR"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YR076kVLz9sNH for ; Thu, 12 Dec 2019 18:54:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 035D68871E; Thu, 12 Dec 2019 07:54:29 +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 wJe7zdH27pOM; Thu, 12 Dec 2019 07:54:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3E8B08879D; Thu, 12 Dec 2019 07:54:28 +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 200F61BF293 for ; Thu, 12 Dec 2019 07:54:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 14B308878C for ; Thu, 12 Dec 2019 07:54:17 +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 AF99Wfe-A+Ra for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by hemlock.osuosl.org (Postfix) with ESMTPS id B8F8788790 for ; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id z7so1554394wrl.13 for ; Wed, 11 Dec 2019 23:54:12 -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=njCzRZ/SZcXc8U/BngRULODv9CsUMF3HTnshXRsatO8=; b=ArSaqcnR8x7CMnlqSV9B5rPzLH34jwduGOzk8buHGaLjo5km3RE6iZKz3qV41Vbv8d L/WjtrMcfluC93Q6+cO4gnkub+G6PsPhl+HJSJER9mPSG6r3jKwsn8tPR2rFUdDFDQIZ WrArGKX87YX1CyEEWm9Oi+nCmZTdpkWktefxgKBHlZQXcGBoMgsT9bXbDCsvEH07upY5 Iotxbru4XVOflro89z5AwlLGlg8iGJSn3iJlZW+nbIAi+xicd5XC7qli6QvkBnxjkNCz uFs4uT2j8SexL9G5tYkdHZ0A64K7QAp485sB+7uh0SY4ec50uAhgJZV+4MihsvsECgbK sB3A== 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=njCzRZ/SZcXc8U/BngRULODv9CsUMF3HTnshXRsatO8=; b=Ay/g31H1F3cBR1vJ1ccOZlf5G5q+VuuEKaWZchuUNM54ICtWIs+UkrIPhNu7TPtUBw cS2YtvpOwoTmRE/s4OM/Oqz87EF5QcF6bsJvzLOifzOfk2TlWh7xgGJggy7fCixATJ3A 8/fxCpHocyqdmjBUxcg5+TvhdDWtrRkF09g95pmpSseoF9Z54eIDzV3tDv29ZFuCQ7m6 a/0V/H0CoqSTYIBDOWMLpKKHehBuI4qY+BeMmbGI6nmc55qJ+tr7fwXA0zgn8GBKsojR T4vwnWGTn7unb1yz1nMSk5jxUL0Do4mjfbRMqahJ6wW77Z75bXVvHQlmpWsITxi3IYU4 GJrA== X-Gm-Message-State: APjAAAXd3l+sME1T21hGntacgB9bhZk6O31cP4sT0iVpSw0NWwhlNNUJ B/R6G4cnpo3KWK8JogbLVJnJR3HJtw== X-Google-Smtp-Source: APXvYqxyf7opx1F9Q0u2x42K9cuvCDcwQzPQ4SxZyy2M6h9ln3FpQEG1mersTo1/9zdcu6h410R6gA== X-Received: by 2002:adf:cd0a:: with SMTP id w10mr4486075wrm.107.1576137250931; Wed, 11 Dec 2019 23:54:10 -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 y20sm4909753wmi.25.2019.12.11.23.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:10 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:57 +0100 Message-Id: <20191212075400.1499536-11-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 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 216e517526..f693ff70da 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/system/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 \