From efc6a15fa4ac1fbc1f0bf0b9f9921000ec171fab Mon Sep 17 00:00:00 2001 From: Douglas Henrique Koerich Date: Wed, 25 May 2022 15:30:38 -0300 Subject: [PATCH] Debian: Update linuxptp package to 3.1.1-4 This change updates the linuxptp package to tag 3.1.1-4, the closest to CentOS version currently available for Debian. With this update, no deb_patches are necessary anymore since the same revert was performed upstream (see https://salsa.debian.org/multimedia-team/linuxptp/-/commit/051d5f683305076c1fd3837e6464d90798472aef#9c96da0e9f91d7d8937b69b524702c106258f0d1_1_4 ). Test Plan: PASS: Fresh install of Debian build and checked the correct version of linuxptp package was installed. Task: 45474 Story: 2009965 Signed-off-by: Douglas Henrique Koerich Change-Id: Iab53525b9b16e7f11c415bf9284872a404eb60b0 --- .../0001-Remove-time-daemon-conflict.patch | 28 ------------------- base/linuxptp/debian/deb_patches/series | 1 - base/linuxptp/debian/meta_data.yaml | 10 +++---- 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 base/linuxptp/debian/deb_patches/0001-Remove-time-daemon-conflict.patch delete mode 100644 base/linuxptp/debian/deb_patches/series diff --git a/base/linuxptp/debian/deb_patches/0001-Remove-time-daemon-conflict.patch b/base/linuxptp/debian/deb_patches/0001-Remove-time-daemon-conflict.patch deleted file mode 100644 index 6df67d70c..000000000 --- a/base/linuxptp/debian/deb_patches/0001-Remove-time-daemon-conflict.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d202b10ee8ca606682bd83b8206a9483537c0f45 Mon Sep 17 00:00:00 2001 -From: Charles Short -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 ---- - 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 - diff --git a/base/linuxptp/debian/deb_patches/series b/base/linuxptp/debian/deb_patches/series deleted file mode 100644 index e5705eb44..000000000 --- a/base/linuxptp/debian/deb_patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Remove-time-daemon-conflict.patch diff --git a/base/linuxptp/debian/meta_data.yaml b/base/linuxptp/debian/meta_data.yaml index 6dc145287..7891ef2d8 100644 --- a/base/linuxptp/debian/meta_data.yaml +++ b/base/linuxptp/debian/meta_data.yaml @@ -1,10 +1,10 @@ --- -debver: 3.1.1-2 +debver: 3.1.1-4 dl_path: - name: linuxptp-debian-3.1.1-2.tar.gz - url: https://salsa.debian.org/multimedia-team/linuxptp/-/archive/debian/3.1.1-2/linuxptp-debian-3.1.1-2.tar.gz - md5sum: 6b8a81cfe8dbb0fd031e892393db0519 - sha256sum: f0600ecac31378dbb4e43fbed2219272a4faa1c99f44aed850dc165a6a30a754 + name: linuxptp-debian-3.1.1-4.tar.gz + url: https://salsa.debian.org/multimedia-team/linuxptp/-/archive/debian/3.1.1-4/linuxptp-debian-3.1.1-4.tar.gz + md5sum: 3000f139cd28b9c81dd367aeb2dc4dea + sha256sum: 4e08871801e71c74d77d027ec54a29a8df577cd3d32055a2d082a2655cf20947 revision: dist: $STX_DIST PKG_GITREVCOUNT: true