From patchwork Mon Dec 16 10:30:49 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: 1210223 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.136; helo=silver.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="uyqOriPq"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47byHJ318Rz9sPK for ; Mon, 16 Dec 2019 21:31:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 28A7720531; Mon, 16 Dec 2019 10:31:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D3qW2-gyBoh5; Mon, 16 Dec 2019 10:31:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2D61E204CC; Mon, 16 Dec 2019 10:31:20 +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 ED94B1BF2B5 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EA897854DF for ; Mon, 16 Dec 2019 10:31: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 BVN3t1aP2XM5 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 33B0785660 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y17so6583151wrh.5 for ; Mon, 16 Dec 2019 02:31:09 -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=uyqOriPqe9AF5f9qFQr/zXYfG0nQsiLMjRaJj3t459VGA34RGgSNIW+2Z6qCMiyr2m lBJoosrQT0FYJqL0P+lc+m2jOzDtuRAYH4nsz3RPTKFOASHhKBVTqQM1E/AzCoFweyhw xw4nevNC/9s0PgKWYA56AcAiZRJxd377pvzea0xLEyRu8/fAcCREb26/cBq9jyuMrAd2 ag8mZpvhqMhCgYfidP3RSFv50mhBU5vh/HPvWoBr+cNvrynAlIvSY8zrkkUoNoat0rnK EoJtoPRfRak/Sa1VRXxD4FDCj3Z7IaA+7jvSAJ8XNwHVCrsW3GjkkrBlMOjD5NekemK8 xa7A== 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=Rch+MlP0xmsQz4WJ0l2FokeiF6dJc1HS2UoICEuZGK63oMtZqJCQ0dRjAULJNPYrkT p/CqaMc4zJ95avpU3jyxL9Kmi9eg74faCEVdCLnuGz1AaDxDOKmT7qhT7YHBDthONY6j eYehE3/NvfbgGaVv6veFFbJ3wxXCISkUhdlZIdyEneqvG+qLc8BSS+MKotYjn9RyXYl8 CITK5+SWUqgew5/M+pnK766fodKyosiuj6/VHYeg8yHhoaV5IlXOwSBm/KZB4Efw1OKO J3ILdgmf+0m2G0CH902EJ7hcHt0TNX6CqUJzsVA1YTaHLBiDsG6q1YomHb/lfUjvBeep Ntxw== X-Gm-Message-State: APjAAAVirMx/F/c3KOPQ3wx4zW3WclISBq7BAGwbKEQjJs7WAlVRRvJ4 dNo6LC83+f2Vi6HGX3mK0Hcv9k1ZuA== X-Google-Smtp-Source: APXvYqw0rI9RrAOO97weALNOX2c0BtmJG3CiyFqaLmdiUQnPTie7cJepciofa25xf3IL6TGiB9/6CA== X-Received: by 2002:adf:fe4d:: with SMTP id m13mr26897516wrs.179.1576492267427; Mon, 16 Dec 2019 02:31:07 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:06 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:49 +0100 Message-Id: <20191216103052.35220-11-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 10/13] package/sysrepo: adapt to systemctl preset-all 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 \