From patchwork Sun Nov 3 16:56:34 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: 1188590 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="UEH5mj2l"; 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 475htP4PPXz9sP3 for ; Mon, 4 Nov 2019 03:57:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 947F18A1AE; Sun, 3 Nov 2019 16:57:14 +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 QDTBurAMPUf3; Sun, 3 Nov 2019 16:57:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DF49388D97; Sun, 3 Nov 2019 16:57:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9F4DD1BF398 for ; Sun, 3 Nov 2019 16:57:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C78B8A485 for ; Sun, 3 Nov 2019 16:57:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CrUJB7RtlzJD for ; Sun, 3 Nov 2019 16:57:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id B3E208A47B for ; Sun, 3 Nov 2019 16:57:05 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id q70so14189548wme.1 for ; Sun, 03 Nov 2019 08:57:05 -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=ET3qEMOgcH9AIchqnxvTR61f6zaV8BQRmX5mEiQZ1kA=; b=UEH5mj2lLEfY+A1W8/N+62Jmt8dk8rOEy39UceIRosNbWJr7oZHWp3s0ETVvmZ5th2 TLkcOZ8QScMFH72TQjx8MWDq5G8cf/jkHpxeIv02BSlzMwYXzqbh4REqL8idJf5N+7jo oQB6cMDaalNp4YoRzpl9WRyHMUQxMR/4OTgdCRvJfSIcqRhmeOsg9hSunks3plSp+7ui HBBGTZB7tvPKyfF1TQdRYSG8vfE4rB6nAvvzkaNnoKuwcH60lMFWTSL2j+Ym9zypPB8y vZw3t6GjoMMY7GmgYLX04IoVqbmOQmz/ChZkP4OFe1SXH6cTVfe5qZtdJdHNBrmZuXuB fcPg== 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=ET3qEMOgcH9AIchqnxvTR61f6zaV8BQRmX5mEiQZ1kA=; b=nNF9CkwyfqtgLd/Ndl/8eRL+8jaN0tWr5Yk0rOJOCJo8RgRlTUEAL008HPE1TbyJTA PGF25HeLMohPJTiDN0MCggauq0O/cC/XmoCopssLttSQaO2nMOon+lKzR/JQKE32mGy/ hLE0x25UbTRnM7wC14r4NbSbGKrZ4ujbrrmXrDeUt5cjZla1t4CebK/VfiIt3OwwfZUc HZ/99jh9+ODw7KHjoaya/EdxOSji+JED1QizFiFiNy1yWoMhg2nq2MOkia0nNHGn6mJF SNffH4RIf5UFAQkRz9yPpjJZwQuzed8nSlKBI11xLeSVOrrBNM1bDUENJaylmND3O8F0 drVg== X-Gm-Message-State: APjAAAV5N41jR172itrOHkwOuog8yRRq65B2LKB8JA3lb0QX/tzOlGSN U17ZDjfI+xvNRWr8i4viBcYsKGsBTw== X-Google-Smtp-Source: APXvYqwvTnHVxKY+0SoufVqEY1nnwQKR2CHJMrdFUszhs9HMoi2hd/Ds11ENviS8ao2ABMtTzUmpWg== X-Received: by 2002:a1c:a943:: with SMTP id s64mr19412682wme.170.1572800223747; Sun, 03 Nov 2019 08:57:03 -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.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:03 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:34 +0100 Message-Id: <20191103165640.21819-10-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 09/15] package/linuxptp adapt to 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" linuxptp has two services * linuxptp.service : the actual daemon * linuxptp-system-clock.service : sync the linux clock to the phc clock The first was enabled, the second was not The second has an incorrect (though harmless) WantedBy : there is an explicit Wants= in linuxptp.service This keeps the compatibility, but I don't see the poit of not enabling the second service. Signed-off-by: Jérémy Rosen --- package/linuxptp/50-linuxptp.preset | 1 + package/linuxptp/linuxptp-system-clock.service | 1 - package/linuxptp/linuxptp.mk | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 package/linuxptp/50-linuxptp.preset diff --git a/package/linuxptp/50-linuxptp.preset b/package/linuxptp/50-linuxptp.preset new file mode 100644 index 0000000000..dd8dbb12d5 --- /dev/null +++ b/package/linuxptp/50-linuxptp.preset @@ -0,0 +1 @@ +disable linuxptp-system-clock.service diff --git a/package/linuxptp/linuxptp-system-clock.service b/package/linuxptp/linuxptp-system-clock.service index a4436a34a7..57beec4579 100644 --- a/package/linuxptp/linuxptp-system-clock.service +++ b/package/linuxptp/linuxptp-system-clock.service @@ -8,4 +8,3 @@ Restart=always [Install] WantedBy=multi-user.target -WantedBy=linuxptp.service diff --git a/package/linuxptp/linuxptp.mk b/package/linuxptp/linuxptp.mk index c304ff6d6e..5b55322b0b 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -42,9 +42,8 @@ define LINUXPTP_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/linuxptp.service $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp-system-clock.service \ $(TARGET_DIR)/usr/lib/systemd/system/linuxptp-system-clock.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/linuxptp.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/linuxptp.service + $(INSTALL) -D -m 644 package/linuxptp/50-linuxptp.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-linuxptp.preset endef $(eval $(generic-package))