linuxptp: Fix race between linuxptp and ntp
When running the build-image commmand linuxptp gets installed first which satisfy the time-daemon virtual dependency before ntp gets installed. As a result the ISO build will fail because of the conflicted linuxptp package. Test Plan Pass: build test Pass: install image Pass: boot up on qemu Story: 2009221 Task: 44053 Signed-off-by: Charles Short <charles.short@windriver.com> Change-Id: Id18aa5fb23d0fb8a5aa3582aed711dbed1339075
This commit is contained in:
parent
c466472ed3
commit
8b536d2757
@ -0,0 +1,28 @@
|
|||||||
|
From d202b10ee8ca606682bd83b8206a9483537c0f45 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Charles Short <charles.short@windriver.com>
|
||||||
|
Date: Sun, 30 Jan 2022 01:47:52 +0000
|
||||||
|
Subject: [PATCH] Remove time-daemon conflict
|
||||||
|
|
||||||
|
Remove the virtual dependency for linuxptp so it does not conflict
|
||||||
|
with ntp.
|
||||||
|
|
||||||
|
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||||
|
---
|
||||||
|
debian/control | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/debian/control b/debian/control
|
||||||
|
index 0715b74..9ffbdb4 100644
|
||||||
|
--- a/debian/control
|
||||||
|
+++ b/debian/control
|
||||||
|
@@ -14,7 +14,6 @@ Vcs-Browser: https://salsa.debian.org/multimedia-team/linuxptp
|
||||||
|
Package: linuxptp
|
||||||
|
Architecture: linux-any
|
||||||
|
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||||
|
-Provides: time-daemon
|
||||||
|
Description: Precision Time Protocol (PTP, IEEE1588) implementation for Linux
|
||||||
|
Linuxptp is an implementation of the Precision Time Protocol (PTP)
|
||||||
|
according to IEEE standard 1588 for Linux. Features include:
|
||||||
|
--
|
||||||
|
2.32.0
|
||||||
|
|
1
base/linuxptp/debian/deb_patches/series
Normal file
1
base/linuxptp/debian/deb_patches/series
Normal file
@ -0,0 +1 @@
|
|||||||
|
0001-Remove-time-daemon-conflict.patch
|
Loading…
x
Reference in New Issue
Block a user