Skip to content

Commit 8023055

Browse files
committed
feat: add debug script to inspect a broken rootfs
Signed-off-by: ZHANG Yuntian <yt@radxa.com>
1 parent fe7aac1 commit 8023055

File tree

4 files changed

+32
-0
lines changed

4 files changed

+32
-0
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@
2222

2323
# Local rsdk config
2424
.rsdk.json
25+
26+
# Log files
27+
/*.log
28+
/wget-log*

src/libexec/rsdk/build/fixup-apt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/usr/bin/env bash
2+
3+
#
4+
# This is a debug helper script to fix up
5+
# apt sources from interrupted rsdk build.
6+
#
7+
# It can be safely removed from a normal system.
8+
#
9+
10+
apt update
11+
apt install -y curl
12+
13+
keyring="$(mktemp)"
14+
version="$(curl -L https://github.com/radxa-pkg/radxa-archive-keyring/releases/latest/download/VERSION)"
15+
curl -L --output "$keyring" \
16+
"https://github.com/radxa-pkg/radxa-archive-keyring/releases/latest/download/radxa-archive-keyring_${version}_all.deb"
17+
dpkg -i "$keyring"
18+
rm -f "$keyring"
19+
20+
sed -i 's|^deb|deb [signed-by="/usr/share/keyrings/radxa-archive-keyring.gpg"]|g' "$1"/etc/apt/sources.list.d/*-radxa*.list
21+
echo "deb [trusted=yes] file:///srv/local-apt-repository ./" >"/etc/apt/sources.list.d/99-local-apt-repository.list"
22+
23+
apt update

src/libexec/rsdk/rsdk-build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ generate_rootfs() {
9191
mkdir -p "$RSDK_TEMP/debs"
9292
fi
9393

94+
# Copy additional helpers
95+
cp -R "$SCRIPT_DIR/../../libexec/rsdk/build/." "$RSDK_TEMP/build"
96+
9497
jsonnet "${JSONNET_ARGS[@]}" "$SCRIPT_DIR/../../share/rsdk/build/rootfs.jsonnet" -o "$RSDK_TEMP/rootfs.json"
9598
if [[ $RSDK_OPTION_DEBUG == "true" ]]; then
9699
cat "$RSDK_TEMP/rootfs.json"

src/share/rsdk/build/mod/additional_repos.libjsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function(suite, radxa_mirror, radxa_repo_suffix, product, temp_dir, install_vsco
2626
set -e
2727
mkdir -p "$1/srv/"
2828
cp -R "%(temp_dir)s/debs/." "$1/srv/local-apt-repository"
29+
cp -R "%(temp_dir)s/build/." "$1/"
2930
cd "$1/srv/local-apt-repository"
3031
apt-ftparchive packages . > ./Packages
3132
apt-ftparchive -o "APT::FTPArchive::Release::Origin=local-apt-repository" release . > ./Release
@@ -120,6 +121,7 @@ function(suite, radxa_mirror, radxa_repo_suffix, product, temp_dir, install_vsco
120121
rm "$1/etc/apt/sources.list.d/99-local-apt-repository.list"
121122
rm "$1/srv/local-apt-repository/Packages"
122123
rm "$1/srv/local-apt-repository/Release"
124+
rm "$1"/fixup-*
123125
|||,
124126
],
125127
}

0 commit comments

Comments
 (0)