Skip to contentSkip to conversation

acpica: upgrade 20210105 -> 20210331

PATCH New wangmy 4 participants 10 messages Apr 8, 2021 – Apr 9, 2021

lore
Share & tools
lore

wangmy

author
#0 lore raw

PATCH 1/1 acpica: upgrade 20210105 -> 20210331

---
 .../acpica/{acpica_20210105.bb => acpica_20210331.bb}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/acpica/{acpica_20210105.bb => acpica_20210331.bb} (94%)
meta/recipes-extended/acpica/acpica_20210331.bb renamed from meta/recipes-extended/acpica/acpica_20210105.bb +1 -1
similarity index 94%
rename from meta/recipes-extended/acpica/acpica_20210105.bb
rename to meta/recipes-extended/acpica/acpica_20210331.bb
index 0188dc8a1b..e17bc94c39 100644
@@ -17,7 +17,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 DEPENDS = "m4-native flex-native bison-native"
 
 SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz"
-SRC_URI[sha256sum] = "a9be7b749025e60f93fde2fe531bfe0d84a33641d3e0c9b0f6049f996dbb1ff8"
+SRC_URI[sha256sum] = "b49237a2c3df58b57310612ec3a6ebee69e1a525b5efeec7152faf32a03b7068"
 
 UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/1 curl: upgrade 7.75.0 -> 7.76.0

---
 meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} (97%)
meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +1 -1
similarity index 97%
rename from meta/recipes-support/curl/curl_7.75.0.bb
rename to meta/recipes-support/curl/curl_7.76.0.bb
index 7666c7b608..68315d9f77 100644
@@ -13,7 +13,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://0001-replace-krb5-config-with-pkg-config.patch \
 "
 
-SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026"
+SRC_URI[sha256sum] = "e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a"
 
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"
Signature · 1 line
2.25.1
#2 lore raw

Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

Quoted 16 lines · wangmy

[Please note: This e-mail is from an EXTERNAL e-mail address]

---
  meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

rename meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} (97%)

meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +0 -0
similarity index 97%
rename from meta/recipes-support/curl/curl_7.75.0.bb
rename to meta/recipes-support/curl/curl_7.76.0.bb
index 7666c7b608..68315d9f77 100644

meta/recipes-support/curl/curl_7.76.0.bb SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ · line 16

Quoted 5 lines
meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +1 -1
@@ -13,7 +13,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
             file://0001-replace-krb5-config-with-pkg-config.patch \
  "
 
-SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026"
+SRC_URI[sha256sum] = "e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a"

This change fails on the curl-native do_configure step:

| checking for time.h... (cached) yes
| checking for sys/socket.h... (cached) yes
| checking for struct timeval... yes
| checking run-time libs availability... failed
| configure: error: one or more libs available at link-time are not available run-time. Libs used at link-time: -lidn2 -lgsasl -lssl -lcrypto -lssl -lcrypto -lz

After a look at the recipe it appears that this may be a dependency on libgsasl. Could you investigate this and send a v2 with the appropriate PACKAGECONFIG added? You should also include release notes in the patch summary where possible.

- Trevor

Quoted 9 lines
meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +0 -1
  # Curl has used many names over the years...
  CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"
--

2.25.1

author
#3 lore raw

Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

I found libgsasl in meta-tizen, but this repository is very old and has been deleted from layers.

Can I specify --without-libgsasl in curl to solve the problem?

--
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]<mailto:[email protected]>
http://www.fujitsu.com/cn/fnst/

From: Trevor Gamblin <[email protected]>
Sent: Friday, April 9, 2021 3:50 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

On 2021-04-08 1:40 a.m., wangmy wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

---

 meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} (97%)
meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +0 -0

similarity index 97%

rename from meta/recipes-support/curl/curl_7.75.0.bb

rename to meta/recipes-support/curl/curl_7.76.0.bb

index 7666c7b608..68315d9f77 100644

--- a/meta/recipes-support/curl/curl_7.75.0.bb

+++ b/meta/recipes-support/curl/curl_7.76.0.bb

@@ -13,7 +13,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \<https://curl.haxx.se/download/curl-$%7bPV%7d.tar.bz2/file:/0001-replace-krb5-config-with-pkg-config.patch/>

            file://0001-replace-krb5-config-with-pkg-config.patch \<https://curl.haxx.se/download/curl-$%7bPV%7d.tar.bz2/file:/0001-replace-krb5-config-with-pkg-config.patch/>

"<https://curl.haxx.se/download/curl-$%7bPV%7d.tar.bz2/file:/0001-replace-krb5-config-with-pkg-config.patch/>

-SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026"

+SRC_URI[sha256sum] = "e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a"

This change fails on the curl-native do_configure step:

| checking for time.h... (cached) yes
| checking for sys/socket.h... (cached) yes
| checking for struct timeval... yes
| checking run-time libs availability... failed
| configure: error: one or more libs available at link-time are not available run-time. Libs used at link-time: -lidn2 -lgsasl -lssl -lcrypto -lssl -lcrypto -lz

After a look at the recipe it appears that this may be a dependency on libgsasl. Could you investigate this and send a v2 with the appropriate PACKAGECONFIG added? You should also include release notes in the patch summary where possible.

- Trevor

# Curl has used many names over the years...

CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"

--

2.25.1

#4 lore raw

Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

Quoted 6 lines · wangmy

I found libgsasl in meta-tizen, but this repository is very old and has been deleted from layers.

Can I specify --without-libgsasl in curl to solve the problem?

I think ideally you can add a packageconfig knob for it and keep it disabled by default.

Quoted 115 lines

--

Best Regards

---------------------------------------------------

Wang Mingyu

Development Dept.I

Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China

TEL: +86+25-86630566-8568

COINS: 79988548

FAX: +86+25-83317685

MAIL: [email protected]

http://www.fujitsu.com/cn/fnst/

From: Trevor Gamblin <[email protected]>
Sent: Friday, April 9, 2021 3:50 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

On 2021-04-08 1:40 a.m., wangmy wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

---

 meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} (97%)
meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +0 -0

similarity index 97%

rename from meta/recipes-support/curl/curl_7.75.0.bb

rename to meta/recipes-support/curl/curl_7.76.0.bb

index 7666c7b608..68315d9f77 100644

--- a/meta/recipes-support/curl/curl_7.75.0.bb

+++ b/meta/recipes-support/curl/curl_7.76.0.bb

meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +1 -1
@@ -13,7 +13,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
 
            file://0001-replace-krb5-config-with-pkg-config.patch \
 
 "
 
 
 
-SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026"
 
+SRC_URI[sha256sum] = "e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a"

This change fails on the curl-native do_configure step:

| checking for time.h... (cached) yes
| checking for sys/socket.h... (cached) yes
| checking for struct timeval... yes
| checking run-time libs availability... failed
| configure: error: one or more libs available at link-time are not available run-time. Libs used at link-time: -lidn2 -lgsasl -lssl -lcrypto -lssl -lcrypto -lz

After a look at the recipe it appears that this may be a dependency on libgsasl. Could you investigate this and send a v2 with the appropriate PACKAGECONFIG added? You should also include release notes in the patch summary where possible.

- Trevor

# Curl has used many names over the years...

CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"

--

2.25.1

author
#5 lore raw

Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

I'm going to revise it like this. Please see if it's OK:

@@ -54,6 +54,7 @@
PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose"
PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+PACKAGECONFIG[libgsasl] = "--with-libgsasl,--without-libgsasl,libgsasl"

 EXTRA_OECONF = " \
     --disable-libcurl-option \
@@ -65,6 +66,7 @@
     --enable-debug \
     --enable-optimize \
     --disable-curldebug \

+ --without-libgsasl \
"

do_install_append_class-target() {

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 148 lines

-----Original Message-----
From: Khem Raj <[email protected]>
Sent: Friday, April 9, 2021 9:53 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: Trevor Gamblin <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

Quoted 2 lines · wangmy

I found libgsasl in meta-tizen, but this repository is very old and has been

deleted from layers.

Quoted 4 lines

Can I specify --without-libgsasl in curl to solve the problem?

I think ideally you can add a packageconfig knob for it and keep it disabled by default.

Quoted 73 lines

--

Best Regards

---------------------------------------------------

Wang Mingyu

Development Dept.I

Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China

TEL: +86+25-86630566-8568

COINS: 79988548

FAX: +86+25-83317685

MAIL: [email protected]

http://www.fujitsu.com/cn/fnst/

From: Trevor Gamblin <[email protected]>
Sent: Friday, April 9, 2021 3:50 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

On 2021-04-08 1:40 a.m., wangmy wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

---

 meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb}

(97%)

meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +0 -0

similarity index 97%

rename from meta/recipes-support/curl/curl_7.75.0.bb

rename to meta/recipes-support/curl/curl_7.76.0.bb

index 7666c7b608..68315d9f77 100644

--- a/meta/recipes-support/curl/curl_7.75.0.bb

+++ b/meta/recipes-support/curl/curl_7.76.0.bb

meta/recipes-support/curl/curl_7.76.0.bb SRC_URI =

Quoted 9 lines
meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +0 -1
@@ -13,7 +13,7 @@ SRC_URI =
 "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
 
            file://0001-replace-krb5-config-with-pkg-config.patch \
 
 "
 
 
 
-SRC_URI[sha256sum] =

"50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026"

Quoted 2 lines

+SRC_URI[sha256sum] =

"e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a "

Quoted 11 lines

This change fails on the curl-native do_configure step:

| checking for time.h... (cached) yes
| checking for sys/socket.h... (cached) yes checking for struct
| timeval... yes checking run-time libs availability... failed
| configure: error: one or more libs available at link-time are not
| available run-time. Libs used at link-time: -lidn2 -lgsasl -lssl
| -lcrypto -lssl -lcrypto -lz

After a look at the recipe it appears that this may be a dependency on libgsasl.

Could you investigate this and send a v2 with the appropriate PACKAGECONFIG added? You should also include release notes in the patch summary where possible.

Quoted 10 lines

- Trevor

# Curl has used many names over the years...

CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl

daniel_stenberg:curl"

Quoted 16 lines

--

2.25.1

#6 lore raw

Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

Review line 58

Quoted 9 lines · On Fri, Apr 9, 2021 at 12:07 AM [email protected] <[email protected]> wrote:

I'm going to revise it like this. Please see if it's OK:

(quoted diff) +1 -0
@@ -54,6 +54,7 @@
 PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares"
 PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose"
 PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+PACKAGECONFIG[libgsasl] = "--with-libgsasl,--without-libgsasl,libgsasl"
 

looks ok

Review line 69

Quoted 7 lines
(quoted diff) +1 -0
 EXTRA_OECONF = " \
     --disable-libcurl-option \
@@ -65,6 +66,7 @@
     --enable-debug \
     --enable-optimize \
     --disable-curldebug \
+    --without-libgsasl \

this hunk is not needed anymore after adding PACKAGECONFIG, it will be added automatically

Quoted 164 lines
(quoted diff) +0 -0
 "
 
 do_install_append_class-target() {

--
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 148 lines

-----Original Message-----
From: Khem Raj <[email protected]>
Sent: Friday, April 9, 2021 9:53 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: Trevor Gamblin <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

Quoted 2 lines · wangmy

I found libgsasl in meta-tizen, but this repository is very old and has been

deleted from layers.

Quoted 4 lines

Can I specify --without-libgsasl in curl to solve the problem?

I think ideally you can add a packageconfig knob for it and keep it disabled by default.

Quoted 73 lines

--

Best Regards

---------------------------------------------------

Wang Mingyu

Development Dept.I

Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China

TEL: +86+25-86630566-8568

COINS: 79988548

FAX: +86+25-83317685

MAIL: [email protected]

http://www.fujitsu.com/cn/fnst/

From: Trevor Gamblin <[email protected]>
Sent: Friday, April 9, 2021 3:50 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

On 2021-04-08 1:40 a.m., wangmy wrote:

[Please note: This e-mail is from an EXTERNAL e-mail address]

---

 meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb}

(97%)

meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +0 -0

similarity index 97%

rename from meta/recipes-support/curl/curl_7.75.0.bb

rename to meta/recipes-support/curl/curl_7.76.0.bb

index 7666c7b608..68315d9f77 100644

--- a/meta/recipes-support/curl/curl_7.75.0.bb

+++ b/meta/recipes-support/curl/curl_7.76.0.bb

meta/recipes-support/curl/curl_7.76.0.bb SRC_URI =

Quoted 9 lines
meta/recipes-support/curl/curl_7.76.0.bb renamed from meta/recipes-support/curl/curl_7.75.0.bb +0 -1
@@ -13,7 +13,7 @@ SRC_URI =
 "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
 
            file://0001-replace-krb5-config-with-pkg-config.patch \
 
 "
 
 
 
-SRC_URI[sha256sum] =

"50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026"

Quoted 2 lines

+SRC_URI[sha256sum] =

"e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a "

Quoted 11 lines

This change fails on the curl-native do_configure step:

| checking for time.h... (cached) yes
| checking for sys/socket.h... (cached) yes checking for struct
| timeval... yes checking run-time libs availability... failed
| configure: error: one or more libs available at link-time are not
| available run-time. Libs used at link-time: -lidn2 -lgsasl -lssl
| -lcrypto -lssl -lcrypto -lz

After a look at the recipe it appears that this may be a dependency on libgsasl.

Could you investigate this and send a v2 with the appropriate PACKAGECONFIG added? You should also include release notes in the patch summary where possible.

Quoted 10 lines

- Trevor

# Curl has used many names over the years...

CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl

daniel_stenberg:curl"

Quoted 16 lines

--

2.25.1

#7 lore raw

Re: [OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0

In reply to wangmy

Review line 57

Quoted 8 lines · wangmy

I'm going to revise it like this. Please see if it's OK:

(quoted diff) +1 -0
@@ -54,6 +54,7 @@
 PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares"
 PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose"
 PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+PACKAGECONFIG[libgsasl] = "--with-libgsasl,--without-libgsasl,libgsasl"

The list of PACKAGECONFIG options is sorted, so the options for libgsasl should be added between the options for ldaps and libidn, not at the end after the options for zlib.

author
#8 lore raw

PATCH 1/1 file: upgrade 5.39 -> 5.40

In reply to wangmy

0001-src-compress.c-correct-header-define-for-xz-lzma.patch removed since it is included in 5.40

---
 .../file/{file_5.39.bb => file_5.40.bb}       |  5 ++--
 ....c-correct-header-define-for-xz-lzma.patch | 27 -------------------
 2 files changed, 2 insertions(+), 30 deletions(-)
 rename meta/recipes-devtools/file/{file_5.39.bb => file_5.40.bb} (90%)
 delete mode 100644 meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch
meta/recipes-devtools/file/file_5.40.bb renamed from meta/recipes-devtools/file/file_5.39.bb +2 -3
similarity index 90%
rename from meta/recipes-devtools/file/file_5.39.bb
rename to meta/recipes-devtools/file/file_5.40.bb
index abaa8149a3..ec79839bd2 100644
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd
 DEPENDS = "file-replacement-native"
 DEPENDS_class-native = "bzip2-replacement-native"
 
-SRC_URI = "git://github.com/file/file.git \
-           file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch"
+SRC_URI = "git://github.com/file/file.git"
 
-SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e"
+SRCREV = "f49fda6f52a9477d817dbd9c06afab02daf025f8"
 S = "${WORKDIR}/git"
 
 inherit autotools update-alternatives
meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch deleted +0 -27
deleted file mode 100644
index f8ba2f6153..0000000000
@@ -1,27 +0,0 @@
-From ffb6ebdb42590cb9f7d3f5177b7b820a9edc4c81 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Sun, 18 Oct 2020 23:40:42 +0200
-Subject: [PATCH] src/compress.c: correct header define for xz/lzma
-
-Upstream-Status: Submitted [https://github.com/file/file/pull/98]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- src/compress.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/compress.c b/src/compress.c
-index 67f21583..9670b72c 100644
---- a/src/compress.c
-+++ b/src/compress.c
-@@ -71,7 +71,7 @@ typedef void (*sig_t)(int);
- #include <bzlib.h>
- #endif
- 
--#if defined(HAVE_XZLIB_H) && defined(XZLIBSUPPORT)
-+#if defined(HAVE_LZMA_H) && defined(XZLIBSUPPORT)
- #define BUILTIN_XZLIB
- #include <lzma.h>
- #endif
--- 
-2.28.0
-
Signature · 1 line
2.25.1
author
#9 lore raw

PATCH 1/1 go: upgrade 1.16.2 -> 1.16.3

In reply to wangmy
---
 meta/recipes-devtools/go/{go-1.16.2.inc => go-1.16.3.inc}     | 4 ++--
 ...{go-binary-native_1.16.2.bb => go-binary-native_1.16.3.bb} | 2 +-
 ...o-cross-canadian_1.16.2.bb => go-cross-canadian_1.16.3.bb} | 0
 .../go/{go-cross_1.16.2.bb => go-cross_1.16.3.bb}             | 0
 .../go/{go-crosssdk_1.16.2.bb => go-crosssdk_1.16.3.bb}       | 0
 .../go/{go-native_1.16.2.bb => go-native_1.16.3.bb}           | 0
 .../go/{go-runtime_1.16.2.bb => go-runtime_1.16.3.bb}         | 0
 meta/recipes-devtools/go/{go_1.16.2.bb => go_1.16.3.bb}       | 0
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/go/{go-1.16.2.inc => go-1.16.3.inc} (88%)
 rename meta/recipes-devtools/go/{go-binary-native_1.16.2.bb => go-binary-native_1.16.3.bb} (91%)
 rename meta/recipes-devtools/go/{go-cross-canadian_1.16.2.bb => go-cross-canadian_1.16.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-cross_1.16.2.bb => go-cross_1.16.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-crosssdk_1.16.2.bb => go-crosssdk_1.16.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-native_1.16.2.bb => go-native_1.16.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-runtime_1.16.2.bb => go-runtime_1.16.3.bb} (100%)
 rename meta/recipes-devtools/go/{go_1.16.2.bb => go_1.16.3.bb} (100%)
meta/recipes-devtools/go/go-1.16.3.inc renamed from meta/recipes-devtools/go/go-1.16.2.inc +2 -2
similarity index 88%
rename from meta/recipes-devtools/go/go-1.16.2.inc
rename to meta/recipes-devtools/go/go-1.16.3.inc
index e65caf8197..48a8ff5818 100644
@@ -1,7 +1,7 @@
 require go-common.inc
 
 GO_BASEVERSION = "1.16"
-PV = "1.16.2"
+PV = "1.16.3"
 FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
@@ -17,4 +17,4 @@ SRC_URI += "\
     file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
     file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \
 "
-SRC_URI[main.sha256sum] = "37ca14287a23cb8ba2ac3f5c3dd8adbc1f7a54b9701a57824bf19a0b271f83ea"
+SRC_URI[main.sha256sum] = "951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2"
meta/recipes-devtools/go/go-binary-native_1.16.3.bb renamed from meta/recipes-devtools/go/go-binary-native_1.16.2.bb +1 -1
similarity index 91%
rename from meta/recipes-devtools/go/go-binary-native_1.16.2.bb
rename to meta/recipes-devtools/go/go-binary-native_1.16.3.bb
index 4fb060173c..97c0743e1c 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
 PROVIDES = "go-native"
 
 SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "542e936b19542e62679766194364f45141fde55169db2d8d01046555ca9eb4b8"
+SRC_URI[go_linux_amd64.sha256sum] = "951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2"
 SRC_URI[go_linux_arm64.sha256sum] = "6924601d998a0917694fd14261347e3798bd2ad6b13c4d7f2edd70c9d57f62ab"
 
 UPSTREAM_CHECK_URI = "https://golang.org/dl/"
meta/recipes-devtools/go/go-cross-canadian_1.16.3.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.16.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.16.2.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.16.3.bb
meta/recipes-devtools/go/go-cross_1.16.3.bb renamed from meta/recipes-devtools/go/go-cross_1.16.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.16.2.bb
rename to meta/recipes-devtools/go/go-cross_1.16.3.bb
meta/recipes-devtools/go/go-crosssdk_1.16.3.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.16.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.16.2.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.16.3.bb
meta/recipes-devtools/go/go-native_1.16.3.bb renamed from meta/recipes-devtools/go/go-native_1.16.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.16.2.bb
rename to meta/recipes-devtools/go/go-native_1.16.3.bb
meta/recipes-devtools/go/go-runtime_1.16.3.bb renamed from meta/recipes-devtools/go/go-runtime_1.16.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.16.2.bb
rename to meta/recipes-devtools/go/go-runtime_1.16.3.bb
meta/recipes-devtools/go/go_1.16.3.bb renamed from meta/recipes-devtools/go/go_1.16.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go_1.16.2.bb
rename to meta/recipes-devtools/go/go_1.16.3.bb
Signature · 1 line
2.25.1