Skip to content

Commit

Permalink
[Build]: Support to build in debian bullseye with golang 1.15 (#53)
Browse files Browse the repository at this point in the history
Support to build in debian bullseye, the dh-systemd has removed and merged into debhelper.
Support to build by golang 1.15, fix the int type conversion error.
  • Loading branch information
xumia authored Jan 18, 2022
1 parent eda0ca9 commit d43a607
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stages:
vmImage: ubuntu-20.04

container:
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest

steps:
- checkout: self
Expand All @@ -50,7 +50,7 @@ stages:
sudo service redis-server start
# LIBYANG
sudo dpkg -i ../target/debs/buster/libyang*1.0.73*.deb
sudo dpkg -i ../target/debs/bullseye/libyang*1.0.73*.deb
displayName: "Install dependency"
- script: |
Expand Down
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Source: sonic-mgmt-common
Maintainer: Sachin Holla <[email protected]>
Build-Depends: debhelper (>= 8.0.0),
dh-systemd
| debhelper (>= 9.20160709)
Vcs-Git: https://github.com/Azure/sonic-mgmt-common
Homepage: https://github.com/Azure/SONiC/
Standards-Version: 3.9.3
Expand Down
14 changes: 7 additions & 7 deletions translib/db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ func (d *DB) doCVL(ts *TableSpec, cvlOps []cvl.CVLOperation, key Key, vals []Val

default:
glog.Error("doCVL: Unknown, op: ", cvlOps[i])
e = errors.New("Unknown Op: " + string(cvlOps[i]))
e = fmt.Errorf("Unknown Op: %d", cvlOps[i])
}

}
Expand Down Expand Up @@ -695,7 +695,7 @@ func (d *DB) doWrite(ts *TableSpec, op _txOp, key Key, val interface{}) error {
e = errors.New("Cannot issue {Set|Mod|Delete}Entry in txStateMultiExec")
default:
glog.Error("doWrite: Unknown, txState: ", d.txState)
e = errors.New("Unknown State: " + string(d.txState))
e = fmt.Errorf("Unknown State: %d", d.txState)
}

if e != nil {
Expand Down Expand Up @@ -739,7 +739,7 @@ func (d *DB) doWrite(ts *TableSpec, op _txOp, key Key, val interface{}) error {

default:
glog.Error("doWrite: Unknown, op: ", op)
e = errors.New("Unknown Op: " + string(op))
e = fmt.Errorf("Unknown Op: %d", op)
}

goto doWriteExit
Expand All @@ -757,7 +757,7 @@ func (d *DB) doWrite(ts *TableSpec, op _txOp, key Key, val interface{}) error {

default:
glog.Error("doWrite: Unknown, op: ", op)
e = errors.New("Unknown Op: " + string(op))
e = fmt.Errorf("Unknown Op: %d", op)
}

if e != nil {
Expand Down Expand Up @@ -1340,7 +1340,7 @@ func (d *DB) CommitTx() error {
e = errors.New("Cannot issue MULTI in txStateMultiExec")
default:
glog.Error("CommitTx: Unknown, txState: ", d.txState)
e = errors.New("Unknown State: " + string(d.txState))
e = fmt.Errorf("Unknown State: %d", d.txState)
}

if e != nil {
Expand Down Expand Up @@ -1410,7 +1410,7 @@ func (d *DB) CommitTx() error {

default:
glog.Error("CommitTx: Unknown, op: ", d.txCmds[i].op)
e = errors.New("Unknown Op: " + string(d.txCmds[i].op))
e = fmt.Errorf("Unknown Op: %d", d.txCmds[i].op)
}

if e != nil {
Expand Down Expand Up @@ -1484,7 +1484,7 @@ func (d *DB) AbortTx() error {
e = errors.New("Cannot issue UNWATCH in txStateMultiExec")
default:
glog.Error("AbortTx: Unknown, txState: ", d.txState)
e = errors.New("Unknown State: " + string(d.txState))
e = fmt.Errorf("Unknown State: %d", d.txState)
}

if e != nil {
Expand Down

0 comments on commit d43a607

Please sign in to comment.