thr3ads.net - Libguestfs - [Libguestfs] [PATCH] builder: templates: add the AppStream repo [Mar 2020]

If this information is useful, please help other people find it:
Share via:

Pino Toscano

2020-Mar-11 11:14 UTC

[Libguestfs] [PATCH] builder: templates: add the AppStream repo

It is generally used together with BaseOS (which contains a restricted
set of packages), so add it to the preconfigured repositories by
default.
---
 builder/templates/make-template.ml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/builder/templates/make-template.ml
b/builder/templates/make-template.ml
index 8d26177bf..a4e2f37fb 100755
--- a/builder/templates/make-template.ml
+++ b/builder/templates/make-template.ml
@@ -1238,7 +1238,8 @@ and make_rhel_yum_conf major minor arch                   
major major minor in
          sprintf "%s/Server/%s/os" topurl arch,
          sprintf "%s/source/SRPMS" topurl,
-         Some (sprintf "%s/Server/optional/%s/os" arch topurl,
+         Some ("Optional",
+               sprintf "%s/Server/optional/%s/os" arch topurl,
                sprintf "%s/Server/optional/source/SRPMS" topurl)
       | 7, (X86_64|PPC64|PPC64le|S390X) ->
          let topurl @@ -1246,7 +1247,8 @@ and make_rhel_yum_conf major minor
arch                     major major minor in
          sprintf "%s/Server/%s/os" topurl (string_of_arch arch),
          sprintf "%s/Server/source/tree" topurl,
-         Some (sprintf "%s/Server-optional/%s/os" topurl
(string_of_arch arch),
+         Some ("Optional",
+               sprintf "%s/Server-optional/%s/os" topurl
(string_of_arch arch),
                sprintf "%s/Server-optional/source/tree" topurl)
       | 7, Aarch64 ->
          let topurl @@ -1254,7 +1256,8 @@ and make_rhel_yum_conf major minor
arch                     major major minor in
          sprintf "%s/Server/%s/os" topurl (string_of_arch arch),
          sprintf "%s/Server/source/tree" topurl,
-         Some (sprintf "%s/Server-optional/%s/os" topurl
(string_of_arch arch),
+         Some ("Optional",
+               sprintf "%s/Server-optional/%s/os" topurl
(string_of_arch arch),
                sprintf "%s/Server-optional/source/tree" topurl)
       | 8, arch ->
          let topurl @@ -1262,7 +1265,9 @@ and make_rhel_yum_conf major minor
arch                     major major minor in
          sprintf "%s/BaseOS/%s/os" topurl (string_of_arch arch),
          sprintf "%s/BaseOS/source/tree" topurl,
-         None (* XXX sort out AppStream and CRB *)
+         Some ("AppStream",
+               sprintf "%s/AppStream/%s/os" topurl (string_of_arch
arch),
+               sprintf "%s/AppStream/source/tree" topurl)
       | _ -> assert false in
 
     bpf "\
@@ -1285,23 +1290,25 @@ keepcache=0
 
     (match optional with
      | None -> ()
-     | Some (optionalbaseurl, optionalsrpms) ->
+     | Some (name, optionalbaseurl, optionalsrpms) ->
+        let lc_name = String.lowercase_ascii name in
         bpf "\
 
-[rhel%d-optional]
-name=RHEL %d Server Optional
+[rhel%d-%s]
+name=RHEL %d Server %s
 baseurl=%s
 enabled=1
 gpgcheck=0
 keepcache=0
 
-[rhel%d-optional-source]
-name=RHEL %d Server Optional
+[rhel%d-%s-source]
+name=RHEL %d Server %s
 baseurl=%s
 enabled=0
 gpgcheck=0
 keepcache=0
-" major major optionalbaseurl major major optionalsrpms
+" major lc_name major lc_name optionalbaseurl
+  major lc_name major lc_name optionalsrpms
     )
   ) else (
     assert false (* not implemented for RHEL major >= 9 *)
-- 
2.24.1

Richard W.M. Jones

2020-Mar-11 21:10 UTC

head link

Re: [Libguestfs] [PATCH] builder: templates: add the AppStream repo

On Wed, Mar 11, 2020 at 12:14:32PM +0100, Pino Toscano
wrote:> It is generally used together with BaseOS (which contains a restricted
> set of packages), so add it to the preconfigured repositories by
> default.
> ---
>  builder/templates/make-template.ml | 27 +++++++++++++++++----------
>  1 file changed, 17 insertions(+), 10 deletions(-)
> 
> diff --git a/builder/templates/make-template.ml
b/builder/templates/make-template.ml
> index 8d26177bf..a4e2f37fb 100755
> --- a/builder/templates/make-template.ml
> +++ b/builder/templates/make-template.ml
> @@ -1238,7 +1238,8 @@ and make_rhel_yum_conf major minor arch >         
major major minor in
>           sprintf "%s/Server/%s/os" topurl arch,
>           sprintf "%s/source/SRPMS" topurl,
> -         Some (sprintf "%s/Server/optional/%s/os" arch topurl,
> +         Some ("Optional",
> +               sprintf "%s/Server/optional/%s/os" arch topurl,
>                 sprintf "%s/Server/optional/source/SRPMS" topurl)
>        | 7, (X86_64|PPC64|PPC64le|S390X) ->
>           let topurl > @@ -1246,7 +1247,8 @@ and make_rhel_yum_conf
major minor arch >                     major major minor in
>           sprintf "%s/Server/%s/os" topurl (string_of_arch arch),
>           sprintf "%s/Server/source/tree" topurl,
> -         Some (sprintf "%s/Server-optional/%s/os" topurl
(string_of_arch arch),
> +         Some ("Optional",
> +               sprintf "%s/Server-optional/%s/os" topurl
(string_of_arch arch),
>                 sprintf "%s/Server-optional/source/tree" topurl)
>        | 7, Aarch64 ->
>           let topurl > @@ -1254,7 +1256,8 @@ and make_rhel_yum_conf
major minor arch >                     major major minor in
>           sprintf "%s/Server/%s/os" topurl (string_of_arch arch),
>           sprintf "%s/Server/source/tree" topurl,
> -         Some (sprintf "%s/Server-optional/%s/os" topurl
(string_of_arch arch),
> +         Some ("Optional",
> +               sprintf "%s/Server-optional/%s/os" topurl
(string_of_arch arch),
>                 sprintf "%s/Server-optional/source/tree" topurl)
>        | 8, arch ->
>           let topurl > @@ -1262,7 +1265,9 @@ and make_rhel_yum_conf
major minor arch >                     major major minor in
>           sprintf "%s/BaseOS/%s/os" topurl (string_of_arch arch),
>           sprintf "%s/BaseOS/source/tree" topurl,
> -         None (* XXX sort out AppStream and CRB *)
> +         Some ("AppStream",
> +               sprintf "%s/AppStream/%s/os" topurl
(string_of_arch arch),
> +               sprintf "%s/AppStream/source/tree" topurl)
>        | _ -> assert false in
>  
>      bpf "\
> @@ -1285,23 +1290,25 @@ keepcache=0
>  
>      (match optional with
>       | None -> ()
> -     | Some (optionalbaseurl, optionalsrpms) ->
> +     | Some (name, optionalbaseurl, optionalsrpms) ->
> +        let lc_name = String.lowercase_ascii name in
>          bpf "\
>  
> -[rhel%d-optional]
> -name=RHEL %d Server Optional
> +[rhel%d-%s]
> +name=RHEL %d Server %s
>  baseurl=%s
>  enabled=1
>  gpgcheck=0
>  keepcache=0
>  
> -[rhel%d-optional-source]
> -name=RHEL %d Server Optional
> +[rhel%d-%s-source]
> +name=RHEL %d Server %s
>  baseurl=%s
>  enabled=0
>  gpgcheck=0
>  keepcache=0
> -" major major optionalbaseurl major major optionalsrpms
> +" major lc_name major lc_name optionalbaseurl
> +  major lc_name major lc_name optionalsrpms
>      )
>    ) else (
>      assert false (* not implemented for RHEL major >= 9 *)
ACK

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top

Possibly Parallel Threads

Search for more reasonably related threads

Libguestfs - Mar 2020 - [PATCH] builder: templates: add the AppStream repo

[Libguestfs] [PATCH] builder: templates: add the AppStream repo

Re: [Libguestfs] [PATCH] builder: templates: add the AppStream repo

Possibly Parallel Threads