[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-389-g60f6c9b69

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  60f6c9b694529ad1f764a6d4a720565fb50cca02 (commit)
       via  93c79b27498676e46ec81cbd393e8243d7965f97 (commit)
      from  06d2e893315efacf51332eb1876ce04ce4dc33bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60f6c9b694529ad1f764a6d4a720565fb50cca02
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Dec 12 19:23:24 2023 +0100

    .gitlab-ci.yml: generate build.log when job fails

commit 93c79b27498676e46ec81cbd393e8243d7965f97
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Dec 12 14:52:48 2023 +0100

    [BUILDROOT] 2023.11: patch to fix tree downloading

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

Summary of changes:
 .gitlab-ci.yml                                     | 13 ++++-
 .../424-package-tree-update-_SITE-URL.patch        | 61 ++++++++++++++++++++++
 patches/buildroot/2023.11/cleanup_buildroot.sh     |  2 +
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 986789f70..13da20946 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,12 +24,23 @@ stages:
       - buildroot/downloads
   script:
     - make "$ARMADEUS_PLATFORM"_autoconf
-    - make
+    - |
+        make > >(tee build.log |grep '>>>') 2>&1 || {
+            echo "Build failed"
+            tail -200 build.log
+            exit 1
+        }
     - cp -r -L buildroot/output/images output-images
   parallel:
     matrix:
       - ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10]
   timeout: 4h
+  artifacts:
+    name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-build.log"
+    when: on_failure
+    paths:
+      - build.log
+    expire_in: 1 week
 
 build:
   except:
diff --git a/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch b/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
new file mode 100644
index 000000000..2d56b1e9c
--- /dev/null
+++ b/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
@@ -0,0 +1,61 @@
+From c66303eea3db1ae4c0737b435265132fa957a2b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 12 Dec 2023 14:38:11 +0100
+Subject: [PATCH 1/1] package/tree: update _SITE URL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The current TREE_SITE URL doesn't work anymore.
+Moreover the README states:
+"
+The main distribution site for tree is here:
+http://oldmanprogrammer.net/source.php?dir=projects/tree
+
+Backup GIT sites are:
+https://gitlab.com/OldManProgrammer/unix-tree
+https://github.com/Old-Man-Programmer/tree
+
+Old site for as long as it lasts:
+http://mama.indstate.edu/users/ice/tree/
+ftp://mama.indstate.edu/linux/tree/
+"
+
+Use http://oldmanprogrammer.net/tar/tree/ for TREE_SITE
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/tree/Config.in | 2 +-
+ package/tree/tree.mk   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/tree/Config.in b/package/tree/Config.in
+index 234995f109f4..4821b5896095 100644
+--- a/package/tree/Config.in
++++ b/package/tree/Config.in
+@@ -7,7 +7,7 @@ config BR2_PACKAGE_TREE
+ 	  dircolors if the LS_COLORS environment variable is set and
+ 	  output is to tty.
+ 
+-	  http://mama.indstate.edu/users/ice/tree/
++	  http://oldmanprogrammer.net/source.php?dir=projects/tree
+ 
+ comment "tree needs a toolchain w/ wchar"
+ 	depends on !BR2_USE_WCHAR
+diff --git a/package/tree/tree.mk b/package/tree/tree.mk
+index 83a427b74d37..479a172a72b8 100644
+--- a/package/tree/tree.mk
++++ b/package/tree/tree.mk
+@@ -6,7 +6,7 @@
+ 
+ TREE_VERSION = 2.1.1
+ TREE_SOURCE = tree-$(TREE_VERSION).tgz
+-TREE_SITE = http://mama.indstate.edu/users/ice/tree/src
++TREE_SITE = http://oldmanprogrammer.net/tar/tree
+ TREE_LICENSE = GPL-2.0+
+ TREE_LICENSE_FILES = LICENSE
+ 
+-- 
+2.41.0
+
diff --git a/patches/buildroot/2023.11/cleanup_buildroot.sh b/patches/buildroot/2023.11/cleanup_buildroot.sh
index 999816294..0a99a1c2f 100755
--- a/patches/buildroot/2023.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2023.11/cleanup_buildroot.sh
@@ -82,6 +82,8 @@ rm -rf buildroot/package/snes9x/snes9x.mk
 rm -rf buildroot/package/thingerio/Config.in
 rm -rf buildroot/package/thingerio/thingerio.hash
 rm -rf buildroot/package/thingerio/thingerio.mk
+rm -rf buildroot/package/tree/Config.in
+rm -rf buildroot/package/tree/tree.mk
 rm -rf buildroot/package/wpa_supplicant/Config.in
 rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
 rm -rf buildroot/package/xc3sprog/Config.in


hooks/post-receive
-- 
armadeus