Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 3 messages Mar 30, 2022

lore
Share & tools
lore
#0 lore raw

cover Patch review

This series updates to a more recent version of buildtools

Tested over the past serveral weeks on autobuilder, most recently:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3445

The following changes since commit bdbc5f2e4eb45e29c8a957963c8431cdc86c12ce:

shared-repos: Use tar instead of rsync for speed (2022-02-22 15:26:49 +0000)

are available in the Git repository at:

git://git.yoctoproject.org/yocto-autobuilder-helper contrib/sakoman
http://git.yoctoproject.org/cgit.cgi/yocto-autobuilder-helper/log/?h=contrib/sakoman

Richard Purdie (2):
config.json: Switch to 3.4 M2 buildtools
config.json: Update to 3.4 buildtools tarball

 config.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 config.json: Switch to 3.4 M2 buildtools

From: Richard Purdie <[email protected]>

This adds lz4c, zstd and pzstd for new tools requirements.

(cherry picked from commit 502bcbbacfd6664d95bafd76fb0e1ee72027e4cb)
---
 config.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
config.json +3 -3
index 348339f..d63963d 100644
@@ -8,9 +8,9 @@
     "BUILD_HISTORY_DIRECTPUSH" : ["poky:morty", "poky:pyro", "poky:rocko", "poky:sumo", "poky:thud", "poky:warrior", "poky:zeus", "poky:dunfell", "poky:master"],
     "BUILD_HISTORY_FORKPUSH" : {"poky-contrib:ross/mut" : "poky:master", "poky:master-next" : "poky:master"},
 
-    "BUILDTOOLS_URL_TEMPLOCAL" : "/srv/autobuilder/autobuilder.yoctoproject.org/pub/non-release/20200309-15/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.0+snapshot-20200309.sh",
-    "BUILDTOOLS_URL_TEMPLOCAL2" : "http://downloads.yoctoproject.org/releases/yocto/milestones/yocto-3.1_M3/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.0+snapshot-20200315.sh",
-    "BUILDTOOLS_URL" : "/srv/autobuilder/autobuilder.yoctoproject.org/pub/non-release/20210214-8/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.2+snapshot-7d38cc8e749aedb8435ee71847e04b353cca541d.sh",
+    "BUILDTOOLS_URL_TEMPLOCAL" : "/srv/autobuilder/autobuilder.yoctoproject.org/pub/non-release/20210214-8/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.2+snapshot-7d38cc8e749aedb8435ee71847e04b353cca541d.sh",
+    "BUILDTOOLS_URL_TEMPLOCAL2" : "https://downloads.yoctoproject.org/releases/yocto/milestones/yocto-3.1_M3/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.0+snapshot-20200315.sh",
+    "BUILDTOOLS_URL" : "https://downloads.yoctoproject.org/releases/yocto/milestones/yocto-3.4_M2/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.3%2Bsnapshot-1ad79313a5c3e6a453fbeb44caac5c5bbad46d3c.sh",
 
     "REPO_STASH_DIR" : "${BASE_HOMEDIR}/git/mirror",
     "TRASH_DIR" : "${BASE_HOMEDIR}/git/trash",
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 config.json: Update to 3.4 buildtools tarball

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Fixes diffoscope-native failing in diffoscope tests on workers using buildtools:

File "/home/pokybuild/yocto-worker/reproducible-ubuntu/build/build-st/tmp/work/x86_64-linux/diffoscope-native/190-r0/recipe-sysroot-native/usr/lib/python3.10/ctypes/__init__.py", line 392, in __getitem__
func = self._FuncPtr((name_or_ordinal, self))
AttributeError: nativepython3: undefined symbol: archive_version_number

Missing or incomplete libarchive module. Try installing your system's 'libarchive' package.

(there is a glibc symbol mismatch hidden in a module compile for libarchive)

(cherry picked from commit f5e89b7431fcde4c54617eca2fbeae43557811d8)
---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
config.json +1 -1
index d63963d..aa7c8be 100644
@@ -10,7 +10,7 @@
 
     "BUILDTOOLS_URL_TEMPLOCAL" : "/srv/autobuilder/autobuilder.yoctoproject.org/pub/non-release/20210214-8/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.2+snapshot-7d38cc8e749aedb8435ee71847e04b353cca541d.sh",
     "BUILDTOOLS_URL_TEMPLOCAL2" : "https://downloads.yoctoproject.org/releases/yocto/milestones/yocto-3.1_M3/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.0+snapshot-20200315.sh",
-    "BUILDTOOLS_URL" : "https://downloads.yoctoproject.org/releases/yocto/milestones/yocto-3.4_M2/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.3%2Bsnapshot-1ad79313a5c3e6a453fbeb44caac5c5bbad46d3c.sh",
+    "BUILDTOOLS_URL" : "https://downloads.yoctoproject.org/releases/yocto/yocto-3.4/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.4.sh",
 
     "REPO_STASH_DIR" : "${BASE_HOMEDIR}/git/mirror",
     "TRASH_DIR" : "${BASE_HOMEDIR}/git/trash",
Signature · 1 line
2.25.1