Skip to content

Commit 9dbd420

Browse files
kostyakozkokostiantynkozko
authored andcommitted
buildroot: Final fixes from real-world testing
- Add mtools to required packages (needed for genimage) - Fix bar package version: v1.0 → v1.1, bar-1.0.tar.xz → bar-1.1.tar.gz - Fix readelf path: output/host/usr/bin → output/host/bin - Fix DTS patch node name consistency
1 parent e6d9e93 commit 9dbd420

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

lab-data/buildroot-beagleplay/buildroot-rootfs/linux/0002-Add-nunchuk-node-in-beagleplay-dts.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Signed-off-by: Bootlin <feedback@bootlin.com>
1515
diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
1616
--- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
1717
+++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
18-
@@ -616,3 +616,10 @@
19-
&mcasp1 {
20-
status = "disabled";
18+
@@ -633,3 +633,10 @@
19+
0 0 0 0
20+
>;
2121
};
2222
+
2323
+&main_i2c3 {

labs/buildroot-advanced-packages-beagleplay/buildroot-advanced-packages-beagleplay.tex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ \section{Finalize the packaging of {\tt bar}}
111111
\section{{\tt bar} packaging: {\em libconfig} dependency}
112112

113113
But there's some more things we can do to improve \code{bar}'s
114-
packaging. If you go to \code{output/build/bar-1.0} and run
114+
packaging. If you go to \code{output/build/bar-1.1} and run
115115
\code{./configure --help}, you will see that it supports a
116116
\code{--with-libconfig} option. And indeed, \code{bar}'s \code{README}
117117
file also mentions \code{libconfig} as an optional dependency.
@@ -130,7 +130,7 @@ \section{{\tt bar} packaging: {\em libconfig} dependency}
130130
It fails to build with messages like \code{error: unknown type name
131131
‘config_t’}. Seems like the author of \code{bar} messed up and forgot
132132
to include the appropriate header file. Let's try to fix this: go to
133-
\code{bar}'s source code in \code{output/build/bar-1.0} and edit
133+
\code{bar}'s source code in \code{output/build/bar-1.1} and edit
134134
\code{src/main.c}. Right after the \code{#if defined(USE_LIBCONFIG)},
135135
add a \code{#include <libconfig.h>}. Save, and restart the build of
136136
\code{bar}. Now it builds fine!
@@ -155,11 +155,11 @@ \section{{\tt bar} packaging: {\em libconfig} dependency}
155155

156156
Once the cloning is done, go inside the \code{bar} directory, and
157157
create a new branch named \code{buildroot}, which starts the
158-
\code{v1.0} tag (which matches the \code{bar-1.0.tar.xz} tarball we're
158+
\code{v1.1} tag (which matches the \code{bar-1.1.tar.gz} tarball we're
159159
using):
160160

161161
\begin{bashinput}
162-
git branch buildroot v1.0
162+
git branch buildroot v1.1
163163
\end{bashinput}
164164

165165
Move to this newly created branch\footnote{Yes, we can use \code{git
@@ -192,7 +192,7 @@ \section{{\tt bar} packaging: {\em libconfig} dependency}
192192
\code{libconfig.so} by doing:
193193

194194
\begin{bashinput}
195-
./output/host/usr/bin/aarch64-linux-readelf -d output/target/usr/bin/bar
195+
./output/host/bin/aarch64-linux-readelf -d output/target/usr/bin/bar
196196
\end{bashinput}
197197

198198
On the target, test \code{bar}. Then, create a file called

labs/buildroot-basic-beagleplay/buildroot-basic-beagleplay.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ \section{Setup}
2121
2222
\begin{bashinput}
2323
sudo apt install sed make binutils gcc g++ bash patch \
24-
gzip bzip2 perl tar cpio python3 unzip rsync wget libncurses-dev
24+
gzip bzip2 perl tar cpio python3 unzip rsync wget libncurses-dev mtools
2525
\end{bashinput}
2626
2727
\section{Download Buildroot}

0 commit comments

Comments
 (0)