From 313414b92c2501a2bc123ffa1b6383dca464de05 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 8 Jun 2026 22:38:49 +0200
Subject: [PATCH] Update for 2026.05

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 CHANGES                    | 10 ++++++++++
 Makefile                   |  4 ++--
 docs/website/download.html | 20 +++++++++++---------
 docs/website/news.html     | 18 ++++++++++++++++++
 support/misc/Vagrantfile   |  2 +-
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9c5c08a360..c81ed63371 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+2026.05, released June 8th, 2026
+
+	Various fixes.
+
+	Defconfigs: Correct legal-info for at91sam9x5ek*
+	(at91bootstrap3) and Arcturus ucp1020 (Linux)
+
+	Updated/fixed packages: jailhouse, libde265, libinput, libusb,
+	php, python3, runc
+
 2026.05-rc4, released June 4th, 2026
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 63356e6901..93afd97507 100644
--- a/Makefile
+++ b/Makefile
@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2026.05-rc4
+export BR2_VERSION := 2026.05
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1780580000
+BR2_VERSION_EPOCH = 1780950000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
diff --git a/docs/website/download.html b/docs/website/download.html
index c7d15b2570..e2762f01af 100644
--- a/docs/website/download.html
+++ b/docs/website/download.html
@@ -16,6 +16,7 @@
           <th>Latest release date</th>
           <th colspan="2">Downloads</td>
         </tr>
+<!--
         <tr>
           <th>Candidate</th>
           <th>2026.05.x</th>
@@ -42,30 +43,31 @@
             <a href="/downloads/buildroot-2026.05-rc4.tar.xz.sign">[PGP sig]</a>
           </td>
         </tr>
+-->
         <tr>
           <th>Stable</th>
-          <th>2026.02.x</th>
-          <td>June 2026</td>
+          <th>2026.05.x</th>
+          <td>September 2026</td>
           <td>
-            2026.02.2<br/>
-            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2026.02.2/CHANGES">
+            2026.05<br/>
+            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2026.05/CHANGES">
               Changelog
             </a>
           </td>
-          <td>2026-05-20</td>
+          <td>2026-06-08</td>
           <td>
-            <a href="/downloads/buildroot-2026.02.2.tar.gz">
+            <a href="/downloads/buildroot-2026.05.tar.gz">
               <img src="images/zip.png" width="24" alt="">
               .tar.gz
             </a><br/>
-            <a href="/downloads/buildroot-2026.02.2.tar.gz.sign">[PGP sig]</a>
+            <a href="/downloads/buildroot-2026.05.tar.gz.sign">[PGP sig]</a>
           </td>
           <td>
-            <a href="/downloads/buildroot-2026.02.2.tar.xz">
+            <a href="/downloads/buildroot-2026.05.tar.xz">
               <img src="images/package.png" width="24" alt="">
               .tar.xz
             </a><br/>
-            <a href="/downloads/buildroot-2026.02.2.tar.xz.sign">[PGP sig]</a>
+            <a href="/downloads/buildroot-2026.05.tar.xz.sign">[PGP sig]</a>
           </td>
         </tr>
         <tr>
diff --git a/docs/website/news.html b/docs/website/news.html
index 3c9f914f0e..7756b0a1fd 100644
--- a/docs/website/news.html
+++ b/docs/website/news.html
@@ -9,6 +9,24 @@
 <h2>News</h2>
 <ul class="timeline">
 
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2026.05 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>8 June 2026</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The stable 2026.05 release is out - Thanks to everyone
+	  contributing and testing the release candidates. See the
+	  <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2026.05/CHANGES">CHANGES</a>
+	  file for more details
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2026.05.tar.xz">2026.05 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
   <li>
     <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
     <div class="timeline-panel">
diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile
index 0185892c8a..6e5fad3202 100644
--- a/support/misc/Vagrantfile
+++ b/support/misc/Vagrantfile
@@ -5,7 +5,7 @@
 ################################################################################
 
 # Buildroot version to use
-RELEASE='2026.02'
+RELEASE='2026.05'
 
 ### Change here for more memory/cores ###
 VM_MEMORY=2048