From 57b93eb705f3057ec9fddca0dbae6e2c46ffaec5 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Fri, 18 Mar 2016 15:12:23 +1100
Subject: bare/qemu: Use git if the RSB is not release or without a release
 URL.

Updates #2661.
---
 bare/config/bare-config.cfg      | 2 +-
 bare/config/devel/qemu-git-1.cfg | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bare/config/bare-config.cfg b/bare/config/bare-config.cfg
index e042e47..2633cd7 100644
--- a/bare/config/bare-config.cfg
+++ b/bare/config/bare-config.cfg
@@ -5,7 +5,7 @@
 #
 # The RTEMS http git URL.
 #
-%define rtems_version         4.12
+%define rtems_version         4.11
 %define rtems_http_git        http://git.rtems.org
 %define rtems_git_tools       %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version}
 %define bare_binutils_patches %{rtems_git_tools}/binutils
diff --git a/bare/config/devel/qemu-git-1.cfg b/bare/config/devel/qemu-git-1.cfg
index 992d4a1..dc011de 100644
--- a/bare/config/devel/qemu-git-1.cfg
+++ b/bare/config/devel/qemu-git-1.cfg
@@ -16,9 +16,11 @@
 %define qemu_version 42d58e7c6760cb9c55627c28ae538e27dcf2f144
 
 #
-# Qemu is from GIT.
+# Qemu is from GIT unless the RSB has been released.
 #
-%if %{rsb_released}
+# We need to handle the release process
+#
+%if %{rsb_released} && %{!defined without_release_url}
  %source set qemu %{rtems_release_url}/%{rtems_version}/sources/qemu-git-42d58e7.tar.xz
 %else
  %source set qemu git://git.qemu-project.org/qemu.git?pull?checkout=%{qemu_version}?submodule=dtc
-- 
cgit v1.2.3