From bf7981f6a4fa226f3bfde119395f6ec7564266c7 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Wed, 28 May 2025 14:44:52 +0100
Subject: [PATCH 1/2] stage4: remove stage4/03-bookshelf

---
 stage4/03-bookshelf/00-run.sh        | 15 ---------------
 stage4/03-bookshelf/files/.gitignore |  1 -
 2 files changed, 16 deletions(-)
 delete mode 100755 stage4/03-bookshelf/00-run.sh
 delete mode 100644 stage4/03-bookshelf/files/.gitignore

diff --git a/stage4/03-bookshelf/00-run.sh b/stage4/03-bookshelf/00-run.sh
deleted file mode 100755
index d62e70e..0000000
--- a/stage4/03-bookshelf/00-run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-BOOKSHELF_URL="https://magpi.raspberrypi.com/bookshelf.xml"
-GUIDE_URL="$(curl -s "$BOOKSHELF_URL" | awk -F '[<>]' "/<TITLE>Raspberry Pi Beginner's Guide .*<\/TITLE>/ {f=1; next} f==1 && /PDF/ {print \$3; exit}")"
-OUTPUT="$(basename "$GUIDE_URL" | cut -f1 -d'?')"
-
-if [ ! -f "files/$OUTPUT" ]; then
-	rm files/*.pdf -f
-	curl -s "$GUIDE_URL" -o "files/$OUTPUT"
-fi
-
-file "files/$OUTPUT" | grep -q "PDF document"
-
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf"
-install -v -o 1000 -g 1000 -m 644 "files/$OUTPUT" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf/"
diff --git a/stage4/03-bookshelf/files/.gitignore b/stage4/03-bookshelf/files/.gitignore
deleted file mode 100644
index a136337..0000000
--- a/stage4/03-bookshelf/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pdf

From 26ea1c19ffd68c31552e46e024986155a68e139b Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Wed, 28 May 2025 14:47:57 +0100
Subject: [PATCH 2/2] stage4: remove alacarte and alacarte-specific fixes

---
 stage4/00-install-packages/00-packages | 2 +-
 stage4/02-extras/00-run.sh             | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100755 stage4/02-extras/00-run.sh

diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index 511941c..453a2fd 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -6,7 +6,7 @@ debian-reference-en dillo
 raspberrypi-net-mods raspberrypi-ui-mods
 python3-pip
 python3-numpy
-alacarte rc-gui sense-hat
+rc-gui sense-hat
 tree
 libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
 geany
diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh
deleted file mode 100755
index 6a24f82..0000000
--- a/stage4/02-extras/00-run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-#Alacarte fixes
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/applications"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/desktop-directories"