[meta-virtualization][PATCH 1/2] Revert "yq: drop {LINKSHARED}"

[meta-virtualization][PATCH 1/2] Revert "yq: drop {LINKSHARED}"

[Jose Quaresma]

This reverts commit d2a630ce6cf67a145f218012fbf02e4d0d9648df.

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@foundries.io>
---
 recipes-devtools/yq/yq_git.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-devtools/yq/yq_git.bb b/recipes-devtools/yq/yq_git.bb
index bd474a7..45f2f97 100644
--- a/recipes-devtools/yq/yq_git.bb
+++ b/recipes-devtools/yq/yq_git.bb
@@ -50,7 +50,7 @@ GO_IMPORT = "github.com/mikefarah/yq"
 
 inherit go ptest
 
-do_compile() {
+do_compile:prepend() {
     # arrange for some of the golang built ins to be found
     (
 	cd ${WORKDIR}/build/src/
@@ -60,7 +60,6 @@ do_compile() {
     # arrange for the fetched dependencies to be found
     export GOPATH="${GOPATH}:${WORKDIR}/build/vendor/"
     export GO111MODULE=off
-    ${GO} install ${GOBUILDFLAGS} `go_list_packages`
 }
 
 do_install:append() {
-- 
2.34.1

[meta-virtualization][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@foundries.io>
---
 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

Re: [meta-virtualization][PATCH 2/2] buildah: enable linkshared

[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@gmail.com> 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@foundries.io>
> ---
>  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
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7957): https://lists.yoctoproject.org/g/meta-virtualization/message/7957
> Mute This Topic: https://lists.yoctoproject.org/mt/97877470/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


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

Re: [meta-virtualization][PATCH 2/2] buildah: enable linkshared

[Jose Quaresma]

[-- Attachment #1: Type: text/plain, Size: 3439 bytes --]

Bruce Ashfield <bruce.ashfield@gmail.com> 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@gmail.com>
> 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@foundries.io>
> > ---
> >  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
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#7957):
> https://lists.yoctoproject.org/g/meta-virtualization/message/7957
> > Mute This Topic: https://lists.yoctoproject.org/mt/97877470/1050810
> > Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> > Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
> [bruce.ashfield@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> - 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

[-- Attachment #2: Type: text/html, Size: 5566 bytes --]

Re: [meta-virtualization][PATCH 1/2] Revert "yq: drop {LINKSHARED}"

[Bruce Ashfield]

This is now staged on master-next.

Bruce

In message: [meta-virtualization][PATCH 1/2] Revert "yq: drop {LINKSHARED}"
on 27/03/2023 Jose Quaresma wrote:

> This reverts commit d2a630ce6cf67a145f218012fbf02e4d0d9648df.
> 
> 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@foundries.io>
> ---
>  recipes-devtools/yq/yq_git.bb | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/recipes-devtools/yq/yq_git.bb b/recipes-devtools/yq/yq_git.bb
> index bd474a7..45f2f97 100644
> --- a/recipes-devtools/yq/yq_git.bb
> +++ b/recipes-devtools/yq/yq_git.bb
> @@ -50,7 +50,7 @@ GO_IMPORT = "github.com/mikefarah/yq"
>  
>  inherit go ptest
>  
> -do_compile() {
> +do_compile:prepend() {
>      # arrange for some of the golang built ins to be found
>      (
>  	cd ${WORKDIR}/build/src/
> @@ -60,7 +60,6 @@ do_compile() {
>      # arrange for the fetched dependencies to be found
>      export GOPATH="${GOPATH}:${WORKDIR}/build/vendor/"
>      export GO111MODULE=off
> -    ${GO} install ${GOBUILDFLAGS} `go_list_packages`
>  }
>  
>  do_install:append() {
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7956): https://lists.yoctoproject.org/g/meta-virtualization/message/7956
> Mute This Topic: https://lists.yoctoproject.org/mt/97877469/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>