[PATCH] kubernetes: update sed expression


Kai Kang
 

From: Kai Kang <kai.kang@...>

It misses a backslash in sed expression and causes warning when
run do_compile:

| sed: -e expression #1, char 35: Unmatched ) or \)

Signed-off-by: Kai Kang <kai.kang@...>
---
recipes-containers/kubernetes/kubernetes_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index e165ebe..1ba52b6 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -50,7 +50,7 @@ do_compile() {
export CGO_CFLAGS="${BUILD_CFLAGS}"
# as of go 1.15.5, there are some flags the CGO doesn't like. Rather than
# clearing them all, we sed away the ones we don't want.
- export CGO_LDFLAGS="$(echo ${BUILD_LDFLAGS} | sed 's/-Wl,-O1//g' | sed 's/-Wl,--dynamic-linker.*?( \|$\)//g')"
+ export CGO_LDFLAGS="$(echo ${BUILD_LDFLAGS} | sed 's/-Wl,-O1//g' | sed 's/-Wl,--dynamic-linker.*?\( \|$\)//g')"
export CC="${BUILD_CC}"
export LD="${BUILD_LD}"

--
2.17.1


Bruce Ashfield
 

In message: [meta-virtualization] [PATCH] kubernetes: update sed expression
on 26/09/2021 kai wrote:

From: Kai Kang <kai.kang@...>

It misses a backslash in sed expression and causes warning when
run do_compile:
Since this wasn't actually doing anything, we could likely drop it now.
I remember adding it, and without it, we'd have build issues .. so the
fact that it was building without it being properly done is a good
sign.

That being said, since we are far along in the dev cycle, I'd rather
not experiment with dropping it completely, so I've merged and pushed
the change.

Bruce


| sed: -e expression #1, char 35: Unmatched ) or \)

Signed-off-by: Kai Kang <kai.kang@...>
---
recipes-containers/kubernetes/kubernetes_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index e165ebe..1ba52b6 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -50,7 +50,7 @@ do_compile() {
export CGO_CFLAGS="${BUILD_CFLAGS}"
# as of go 1.15.5, there are some flags the CGO doesn't like. Rather than
# clearing them all, we sed away the ones we don't want.
- export CGO_LDFLAGS="$(echo ${BUILD_LDFLAGS} | sed 's/-Wl,-O1//g' | sed 's/-Wl,--dynamic-linker.*?( \|$\)//g')"
+ export CGO_LDFLAGS="$(echo ${BUILD_LDFLAGS} | sed 's/-Wl,-O1//g' | sed 's/-Wl,--dynamic-linker.*?\( \|$\)//g')"
export CC="${BUILD_CC}"
export LD="${BUILD_LD}"

--
2.17.1