~postmarketos/pmbootstrap-devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
9 3

[PATCH pmbootstrap 0/3] aportgen/binutils adjustments

Details
Message ID
<20230522065220.2841-1-ollieparanoid@postmarketos.org>
DKIM signature
missing
Download raw message
Adjust to changes in Alpine.

Oliver Smith (3):
  aportgen/binutils: order fields alphabetically
  aportgen/binutils: add more makedepends_host
  aportgen/binutils: set pmOS bugurl

 pmb/aportgen/binutils.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

-- 
2.40.1

[PATCH pmbootstrap 1/3] aportgen/binutils: order fields alphabetically

Details
Message ID
<20230522065220.2841-2-ollieparanoid@postmarketos.org>
In-Reply-To
<20230522065220.2841-1-ollieparanoid@postmarketos.org> (view parent)
DKIM signature
missing
Download raw message
Patch: +2 -2
---
 pmb/aportgen/binutils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py
index deda8d06..292460db 100644
--- a/pmb/aportgen/binutils.py
+++ b/pmb/aportgen/binutils.py
@@ -13,9 +13,9 @@ def generate(args, pkgname):

    # Rewrite APKBUILD
    fields = {
        "pkgname": pkgname,
        "pkgdesc": f"Tools necessary to build programs for {arch} targets",
        "arch": pmb.config.arch_native,
        "pkgdesc": f"Tools necessary to build programs for {arch} targets",
        "pkgname": pkgname,
    }

    below_header = """
-- 
2.40.1

[PATCH pmbootstrap 2/3] aportgen/binutils: add more makedepends_host

Details
Message ID
<20230522065220.2841-3-ollieparanoid@postmarketos.org>
In-Reply-To
<20230522065220.2841-1-ollieparanoid@postmarketos.org> (view parent)
DKIM signature
missing
Download raw message
Patch: +1 -0
Adjust to Alpine's APKBUILD where jansson-dev and zstd-dev are only set
if $BOOTSTRAP is set. The APKBUILD parser in pmbootstrap doesn't
recognize this, and therefore doesn't install the depends unless we
replace makedepends_host= outside of the condition.

Related: https://gitlab.alpinelinux.org/alpine/aports/-/commit/fe73f3a28c101cfbe0a41e55c8497520a6cfbdca
---
 pmb/aportgen/binutils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py
index 292460db..bdcc8e0d 100644
--- a/pmb/aportgen/binutils.py
+++ b/pmb/aportgen/binutils.py
@@ -14,6 +14,7 @@ def generate(args, pkgname):
    # Rewrite APKBUILD
    fields = {
        "arch": pmb.config.arch_native,
        "makedepends_host": "zlib-dev jansson-dev zstd-dev",
        "pkgdesc": f"Tools necessary to build programs for {arch} targets",
        "pkgname": pkgname,
    }
-- 
2.40.1

[PATCH pmbootstrap 3/3] aportgen/binutils: set pmOS bugurl

Details
Message ID
<20230522065220.2841-4-ollieparanoid@postmarketos.org>
In-Reply-To
<20230522065220.2841-1-ollieparanoid@postmarketos.org> (view parent)
DKIM signature
missing
Download raw message
Patch: +6 -1
Alpine recently set the bugurl to the Alpine Linux issue tracker. When
rewriting the APKBUILD for cross compiling in postmarketOS, change it
to https://postmarketos.org/issues.

Related: https://gitlab.alpinelinux.org/alpine/aports/-/commit/fe73f3a28c101cfbe0a41e55c8497520a6cfbdca
---
 pmb/aportgen/binutils.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py
index bdcc8e0d..571fb43a 100644
--- a/pmb/aportgen/binutils.py
+++ b/pmb/aportgen/binutils.py
@@ -19,10 +19,15 @@ def generate(args, pkgname):
        "pkgname": pkgname,
    }

    replace_simple = {
        "*--with-bugurl=*": "\t\t--with-bugurl=\"https://postmarketos.org/issues\" \\"
    }

    below_header = """
        CTARGET_ARCH=""" + arch + """
        CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
    """

    pmb.aportgen.core.rewrite(args, pkgname, "main/binutils", fields,
                              "binutils", below_header=below_header)
                              "binutils", replace_simple=replace_simple,
                              below_header=below_header)
-- 
2.40.1

[pmbootstrap/patches/.build.yml] build failed

builds.sr.ht <builds@sr.ht>
Details
Message ID
<CSSLXPODPA7N.3P2HZ5CSLX56K@cirno2>
In-Reply-To
<20230522065220.2841-4-ollieparanoid@postmarketos.org> (view parent)
DKIM signature
missing
Download raw message
pmbootstrap/patches/.build.yml: FAILED in 1m19s

[aportgen/binutils adjustments][0] from [Oliver Smith][1]

[0]: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/patches/41318
[1]: ollieparanoid@postmarketos.org

✗ #993802 FAILED pmbootstrap/patches/.build.yml https://builds.sr.ht/~postmarketos/job/993802

Re: [PATCH pmbootstrap 1/3] aportgen/binutils: order fields alphabetically

Details
Message ID
<2142194.irdbgypaU6@z3ntu.xyz>
In-Reply-To
<20230522065220.2841-2-ollieparanoid@postmarketos.org> (view parent)
DKIM signature
missing
Download raw message
On Montag, 22. Mai 2023 08:52:18 CEST Oliver Smith wrote:

Reviewed-by: Luca Weiss <luca@z3ntu.xyz>

> ---
>  pmb/aportgen/binutils.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py
> index deda8d06..292460db 100644
> --- a/pmb/aportgen/binutils.py
> +++ b/pmb/aportgen/binutils.py
> @@ -13,9 +13,9 @@ def generate(args, pkgname):
> 
>      # Rewrite APKBUILD
>      fields = {
> -        "pkgname": pkgname,
> -        "pkgdesc": f"Tools necessary to build programs for {arch} targets",
> "arch": pmb.config.arch_native,
> +        "pkgdesc": f"Tools necessary to build programs for {arch} targets",
> +        "pkgname": pkgname,
>      }
> 
>      below_header = """

Re: [PATCH pmbootstrap 2/3] aportgen/binutils: add more makedepends_host

Details
Message ID
<2881430.e9J7NaK4W3@z3ntu.xyz>
In-Reply-To
<20230522065220.2841-3-ollieparanoid@postmarketos.org> (view parent)
DKIM signature
missing
Download raw message
On Montag, 22. Mai 2023 08:52:19 CEST Oliver Smith wrote:
> Adjust to Alpine's APKBUILD where jansson-dev and zstd-dev are only set
> if $BOOTSTRAP is set. The APKBUILD parser in pmbootstrap doesn't

"test -z $foo" checks if $foo is not set, so makedepends_host is only added 
outside of bootstrap case, so this part of the message is the wrong way 
around?

> recognize this, and therefore doesn't install the depends unless we
> replace makedepends_host= outside of the condition.
> 
> Related:
> https://gitlab.alpinelinux.org/alpine/aports/-/commit/fe73f3a28c101cfbe0a41
> e55c8497520a6cfbdca

With that fixed:

Reviewed-by: Luca Weiss <luca@z3ntu.xyz>

> ---
>  pmb/aportgen/binutils.py | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py
> index 292460db..bdcc8e0d 100644
> --- a/pmb/aportgen/binutils.py
> +++ b/pmb/aportgen/binutils.py
> @@ -14,6 +14,7 @@ def generate(args, pkgname):
>      # Rewrite APKBUILD
>      fields = {
>          "arch": pmb.config.arch_native,
> +        "makedepends_host": "zlib-dev jansson-dev zstd-dev",
>          "pkgdesc": f"Tools necessary to build programs for {arch} targets",
> "pkgname": pkgname,
>      }

Re: [PATCH pmbootstrap 3/3] aportgen/binutils: set pmOS bugurl

Details
Message ID
<21882570.EfDdHjke4D@z3ntu.xyz>
In-Reply-To
<20230522065220.2841-4-ollieparanoid@postmarketos.org> (view parent)
DKIM signature
missing
Download raw message
On Montag, 22. Mai 2023 08:52:20 CEST Oliver Smith wrote:
> Alpine recently set the bugurl to the Alpine Linux issue tracker. When
> rewriting the APKBUILD for cross compiling in postmarketOS, change it
> to https://postmarketos.org/issues.
> 
> Related:
> https://gitlab.alpinelinux.org/alpine/aports/-/commit/fe73f3a28c101cfbe0a41
> e55c8497520a6cfbdca

Reviewed-by: Luca Weiss <luca@z3ntu.xyz>

> ---
>  pmb/aportgen/binutils.py | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py
> index bdcc8e0d..571fb43a 100644
> --- a/pmb/aportgen/binutils.py
> +++ b/pmb/aportgen/binutils.py
> @@ -19,10 +19,15 @@ def generate(args, pkgname):
>          "pkgname": pkgname,
>      }
> 
> +    replace_simple = {
> +        "*--with-bugurl=*":
> "\t\t--with-bugurl=\"https://postmarketos.org/issues\" \\" +    }
> +
>      below_header = """
>          CTARGET_ARCH=""" + arch + """
>          CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
>      """
> 
>      pmb.aportgen.core.rewrite(args, pkgname, "main/binutils", fields,
> -                              "binutils", below_header=below_header)
> +                              "binutils", replace_simple=replace_simple,
> +                              below_header=below_header)

Re: [PATCH pmbootstrap 2/3] aportgen/binutils: add more makedepends_host

Details
Message ID
<CSV6YWGK9VCJ.21DZI49FAZ3XC@pm-mail-aerc>
In-Reply-To
<2881430.e9J7NaK4W3@z3ntu.xyz> (view parent)
DKIM signature
missing
Download raw message
On Tue May 23, 2023 at 5:15 PM CEST, Luca Weiss wrote:
> On Montag, 22. Mai 2023 08:52:19 CEST Oliver Smith wrote:
> > Adjust to Alpine's APKBUILD where jansson-dev and zstd-dev are only set
> > if $BOOTSTRAP is set. The APKBUILD parser in pmbootstrap doesn't
>
> "test -z $foo" checks if $foo is not set, so makedepends_host is only added 
> outside of bootstrap case, so this part of the message is the wrong way 
> around?

Good catch, fixed before applying. Also the testdata needed to be
updated with the new output of aportgen, fixed that as well.

>
> > recognize this, and therefore doesn't install the depends unless we
> > replace makedepends_host= outside of the condition.
> > 
> > Related:
> > https://gitlab.alpinelinux.org/alpine/aports/-/commit/fe73f3a28c101cfbe0a41
> > e55c8497520a6cfbdca
>
> With that fixed:
>
> Reviewed-by: Luca Weiss <luca@z3ntu.xyz>
>
> > ---
> >  pmb/aportgen/binutils.py | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py
> > index 292460db..bdcc8e0d 100644
> > --- a/pmb/aportgen/binutils.py
> > +++ b/pmb/aportgen/binutils.py
> > @@ -14,6 +14,7 @@ def generate(args, pkgname):
> >      # Rewrite APKBUILD
> >      fields = {
> >          "arch": pmb.config.arch_native,
> > +        "makedepends_host": "zlib-dev jansson-dev zstd-dev",
> >          "pkgdesc": f"Tools necessary to build programs for {arch} targets",
> > "pkgname": pkgname,
> >      }
Details
Message ID
<168500094213.2108.17755740001723251867.b4-ty@postmarketos.org>
In-Reply-To
<20230522065220.2841-1-ollieparanoid@postmarketos.org> (view parent)
DKIM signature
missing
Download raw message
On Mon, 22 May 2023 08:52:17 +0200, Oliver Smith wrote:
> Adjust to changes in Alpine.
> 
> Oliver Smith (3):
>   aportgen/binutils: order fields alphabetically
>   aportgen/binutils: add more makedepends_host
>   aportgen/binutils: set pmOS bugurl
> 
> [...]

Applied, thanks for the review!

[1/3] aportgen/binutils: order fields alphabetically
      commit: 84c1460e75bf9ad0b6ea61ef655bc4baee31d9da
[2/3] aportgen/binutils: add more makedepends_host
      commit: 6276b2dc68ed49f4b84160b5e3c4697db72a8fa2
[3/3] aportgen/binutils: set pmOS bugurl
      commit: 0c81679677d6bc8770e2eb53be2b1ae10210f8d2

Best regards,
-- 
Oliver Smith <ollieparanoid@postmarketos.org>
Reply to thread Export thread (mbox)