diff mbox series

tests/vm: update openbsd to release 6.8

Message ID 20201027053048.GB64546@humpty.home.comstyle.com
State Accepted
Commit 45716765b1d0bb1741688e5347aea967b9492d28
Headers show
Series tests/vm: update openbsd to release 6.8 | expand

Commit Message

Brad Smith Oct. 27, 2020, 5:30 a.m. UTC 
tests/vm: update openbsd to release 6.8

A double dash at the end of a package name removes ambiguity
when the intent is to install a non-FLAVORed package.

Signed-off-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Comments

Philippe Mathieu-Daudé Oct. 27, 2020, 10:05 a.m. UTC | #1 
On 10/27/20 6:30 AM, Brad Smith wrote:
> tests/vm: update openbsd to release 6.8

> 

> A double dash at the end of a package name removes ambiguity

> when the intent is to install a non-FLAVORed package.

> 

> Signed-off-by: Brad Smith <brad@comstyle.com>

> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

> Tested-by: Gerd Hoffmann <kraxel@redhat.com>

> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


I confirm Brad sent us this patch off-list, and
- our review comments are addressed,
- the tags are correct.

The patch format itself seems broken... Like a copy/paste
into an email client...

---

> 

> 

> diff --git a/tests/vm/openbsd b/tests/vm/openbsd

> index 8356646f21..5ffa4f1b37 100755

> --- a/tests/vm/openbsd

> +++ b/tests/vm/openbsd

> @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):

>      name = "openbsd"

>      arch = "x86_64"

>  

> -    link = "https://cdn.openbsd.org/pub/OpenBSD/6.6/amd64/install66.iso"

> -    csum = "b22e63df56e6266de6bbeed8e9be0fbe9ee2291551c5bc03f3cc2e4ab9436ee3"

> +    link = "https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/install68.iso"

> +    csum = "47e291fcc2d0c1a8ae0b66329f040b33af755b6adbd21739e20bb5ad56f62b6c"

>      size = "20G"

>      pkgs = [

>          # tools

> @@ -36,10 +36,10 @@ class OpenBSDVM(basevm.BaseVM):

>          "bash",

>          "gmake",

>          "gsed",

> -        "gettext",

> +        "gettext-tools",

>  

>          # libs: usb

> -        "libusb1",

> +        "libusb1--",

>  

>          # libs: crypto

>          "gnutls",

>
Brad Smith Oct. 27, 2020, 10:22 a.m. UTC | #2 
On Tue, Oct 27, 2020 at 11:05:20AM +0100, Philippe Mathieu-Daud?? wrote:
> On 10/27/20 6:30 AM, Brad Smith wrote:

> > tests/vm: update openbsd to release 6.8

> > 

> > A double dash at the end of a package name removes ambiguity

> > when the intent is to install a non-FLAVORed package.

> > 

> > Signed-off-by: Brad Smith <brad@comstyle.com>

> > Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

> > Tested-by: Gerd Hoffmann <kraxel@redhat.com>

> > Reviewed-by: Philippe Mathieu-Daud?? <philmd@redhat.com>

> 

> I confirm Brad sent us this patch off-list, and

> - our review comments are addressed,

> - the tags are correct.

> 

> The patch format itself seems broken... Like a copy/paste

> into an email client...


Well, git diff vs a format-patch.


Subject: [PATCH] tests/vm: update openbsd to release 6.8

A double dash at the end of a package name removes ambiguity
when the intent is to install a non-FLAVORed package.

Signed-off-by: Brad Smith <brad@comstyle.com>

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

Tested-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

---
 tests/vm/openbsd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 8356646f21..5ffa4f1b37 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):
     name = "openbsd"
     arch = "x86_64"
 
-    link = "https://cdn.openbsd.org/pub/OpenBSD/6.6/amd64/install66.iso"
-    csum = "b22e63df56e6266de6bbeed8e9be0fbe9ee2291551c5bc03f3cc2e4ab9436ee3"
+    link = "https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/install68.iso"
+    csum = "47e291fcc2d0c1a8ae0b66329f040b33af755b6adbd21739e20bb5ad56f62b6c"
     size = "20G"
     pkgs = [
         # tools
@@ -36,10 +36,10 @@ class OpenBSDVM(basevm.BaseVM):
         "bash",
         "gmake",
         "gsed",
-        "gettext",
+        "gettext-tools",
 
         # libs: usb
-        "libusb1",
+        "libusb1--",
 
         # libs: crypto
         "gnutls",
-- 
2.28.0
Brad Smith Nov. 7, 2020, 6:07 a.m. UTC | #3 
ping.

On 10/27/2020 6:22 AM, Brad Smith wrote:
> On Tue, Oct 27, 2020 at 11:05:20AM +0100, Philippe Mathieu-Daud?? wrote:

>> On 10/27/20 6:30 AM, Brad Smith wrote:

>>> tests/vm: update openbsd to release 6.8

>>>

>>> A double dash at the end of a package name removes ambiguity

>>> when the intent is to install a non-FLAVORed package.

>>>

>>> Signed-off-by: Brad Smith <brad@comstyle.com>

>>> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

>>> Tested-by: Gerd Hoffmann <kraxel@redhat.com>

>>> Reviewed-by: Philippe Mathieu-Daud?? <philmd@redhat.com>

>> I confirm Brad sent us this patch off-list, and

>> - our review comments are addressed,

>> - the tags are correct.

>>

>> The patch format itself seems broken... Like a copy/paste

>> into an email client...

> Well, git diff vs a format-patch.

>

>

> Subject: [PATCH] tests/vm: update openbsd to release 6.8

>

> A double dash at the end of a package name removes ambiguity

> when the intent is to install a non-FLAVORed package.

>

> Signed-off-by: Brad Smith <brad@comstyle.com>

> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

> Tested-by: Gerd Hoffmann <kraxel@redhat.com>

> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---

>   tests/vm/openbsd | 8 ++++----

>   1 file changed, 4 insertions(+), 4 deletions(-)

>

> diff --git a/tests/vm/openbsd b/tests/vm/openbsd

> index 8356646f21..5ffa4f1b37 100755

> --- a/tests/vm/openbsd

> +++ b/tests/vm/openbsd

> @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):

>       name = "openbsd"

>       arch = "x86_64"

>   

> -    link = "https://cdn.openbsd.org/pub/OpenBSD/6.6/amd64/install66.iso"

> -    csum = "b22e63df56e6266de6bbeed8e9be0fbe9ee2291551c5bc03f3cc2e4ab9436ee3"

> +    link = "https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/install68.iso"

> +    csum = "47e291fcc2d0c1a8ae0b66329f040b33af755b6adbd21739e20bb5ad56f62b6c"

>       size = "20G"

>       pkgs = [

>           # tools

> @@ -36,10 +36,10 @@ class OpenBSDVM(basevm.BaseVM):

>           "bash",

>           "gmake",

>           "gsed",

> -        "gettext",

> +        "gettext-tools",

>   

>           # libs: usb

> -        "libusb1",

> +        "libusb1--",

>   

>           # libs: crypto

>           "gnutls",
Thomas Huth Nov. 9, 2020, 8:13 a.m. UTC | #4 
On 07/11/2020 07.07, Brad Smith wrote:
> ping.


It's not directly my turf, but I can add it to my next testing-related pull
request if nobody else picks this patch up before.

 Thomas

> On 10/27/2020 6:22 AM, Brad Smith wrote:

>> On Tue, Oct 27, 2020 at 11:05:20AM +0100, Philippe Mathieu-Daud?? wrote:

>>> On 10/27/20 6:30 AM, Brad Smith wrote:

>>>> tests/vm: update openbsd to release 6.8

>>>>

>>>> A double dash at the end of a package name removes ambiguity

>>>> when the intent is to install a non-FLAVORed package.

>>>>

>>>> Signed-off-by: Brad Smith <brad@comstyle.com>

>>>> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

>>>> Tested-by: Gerd Hoffmann <kraxel@redhat.com>

>>>> Reviewed-by: Philippe Mathieu-Daud?? <philmd@redhat.com>

>>> I confirm Brad sent us this patch off-list, and

>>> - our review comments are addressed,

>>> - the tags are correct.

>>>

>>> The patch format itself seems broken... Like a copy/paste

>>> into an email client...

>> Well, git diff vs a format-patch.

>>

>>

>> Subject: [PATCH] tests/vm: update openbsd to release 6.8

>>

>> A double dash at the end of a package name removes ambiguity

>> when the intent is to install a non-FLAVORed package.

>>

>> Signed-off-by: Brad Smith <brad@comstyle.com>

>> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

>> Tested-by: Gerd Hoffmann <kraxel@redhat.com>

>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>> ---

>>   tests/vm/openbsd | 8 ++++----

>>   1 file changed, 4 insertions(+), 4 deletions(-)

>>

>> diff --git a/tests/vm/openbsd b/tests/vm/openbsd

>> index 8356646f21..5ffa4f1b37 100755

>> --- a/tests/vm/openbsd

>> +++ b/tests/vm/openbsd

>> @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):

>>       name = "openbsd"

>>       arch = "x86_64"

>>   -    link = "https://cdn.openbsd.org/pub/OpenBSD/6.6/amd64/install66.iso"

>> -    csum =

>> "b22e63df56e6266de6bbeed8e9be0fbe9ee2291551c5bc03f3cc2e4ab9436ee3"

>> +    link = "https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/install68.iso"

>> +    csum =

>> "47e291fcc2d0c1a8ae0b66329f040b33af755b6adbd21739e20bb5ad56f62b6c"

>>       size = "20G"

>>       pkgs = [

>>           # tools

>> @@ -36,10 +36,10 @@ class OpenBSDVM(basevm.BaseVM):

>>           "bash",

>>           "gmake",

>>           "gsed",

>> -        "gettext",

>> +        "gettext-tools",

>>             # libs: usb

>> -        "libusb1",

>> +        "libusb1--",

>>             # libs: crypto

>>           "gnutls",

>
Brad Smith Nov. 10, 2020, 8:59 a.m. UTC | #5 
On 11/9/2020 3:13 AM, Thomas Huth wrote:
> On 07/11/2020 07.07, Brad Smith wrote:

>> ping.

> It's not directly my turf, but I can add it to my next testing-related pull

> request if nobody else picks this patch up before.

Please, if you could. Thank you.
>   Thomas

>

>> On 10/27/2020 6:22 AM, Brad Smith wrote:

>>> On Tue, Oct 27, 2020 at 11:05:20AM +0100, Philippe Mathieu-Daud?? wrote:

>>>> On 10/27/20 6:30 AM, Brad Smith wrote:

>>>>> tests/vm: update openbsd to release 6.8

>>>>>

>>>>> A double dash at the end of a package name removes ambiguity

>>>>> when the intent is to install a non-FLAVORed package.

>>>>>

>>>>> Signed-off-by: Brad Smith<brad@comstyle.com>

>>>>> Reviewed-by: Gerd Hoffmann<kraxel@redhat.com>

>>>>> Tested-by: Gerd Hoffmann<kraxel@redhat.com>

>>>>> Reviewed-by: Philippe Mathieu-Daud??<philmd@redhat.com>

>>>> I confirm Brad sent us this patch off-list, and

>>>> - our review comments are addressed,

>>>> - the tags are correct.

>>>>

>>>> The patch format itself seems broken... Like a copy/paste

>>>> into an email client...

>>> Well, git diff vs a format-patch.

>>>

>>>

>>> Subject: [PATCH] tests/vm: update openbsd to release 6.8

>>>

>>> A double dash at the end of a package name removes ambiguity

>>> when the intent is to install a non-FLAVORed package.

>>>

>>> Signed-off-by: Brad Smith<brad@comstyle.com>

>>> Reviewed-by: Gerd Hoffmann<kraxel@redhat.com>

>>> Tested-by: Gerd Hoffmann<kraxel@redhat.com>

>>> Reviewed-by: Philippe Mathieu-Daudé<philmd@redhat.com>

>>> ---

>>>    tests/vm/openbsd | 8 ++++----

>>>    1 file changed, 4 insertions(+), 4 deletions(-)

>>>

>>> diff --git a/tests/vm/openbsd b/tests/vm/openbsd

>>> index 8356646f21..5ffa4f1b37 100755

>>> --- a/tests/vm/openbsd

>>> +++ b/tests/vm/openbsd

>>> @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):

>>>        name = "openbsd"

>>>        arch = "x86_64"

>>>    -    link ="https://cdn.openbsd.org/pub/OpenBSD/6.6/amd64/install66.iso"

>>> -    csum =

>>> "b22e63df56e6266de6bbeed8e9be0fbe9ee2291551c5bc03f3cc2e4ab9436ee3"

>>> +    link ="https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/install68.iso"

>>> +    csum =

>>> "47e291fcc2d0c1a8ae0b66329f040b33af755b6adbd21739e20bb5ad56f62b6c"

>>>        size = "20G"

>>>        pkgs = [

>>>            # tools

>>> @@ -36,10 +36,10 @@ class OpenBSDVM(basevm.BaseVM):

>>>            "bash",

>>>            "gmake",

>>>            "gsed",

>>> -        "gettext",

>>> +        "gettext-tools",

>>>              # libs: usb

>>> -        "libusb1",

>>> +        "libusb1--",

>>>              # libs: crypto

>>>            "gnutls",
diff mbox series

Patch

diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 8356646f21..5ffa4f1b37 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -22,8 +22,8 @@  class OpenBSDVM(basevm.BaseVM):
     name = "openbsd"
     arch = "x86_64"
 
-    link = "https://cdn.openbsd.org/pub/OpenBSD/6.6/amd64/install66.iso"
-    csum = "b22e63df56e6266de6bbeed8e9be0fbe9ee2291551c5bc03f3cc2e4ab9436ee3"
+    link = "https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/install68.iso"
+    csum = "47e291fcc2d0c1a8ae0b66329f040b33af755b6adbd21739e20bb5ad56f62b6c"
     size = "20G"
     pkgs = [
         # tools
@@ -36,10 +36,10 @@  class OpenBSDVM(basevm.BaseVM):
         "bash",
         "gmake",
         "gsed",
-        "gettext",
+        "gettext-tools",
 
         # libs: usb
-        "libusb1",
+        "libusb1--",
 
         # libs: crypto
         "gnutls",