Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
9bc5cf83
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9bc5cf83
编写于
7月 06, 2020
作者:
A
Anders F Björklund
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Delete cri-o patch file now unused after revert
上级
53073506
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
0 addition
and
78 deletion
+0
-78
deploy/iso/minikube-iso/board/coreos/minikube/patches/crio-bin/v1.18.1/version.patch
...rd/coreos/minikube/patches/crio-bin/v1.18.1/version.patch
+0
-78
未找到文件。
deploy/iso/minikube-iso/board/coreos/minikube/patches/crio-bin/v1.18.1/version.patch
已删除
100644 → 0
浏览文件 @
53073506
diff --git a/Makefile b/Makefile
index 764a0136a..4148d81eb 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@
BASE_LDFLAGS = ${SHRINKFLAGS} \
-X ${PROJECT}/internal/version.gitCommit=${COMMIT_NO} \
-X ${PROJECT}/internal/version.gitTreeState=${GIT_TREE_STATE} \
-LDFLAGS = -ldflags '${BASE_LDFLAGS} ${EXTRA_LDFLAGS}'
+GO_LDFLAGS = -ldflags '${BASE_LDFLAGS} ${EXTRA_LDFLAGS}'
TESTIMAGE_VERSION := master-1.3.6
TESTIMAGE_REGISTRY := quay.io/crio
@@ -157,16 +157,16 @@
bin/pinns:
$(MAKE) -C pinns
test/copyimg/copyimg: $(GO_FILES) .gopathok
- $(GO_BUILD) $(GCFLAGS) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/copyimg
+ $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/copyimg
test/checkseccomp/checkseccomp: $(GO_FILES) .gopathok
- $(GO_BUILD) $(GCFLAGS) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/checkseccomp
+ $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/checkseccomp
bin/crio: $(GO_FILES) .gopathok
- $(GO_BUILD) $(GCFLAGS) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio
+ $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio
bin/crio-status: $(GO_FILES) .gopathok
- $(GO_BUILD) $(GCFLAGS) $(LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio-status
+ $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/crio-status
build-static:
$(CONTAINER_RUNTIME) run --rm -it -v $(shell pwd):/cri-o $(TESTIMAGE_NIX) sh -c \
@@ -216,7 +216,7 @@
bin/crio.cross.%: .gopathok .explicit_phony
TARGET="$*"; \
GOOS="$${TARGET%%.*}" \
GOARCH="$${TARGET##*.}" \
- $(GO_BUILD) $(LDFLAGS) -tags "containers_image_openpgp btrfs_noversion" -o "$@" $(PROJECT)/cmd/crio
+ $(GO_BUILD) $(GO_LDFLAGS) -tags "containers_image_openpgp btrfs_noversion" -o "$@" $(PROJECT)/cmd/crio
local-image:
$(TESTIMAGE_SCRIPT)
diff --git a/cmd/crio/main.go b/cmd/crio/main.go
index ab033a47d..fa10f170a 100644
--- a/cmd/crio/main.go
+++ b/cmd/crio/main.go
@@ -120,7 +120,7 @@
func main() {
app.Authors = []*cli.Author{{Name: "The CRI-O Maintainers"}}
app.UsageText = usage
app.Description = app.Usage
- app.Version = "\n" + version.Get().String()
+ app.Version = version.Version + "\n" + version.Get().String()
var err error
app.Flags, app.Metadata, err = criocli.GetFlagsAndMetadata()
diff --git a/internal/version/version.go b/internal/version/version.go
index 7ab5da5a2..19692595e 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -6,6 +6,7 @@
import (
"fmt"
"io/ioutil"
"os"
+ "os/exec"
"path/filepath"
"reflect"
"runtime"
@@ -171,6 +172,9 @@
func getLinkmode() string {
return ""
}
+ if _, err := exec.LookPath("ldd"); err != nil {
+ return ""
+ }
if _, err := utils.ExecCmd("ldd", abspath); err != nil {
if strings.Contains(err.Error(), "not a dynamic executable") {
return "static"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录