From b7d8ce5b181a55f25ca997553e558c5854140363 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 30 May 2022 18:27:29 +0200
Subject: [PATCH] Update for 2022.05-rc2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 CHANGES                    | 18 ++++++++++++++++++
 Makefile                   |  4 ++--
 docs/website/download.html | 18 +++++++++---------
 docs/website/news.html     | 21 +++++++++++++++++++++
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2d08c1354f..5d8eb2f563 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,21 @@
+2022.05-rc2, released May 30th, 2022
+
+	Fixes all over the tree.
+
+	Defconfigs: qemu_ppc64*: Use binutils 2.36.1 to fix build
+	issue, qemu_arm_vexpress_tz: Fix optee-os build issue,
+	qemu_arm_versatile_nommu: Drop now that nommu for ARMv5 is no
+	longer available
+
+	Updated/fixed packages: dhcp, edk2, gcr, glibc, i2pd, janet,
+	janus-gateway, libfreeimage, libnftnl, libnss, libodb-boost,
+	libostree, libwebsockets, linux-tools, midori, ntfs-3g, ola,
+	optee-client, pcsc-lite, pipewire, python-flask,
+	python-service-identity, python-werkzeug, qemu, rng-tools,
+	rockchip-mali, strace, xdriver_xf86-video-amdgpu
+
+	Removed packages: ktap
+
 2022.05-rc1, released May 18th, 2022
 
 	Fixes all over the tree and new features.
diff --git a/Makefile b/Makefile
index b46f165081..24f8a7338f 100644
--- a/Makefile
+++ b/Makefile
@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2022.05-rc1
+export BR2_VERSION := 2022.05-rc2
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1652864000
+BR2_VERSION_EPOCH = 1653928000
 
 # 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 8f3f91c366..1405e9b6e1 100644
--- a/docs/website/download.html
+++ b/docs/website/download.html
@@ -76,37 +76,37 @@
 	</div>
       </div>
 -->
-      <h3 style="text-align: center;">Latest release candidate: <b>2022.05-rc1</b></h3>
+      <h3 style="text-align: center;">Latest release candidate: <b>2022.05-rc2</b></h3>
       <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2022.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2022.05-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2022.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2022.05-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2022.05-rc1.tar.gz">buildroot-2022.05-rc1.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2022.05-rc1.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2022.05-rc2.tar.gz">buildroot-2022.05-rc2.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2022.05-rc2.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2022.05-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2022.05-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2022.05-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2022.05-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2022.05-rc1.tar.xz">buildroot-2022.05-rc1.tar.xz</a></h3>
-	  <p><a href="/downloads/buildroot-2022.05-rc1.tar.xz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2022.05-rc2.tar.xz">buildroot-2022.05-rc2.tar.xz</a></h3>
+	  <p><a href="/downloads/buildroot-2022.05-rc2.tar.xz.sign">PGP signature</a></p>
 	</div>
       </div>
 
diff --git a/docs/website/news.html b/docs/website/news.html
index 3294327754..4b75b68a83 100644
--- a/docs/website/news.html
+++ b/docs/website/news.html
@@ -9,6 +9,27 @@
 <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">2022.05-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>30 May 2022</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>2022.05-rc2 has been released with more cleanups and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.05-rc2">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2022.05-rc2.tar.xz">2022.05-rc2
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
   <li>
     <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
     <div class="timeline-panel">