Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes and improvements #27

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Fixes and improvements #27

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fd1207b
gbmake: quoting and formatting of echo strings
jjakob Jan 10, 2020
d37574b
gbmake: quote variables where possible
jjakob Jan 10, 2020
61c54ea
gbmake: make debian suite and mirror configurable
jjakob Jan 10, 2020
b522ea3
mkinitramfs: quote variables where possible
jjakob Jan 10, 2020
0212baa
mkinitrams: make dropbearkey work in chroot
jjakob Jan 11, 2020
0b60b88
init: add ability to set led trigger
jjakob Jan 11, 2020
f00a71d
init: set status led to fast blink before switch_root
jjakob Jan 11, 2020
ad2b231
initramfs/config: add udev rule for LEDs to target
jjakob Jan 12, 2020
846a1ce
initramfs/config: ask about which Debian suite and mirror to use
jjakob Jan 12, 2020
ac15d86
initramfs/config: move debootstrap include packages to variable
jjakob Jan 12, 2020
ded9bb0
initramfs/config: remove unneeded libnl packages from debootstrap
jjakob Jan 12, 2020
1f6c0cb
initramfs/config: add some packages to include in target
jjakob Jan 12, 2020
b11648d
initramfs/init: replace dropbearkey with dropbear -R
jjakob Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions scripts/gbmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ gnubee_model() {
case `grep machine /proc/cpuinfo` in
*GB-PC1* ) prefix=gbpc1;;
*GB-PC2* ) prefix=gbpc2;;
* ) echo UNKNOWN; return 1
* ) echo "UNKNOWN"; return 1
esac
if [ ! -c /dev/mtd0 ]; then
echo UNKNOWN; return 1
echo "UNKNOWN"; return 1
fi
if [ ! -f Makefile ]; then
echo "No-version"; return 1
Expand All @@ -72,9 +72,9 @@ gnubee_defconfig() {
case $mach in
"" | defconfig ) # guess
if mach=`gnubee_model`; then
echo Using config $mach
echo "I: Using config $mach"
Copy link
Contributor

@vincele vincele Dec 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm no fan of those one-letter prefixes, what does the "I" stand for ? "E" or "W", I can guess... But I also prefer the longer, more explicit ones.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I: is info. Doing this is consistent with the messages that the debian installer produces so it certainly makes sense for the messages generated by the "config" script.
It is less obvious that it would be appropriate for the gbmake script, but maybe it does and I'm certainly open to making it clearer.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK debian consistency is an accepted excuse ;-)

else
echo >&2 Cannot guess machine type
echo >&2 "W: Cannot guess machine type"
mach=
fi
esac
Expand All @@ -83,8 +83,8 @@ gnubee_defconfig() {
cp "$GNUBEE_CONFIG_DIR/$mach" "$GNUBEE_KERNEL_OBJECTS/.config"
make O="$GNUBEE_KERNEL_OBJECTS" oldconfig
else
[ -n "$mach" ] && echo >&2 "Config file '$mach' does not exist"
echo >&2 "Please choose one of:"
[ -n "$mach" ] && echo >&2 "E: Config file '$mach' does not exist"
echo >&2 "E: Please choose one of:"
ls -C "$GNUBEE_CONFIG_DIR" | sed 's/^/ /' >&2
exit 1
fi
Expand Down Expand Up @@ -115,14 +115,14 @@ gnubee_chroot() {
sed -n -e 's,^.*\(http://ftp.debian.org/[^"]*\)".*,\1,p'`
case $URL in
http:*_all.deb ) ;;
* ) echo >&2 ERROR cannot find deb file for debootstrap, sorry.
* ) echo >&2 "E: cannot find deb file for debootstrap"
exit 1
esac
rm -f $deb/*
wget -O $deb/debootstrap.deb "$URL"
(cd $deb; deb_data debootstrap.deb )
(cd $deb; deb_data debootstrap.deb)
if [ ! -f $deb/usr/sbin/debootstrap ]; then
echo >&2 ERROR failed to download debootstrap package
echo >&2 "E: failed to download debootstrap package"
exit 1
fi
fi
Expand All @@ -144,9 +144,9 @@ gnubee_chroot() {
if [ ! -e $deb/chroot/debootstrap/debpaths ]; then
return 1
fi
for i in $(echo $EXTRA | tr , ' '); do
for i in $(echo "$EXTRA" | tr , ' '); do
(cd $deb/chroot
echo I: Extracting $i...
echo "I: Extracting $i..."
p=$(awk -v p=$i '$1 == p {print $2}' debootstrap/debpaths)
deb_data ./$p
)
Expand All @@ -158,18 +158,18 @@ gnubee_initramfs() {
i=${GNUBEE_INITRAMFS_TREE}
mkdir -p "$i"
case `realpath "$i"` in
/ ) echo >&2 Cannot use root as initramfs tree.; exit 1
/ ) echo >&2 "E: Cannot use root as initramfs tree"; exit 1
esac

rm -rf "$i"; mkdir "$i"
mkdir -p "$GNUBEE_KERNEL_OBJECTS"
$gbtools/scripts/mkinitramfs "$i" "$GNUBEE_KERNEL_OBJECTS/initramfs-files.txt"
echo "initramfs: $(du -sh "$i")"
echo "I: initramfs: $(du -sh "$i")"
}

gnubee_modules() {
case `realpath $GNUBEE_INITRAMFS_TREE/lib` in
/lib ) echo >&2 Cannot use root as initramfs tree.; exit 1
/lib ) echo >&2 "E: Cannot use root as initramfs tree"; exit 1
esac
rm -rf "$GNUBEE_INITRAMFS_TREE"/lib/modules/[1-9]*
make O="$GNUBEE_KERNEL_OBJECTS" \
Expand All @@ -185,7 +185,7 @@ gnubee_modules() {

gnubee_headers() {
case `realpath $GNUBEE_BUILD_DIR/` in
/usr | / ) echo >&2 Cannot build to /usr or /.; exit 1
/usr | / ) echo >&2 "E: Cannot build to /usr or /"; exit 1
esac
rm -rf "$GNUBEE_BUILD_DIR/include"
make O="$GNUBEE_KERNEL_OBJECTS" INSTALL_HDR_PATH="$GNUBEE_BUILD_DIR" \
Expand Down Expand Up @@ -220,7 +220,7 @@ gnubee_extern() {

gnubee_bin() {
if [ ! -f "$GNUBEE_INITRAMFS_TREE/init" ]; then
echo >&2 "Please run 'gbmake initramfs' first"
echo >&2 "E: Please run 'gbmake initramfs' first"
exit 1
fi
make O="$GNUBEE_KERNEL_OBJECTS" uImage.bin || exit 1
Expand Down Expand Up @@ -282,7 +282,7 @@ case $1 in

* )
if [ ! -f "$GNUBEE_KERNEL_OBJECTS/.config" ]; then
echo >&2 Please run gbmake defconfig_XX first
echo >&2 "E: Please run gbmake defconfig_XX first"
exit 1
fi
make O="$GNUBEE_KERNEL_OBJECTS" ${1+"$@"}
Expand Down