update to 1.1
This commit is contained in:
parent
5b06ba0aae
commit
a0a989fbc5
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
/linuxptp-20120920git6ce135.tar.gz
|
/linuxptp-20120920git6ce135.tar.gz
|
||||||
/linuxptp-20121109git4e8107.tar.gz
|
/linuxptp-20121109git4e8107.tar.gz
|
||||||
/linuxptp-1.0.tgz
|
/linuxptp-1.0.tgz
|
||||||
|
/linuxptp-1.1.tgz
|
||||||
|
19
linuxptp-aliasing.patch
Normal file
19
linuxptp-aliasing.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- a/phc2sys.c
|
||||||
|
+++ b/phc2sys.c
|
||||||
|
@@ -352,12 +352,14 @@ static int is_msg_mgt(struct ptp_message *msg)
|
||||||
|
|
||||||
|
static int get_mgt_id(struct ptp_message *msg)
|
||||||
|
{
|
||||||
|
- return ((struct management_tlv *) msg->management.suffix)->id;
|
||||||
|
+ struct management_tlv *mgt = (struct management_tlv *) msg->management.suffix;
|
||||||
|
+ return mgt->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void *get_mgt_data(struct ptp_message *msg)
|
||||||
|
{
|
||||||
|
- return ((struct management_tlv *) msg->management.suffix)->data;
|
||||||
|
+ struct management_tlv *mgt = (struct management_tlv *) msg->management.suffix;
|
||||||
|
+ return mgt->data;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int run_pmc(int wait_sync, int *utc_offset)
|
@ -1,6 +1,6 @@
|
|||||||
Name: linuxptp
|
Name: linuxptp
|
||||||
Version: 1.0
|
Version: 1.1
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: PTP implementation for Linux
|
Summary: PTP implementation for Linux
|
||||||
|
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -11,6 +11,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
|
|||||||
Source1: phc2sys.service
|
Source1: phc2sys.service
|
||||||
Source2: ptp4l.service
|
Source2: ptp4l.service
|
||||||
|
|
||||||
|
Patch0: linuxptp-aliasing.patch
|
||||||
|
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
|
|
||||||
Requires(post): systemd-units
|
Requires(post): systemd-units
|
||||||
@ -26,6 +28,7 @@ Supporting legacy APIs and other platforms is not a goal.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p 1 -b .aliasing
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} \
|
make %{?_smp_mflags} \
|
||||||
@ -41,7 +44,7 @@ install -m 644 -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}
|
|||||||
|
|
||||||
echo 'OPTIONS="-f /etc/ptp4l.conf -i eth0"' > \
|
echo 'OPTIONS="-f /etc/ptp4l.conf -i eth0"' > \
|
||||||
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ptp4l
|
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ptp4l
|
||||||
echo 'OPTIONS="-d /dev/pps0"' > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/phc2sys
|
echo 'OPTIONS="-w -i eth0"' > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/phc2sys
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%if 0%{?systemd_post:1}
|
%if 0%{?systemd_post:1}
|
||||||
|
Loading…
Reference in New Issue
Block a user