[PATCH 2/2] buildah: enable linkshared


Jose Quaresma
 

The linkshared is fixed upstream and backported in oe-core.
https://git.yoctoproject.org/poky/commit/?id=d5c79ca6a77af1a04992fff4300333e02d94d84d

Signed-off-by: Jose Quaresma <jose.quaresma@...>
---
recipes-containers/buildah/buildah_git.bb | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/recipes-containers/buildah/buildah_git.bb b/recipes-containers/buildah/buildah_git.bb
index 3c17c98..af340eb 100644
--- a/recipes-containers/buildah/buildah_git.bb
+++ b/recipes-containers/buildah/buildah_git.bb
@@ -40,9 +40,15 @@ do_compile:prepend() {
go_do_compile() {
export TMPDIR="${GOTMPDIR}"
if [ -n "${GO_INSTALL}" ]; then
- ${GO} install ${GOBUILDFLAGS} ./cmd/buildah
- ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
- ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go
+ if [ -n "${GO_LINKSHARED}" ]; then
+ ${GO} install ${GOBUILDFLAGS} ./cmd/buildah
+ ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
+ ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go
+ rm -rf ${B}/bin
+ fi
+ ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./cmd/buildah
+ ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
+ ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./tests/copy/copy.go
fi
}

--
2.34.1


Bruce Ashfield
 

I'm going to keep this change as-is.

The structure of the linkeshared building in buildah isn't well done,
and the build -> rm -> build again is strange (to say the least).

Bruce

On Mon, Mar 27, 2023 at 4:21 AM Jose Quaresma <quaresma.jose@...> wrote:

The linkshared is fixed upstream and backported in oe-core.
https://git.yoctoproject.org/poky/commit/?id=d5c79ca6a77af1a04992fff4300333e02d94d84d

Signed-off-by: Jose Quaresma <jose.quaresma@...>
---
recipes-containers/buildah/buildah_git.bb | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/recipes-containers/buildah/buildah_git.bb b/recipes-containers/buildah/buildah_git.bb
index 3c17c98..af340eb 100644
--- a/recipes-containers/buildah/buildah_git.bb
+++ b/recipes-containers/buildah/buildah_git.bb
@@ -40,9 +40,15 @@ do_compile:prepend() {
go_do_compile() {
export TMPDIR="${GOTMPDIR}"
if [ -n "${GO_INSTALL}" ]; then
- ${GO} install ${GOBUILDFLAGS} ./cmd/buildah
- ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
- ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go
+ if [ -n "${GO_LINKSHARED}" ]; then
+ ${GO} install ${GOBUILDFLAGS} ./cmd/buildah
+ ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
+ ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go
+ rm -rf ${B}/bin
+ fi
+ ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./cmd/buildah
+ ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
+ ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./tests/copy/copy.go
fi
}

--
2.34.1



--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


Jose Quaresma
 



Bruce Ashfield <bruce.ashfield@...> escreveu no dia segunda, 27/03/2023 à(s) 13:21:
I'm going to keep this change as-is.

The structure of the linkeshared building in buildah isn't well done,
and the build -> rm -> build again is strange (to say the least).

Ok, no problem.
I also have checked the size of the binaries and it is mostly the same.

static vs shared:

tree --du -h build/tmp/work/corei7-64-lmp-linux/buildah/1.29-r0/image/usr/bin
[107M]  build/tmp/work/corei7-64-lmp-linux/buildah/1.29-r0/image/usr/bin
├── [ 38M]  buildah
├── [ 35M]  copy
└── [ 34M]  imgtype

 107M used in 0 directories, 3 files

vs

tree --du -h build/tmp/work/corei7-64-lmp-linux/buildah/1.29-r0/image/usr/bin
[ 86M]  build/tmp/work/corei7-64-lmp-linux/buildah/1.29-r0/image/usr/bin
├── [ 31M]  buildah
├── [ 28M]  copy
└── [ 28M]  imgtype

  86M used in 0 directories, 3 files


Jose
 

Bruce

On Mon, Mar 27, 2023 at 4:21 AM Jose Quaresma <quaresma.jose@...> wrote:
>
> The linkshared is fixed upstream and backported in oe-core.
> https://git.yoctoproject.org/poky/commit/?id=d5c79ca6a77af1a04992fff4300333e02d94d84d
>
> Signed-off-by: Jose Quaresma <jose.quaresma@...>
> ---
>  recipes-containers/buildah/buildah_git.bb | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-containers/buildah/buildah_git.bb b/recipes-containers/buildah/buildah_git.bb
> index 3c17c98..af340eb 100644
> --- a/recipes-containers/buildah/buildah_git.bb
> +++ b/recipes-containers/buildah/buildah_git.bb
> @@ -40,9 +40,15 @@ do_compile:prepend() {
>  go_do_compile() {
>          export TMPDIR="${GOTMPDIR}"
>          if [ -n "${GO_INSTALL}" ]; then
> -                ${GO} install ${GOBUILDFLAGS} ./cmd/buildah
> -                ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
> -                ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go
> +                if [ -n "${GO_LINKSHARED}" ]; then
> +                        ${GO} install ${GOBUILDFLAGS} ./cmd/buildah
> +                        ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
> +                        ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go
> +                        rm -rf ${B}/bin
> +                fi
> +                ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./cmd/buildah
> +                ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
> +                ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./tests/copy/copy.go
>          fi
>  }
>
> --
> 2.34.1
>
>
>
>


--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


--
Best regards,

José Quaresma