From 592d0af50d071073b12e60100f2eda91cfd2e3b7 Mon Sep 17 00:00:00 2001
From: Antonin Godard <antonin.godard@bootlin.com>
Date: Mon, 9 Dec 2024 09:45:10 +0100
Subject: [PATCH] labs: yocto-devtool: fix remove commands after scarthgap
 updates

After the scarthgap update, devtool does not leave the source directory
of the hello program in workspace/sources, but moves it in
workspace/attic/sources. Replace the rm commands accordingly.

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 labs/yocto-devtool/yocto-devtool.tex | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/labs/yocto-devtool/yocto-devtool.tex b/labs/yocto-devtool/yocto-devtool.tex
index 00964d05a3..c0066448b2 100644
--- a/labs/yocto-devtool/yocto-devtool.tex
+++ b/labs/yocto-devtool/yocto-devtool.tex
@@ -180,12 +180,12 @@ \section{Generate a new recipe}
 \end{bashinput}
 
 Now check the content of the workspace: the hello recipe is not there
-anymore. However the source code of the GNU Hello program as still in the
-\code{workspace/sources/hello} directory. Devtool does not delete it, in
+anymore. However the source code of the GNU Hello program was moved in the
+\code{workspace/attic/sources} directory. Devtool does not delete it, in
 case you have done any valuable work in it that you still haven't saved to
 a patch. As it is not your case, just delete it:
 \begin{bashinput}
-rm -fr workspace/sources/hello/
+rm -fr workspace/attic/sources/hello.<timestamp>/
 \end{bashinput}
 
 Now double check that the recipe is still building correctly in the
@@ -284,7 +284,7 @@ \section{Modify a recipe}
 
 \begin{bashinput}
 devtool reset hello
-rm -fr workspace/sources/hello/
+rm -fr workspace/attic/sources/hello.<timestamp>/
 \end{bashinput}
 
 \section{Upgrade a recipe to the latest mainline version}
@@ -323,7 +323,7 @@ \section{Upgrade a recipe to the latest mainline version}
 Now check that everything works as done earlier, then apply your changes to the layer.
 \begin{bashinput}
 devtool finish hello ../meta-bootlinlabs/
-rm -fr workspace/sources/hello/
+rm -fr workspace/attic/sources/hello.<timestamp>/
 \end{bashinput}
 
 Now the meta-bootlinlabs layer contains the latest version of GNU Hello!