[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-391-g65667395f

[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  65667395fd7a221920b623c71ad3a4e6ae96d895 (commit)
      from  7401570584c9b232594ad9791508b8ba51e87318 (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 65667395fd7a221920b623c71ad3a4e6ae96d895
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Jan 15 17:13:11 2024 +0100

    [BUILDROOT] Bump BR to 2023.11.1

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

Summary of changes:
 Makefile                                           |  4 +-
 .../424-package-tree-update-_SITE-URL.patch        | 61 ----------------------
 patches/buildroot/2023.11/cleanup_buildroot.sh     |  2 -
 3 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch

diff --git a/Makefile b/Makefile
index 1d4619f2f..cf59c60e8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,9 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2023.11
-BUILDROOT_MINOR_VERSION ?=
+BUILDROOT_MINOR_VERSION ?= 1
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
-BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION)-$(BUILDROOT_MINOR_VERSION)
+BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION)
 endif
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
deleted file mode 100644
index 2d56b1e9c..000000000
--- a/patches/buildroot/2023.11/424-package-tree-update-_SITE-URL.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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 0a99a1c2f..999816294 100755
--- a/patches/buildroot/2023.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2023.11/cleanup_buildroot.sh
@@ -82,8 +82,6 @@ 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