From patchwork Wed May 20 05:16:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1293978 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=hGzCaUlO; 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 49Rh053vxsz9sT8 for ; Wed, 20 May 2020 15:20:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AFB4788076; Wed, 20 May 2020 05:19:59 +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 qA88xWh4hbVj; Wed, 20 May 2020 05:19:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 98CEF87FD2; Wed, 20 May 2020 05:19:56 +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 00F471BF4D6 for ; Wed, 20 May 2020 05:19:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F084A8758C for ; Wed, 20 May 2020 05:19:54 +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 4CIrK0LNzFJi for ; Wed, 20 May 2020 05:19:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 32DD587580 for ; Wed, 20 May 2020 05:19:54 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id k13so1775103wrx.3 for ; Tue, 19 May 2020 22:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Lc92GUuB2QbKk3PVu8+cbRc4xL9qsbz6/V0wMuVmXwg=; b=hGzCaUlOVLJmKiim5v/5QSR+Req9pqPnjjTOCKlveEe1CagU0hwwSPlfXh3GI7ITGi VeSQijS15lVVyGFLHnsSFfm+vl9jg4FoQOYgdo36MwHCAuXvHzqKvp4QnzwelDNuidxL RajGpkunCMcJd1rZvhb3s9WkVbeFBwxEaHrtpmJxIyUMw6wSqV+x5tIuafV07kcHHzUe uB5Qf9detIBnMzZB1FvCzCLacGVbOkQka14BFQbDk88RfnVlXKzxaijfVWug9xcpoCCO tUbtnrr+xe4dN9oaSDkqwa9EE6fFTd1Okeidf9bL+zm8ISQSORScCQuwFn683rzt7Zvw bkBw== 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:mime-version :content-transfer-encoding; bh=Lc92GUuB2QbKk3PVu8+cbRc4xL9qsbz6/V0wMuVmXwg=; b=DgeOu+7K9aM+i8HqkTHpYH1SpfykSuDmsNOb4HhHu6XLkCN2xtRPiBrOEMt5FrxTHi +mosFjTJfv8dbai8/7F1w2+irUlEgjn/lVaVM8AYRB8wuYGCZqVP3cuuIEKqP4t9XIeq Pxqf+l5xH2yBACiCuV/HxJu4upMlgtOCKlqJg326uaFynPNhz3u75aB7UIjNmFlC05Vd MMJ4vB4qcESniUelJt1M5mnZlnsvchk+Pn332Qyf0r02iANlJprFOxlyQWwQsnvoQQ5B A1LYJEsE/N2orQ60kiAPeSM5nVsiFqRBxbXLc8GXLcJYxAe/Mj8m5WaOpNS6yRvZW36Q Z0Dg== X-Gm-Message-State: AOAM531G+6sc8jp2v69r6Q9rVRnSD2EM2hHgCBvgS4ciGVNxGy2DlBTZ viP8/XfUGKY0Fco5UHcsAA0qYd/Y X-Google-Smtp-Source: ABdhPJy7/ooI2z2tuGusDP4Q9CsVkl1BwLe9LtE/FvbcRz9qLpcOJYnim8ecispeuCB/bND9Q2/LVA== X-Received: by 2002:adf:f48b:: with SMTP id l11mr2316051wro.312.1589951992410; Tue, 19 May 2020 22:19:52 -0700 (PDT) Received: from t450s.fritz.box (ip5b426f84.dynamic.kabel-deutschland.de. [91.66.111.132]) by smtp.gmail.com with ESMTPSA id s15sm1598228wro.80.2020.05.19.22.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 22:19:51 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Wed, 20 May 2020 07:16:48 +0200 Message-Id: <20200520051647.18530-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/linuxptp: remove hardcoded interface from config to args 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: Heiko Thiery , Michael Walle , Petr Kulhavy Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Interface configuration is hard coded in the config file. This will throw an error when this interace (eth0) is not present. This patch removes the interface to be used from the config and appends it to the PTP4L_ARGS. With this the custom arguments can be set via /etc/defaults/ptp4l. Cc: Michael Walle Signed-off-by: Heiko Thiery Reviewed-by: Michael Walle --- package/linuxptp/S65ptp4l | 2 +- package/linuxptp/linuxptp.cfg | 2 -- package/linuxptp/ptp4l.service | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/linuxptp/S65ptp4l b/package/linuxptp/S65ptp4l index 1b9e3c9300..f888c1026c 100644 --- a/package/linuxptp/S65ptp4l +++ b/package/linuxptp/S65ptp4l @@ -7,7 +7,7 @@ DAEMON="ptp4l" PIDFILE="/var/run/$DAEMON.pid" -PTP4L_ARGS="-f /etc/linuxptp.cfg" +PTP4L_ARGS="-f /etc/linuxptp.cfg -i eth0" # shellcheck source=/dev/null [ -r "/etc/default/ptp4l" ] && . "/etc/default/ptp4l" diff --git a/package/linuxptp/linuxptp.cfg b/package/linuxptp/linuxptp.cfg index f9d02e8d97..376fc85ac7 100644 --- a/package/linuxptp/linuxptp.cfg +++ b/package/linuxptp/linuxptp.cfg @@ -15,5 +15,3 @@ delay_mechanism Auto network_transport UDPv4 time_stamping hardware step_threshold 1.0 - -[eth0] diff --git a/package/linuxptp/ptp4l.service b/package/linuxptp/ptp4l.service index 07f0b68fad..fb39ee3d94 100644 --- a/package/linuxptp/ptp4l.service +++ b/package/linuxptp/ptp4l.service @@ -6,7 +6,7 @@ Wants=time-sync.target Wants=phc2sys.service [Service] -ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp.cfg +ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp.cfg -i eth0 Restart=always [Install]