From a4eb5cd9d3affd5beb5ac4f9daf3004aaa9416b4 Mon Sep 17 00:00:00 2001 From: Nishant Parekh Date: Wed, 23 Aug 2023 10:14:32 -0400 Subject: [PATCH] Keep changes local to Dockerfile to enable upstream builds while maintaining downstream - move rpms from vendor to their own rpms directory - add symlinks to match code references - This reverts commit 17f2019f8bf1cee40888c6b589c58d7f8035c7f6. --- pkg/daemon/daemon/gpsd.go | 2 +- pkg/daemon/daemon/gpspipe.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/daemon/daemon/gpsd.go b/pkg/daemon/daemon/gpsd.go index 1a25362ae..e6ff7aa85 100644 --- a/pkg/daemon/daemon/gpsd.go +++ b/pkg/daemon/daemon/gpsd.go @@ -131,7 +131,7 @@ func (g *GPSD) CmdInit() { if g.name == "" { g.name = GPSD_PROCESSNAME } - g.cmdLine = fmt.Sprintf("/usr/sbin/%s -p -n -S 2947 -G -N %s", g.Name(), g.SerialPort()) + g.cmdLine = fmt.Sprintf("/usr/local/sbin/%s -p -n -S 2947 -G -N %s", g.Name(), g.SerialPort()) } // CmdRun ... run GPSD diff --git a/pkg/daemon/daemon/gpspipe.go b/pkg/daemon/daemon/gpspipe.go index b414cba10..8fec81514 100644 --- a/pkg/daemon/daemon/gpspipe.go +++ b/pkg/daemon/daemon/gpspipe.go @@ -89,7 +89,7 @@ func (gp *gpspipe) CmdInit() { if gp.name == "" { gp.name = GPSPIPE_PROCESSNAME } - gp.cmdLine = fmt.Sprintf("/usr/bin/gpspipe -v -d -r -l -o %s", gp.SerialPort()) + gp.cmdLine = fmt.Sprintf("/usr/local/bin/gpspipe -v -d -r -l -o %s", gp.SerialPort()) } // CmdRun ... run gpspipe