Skip to content

Commit

Permalink
Update package name from telemetry to sonic-telemetry
Browse files Browse the repository at this point in the history
Signed-off-by: Jipan Yang <[email protected]>
  • Loading branch information
jipanyang committed Mar 25, 2018
1 parent b527163 commit c029324
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 37 deletions.
2 changes: 1 addition & 1 deletion rules/docker-telemetry.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DOCKER_TELEMETRY = docker-sonic-telemetry.gz
$(DOCKER_TELEMETRY)_PATH = $(DOCKERS_PATH)/docker-sonic-telemetry
$(DOCKER_TELEMETRY)_DEPENDS += $(REDIS_TOOLS) $(TELEMETRY)
$(DOCKER_TELEMETRY)_DEPENDS += $(REDIS_TOOLS) $(SONIC_TELEMETRY)
$(DOCKER_TELEMETRY)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY)
ifeq ($(ENABLE_SYSTEM_TELEMETRY), y)
Expand Down
8 changes: 4 additions & 4 deletions rules/telemetry.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# telemetry package
# SONiC telemetry package

TELEMETRY = telemetry_0.1_amd64.deb
$(TELEMETRY)_SRC_PATH = $(SRC_PATH)/telemetry
SONIC_DPKG_DEBS += $(TELEMETRY)
SONIC_TELEMETRY = sonic-telemetry_0.1_amd64.deb
$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/telemetry
SONIC_DPKG_DEBS += $(SONIC_TELEMETRY)
8 changes: 4 additions & 4 deletions src/telemetry/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ export GOPATH=/tmp/go

INSTALL := /usr/bin/install

all: telemetry
all: sonic-telemetry

telemetry:
/usr/local/go/bin/go get -v github.com/jipanyang/sonic-telemetry/telemetry
/usr/local/go/bin/go get -v github.com/jipanyang/sonic-telemetry/dialout/dialout_client_cli
sonic-telemetry:
/usr/local/go/bin/go get -v github.com/Azure/sonic-telemetry/telemetry
/usr/local/go/bin/go get -v github.com/Azure/sonic-telemetry/dialout/dialout_client_cli

install:
$(INSTALL) -D ${GOPATH}/bin/telemetry $(DESTDIR)/usr/sbin/telemetry
Expand Down
4 changes: 2 additions & 2 deletions src/telemetry/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
telemetry (0.1) UNRELEASED; urgency=low
sonic-telemetry (0.1) UNRELEASED; urgency=medium

* Initial release.

-- Jipan Yang <[email protected]> Thu, 18 Jan 2018 15:45:03 -0800
-- Jipan Yang <[email protected]> Sat, 24 Mar 2018 12:48:22 -0700
21 changes: 13 additions & 8 deletions src/telemetry/debian/control
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
Source: telemetry
Source: sonic-telemetry
Section: devel
Priority: optional
Maintainer: Jipan Yang <[email protected]>
Build-Depends: debhelper (>= 8.0.0),
dh-systemd
Standards-Version: 0.0.1
Section: net
Standards-Version: 3.9.3
Homepage: https://github.com/Azure/sonic-telemetry
XS-Go-Import-Path: github.com/Azure/sonic-telemetry

Package: telemetry
Priority: extra
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: telemetry daemon
Package: sonic-telemetry
Architecture: any
Built-Using: ${misc:Built-Using}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: SONiC telemetry
sonic-telemetry
1 change: 0 additions & 1 deletion src/telemetry/debian/files

This file was deleted.

1 change: 0 additions & 1 deletion src/telemetry/debian/telemetry.dirs

This file was deleted.

4 changes: 2 additions & 2 deletions src/telemetry/debian/telemetry.init.d
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash
#
### BEGIN INIT INFO
# Provides: telemetry
# Provides: sonic-telemetry
# Required-Start: $local_fs $network $remote_fs $syslog
# Required-Stop: $local_fs $network $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: start and stop the telemetry
# Description: telemetry is an implementation of telemetry daemon in Go
# Description: sonic-telemetry is an implementation of sonic telemetry daemon in Go
### END INIT INFO
#

Expand Down
14 changes: 0 additions & 14 deletions src/telemetry/debian/telemetry.service

This file was deleted.

0 comments on commit c029324

Please sign in to comment.