mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-04 18:35:24 +01:00
6ed2e09f3a
- This idea originates from very early in the project and was, at the
time, a very easy way to categorise things.
- Now, it doesn't really make much sense - it is fairly arbitary, often
occuring when there is a change in kernel, but not from builder-hex0
to fiwix, and sysb is in reality completely unnecessary.
- In short, the sys* stuff is a bit of a mess that makes the project
more difficult to understand.
- This puts everything down into one folder and has a manifest file that
is used to generate the build scripts on the fly rather than using
coded scripts.
- This is created in the "seed" stage.
stage0-posix -- (calls) --> seed -- (generates) --> main steps
Alongside this change there are a variety of other smaller fixups to the
general structure of the live-bootstrap rootfs.
- Creating a rootfs has become much simpler and is defined as code in
go.sh. The new structure, for an about-to-be booted system, is
/
-- /steps (direct copy of steps/)
-- /distfiles (direct copy of distfiles/)
-- all files from seed/*
-- all files from seed/stage0-posix/*
- There is no longer such a thing as /usr/include/musl, this didn't
really make any sense, as musl is the final libc used. Rather, to
separate musl and mes, we have /usr/include/mes, which is much easier
to work with.
- This also makes mes easier to blow away later.
- A few things that weren't properly in packages have been changed;
checksum-transcriber, simple-patch, kexec-fiwix have all been given
fully qualified package names.
- Highly breaking change, scripts now exist in their package directory
but NOT WITH THE packagename.sh. Rather, they use pass1.sh, pass2.sh,
etc. This avoids manual definition of passes.
- Ditto with patches; default directory is patches, but then any patch
series specific to a pass are named patches-passX.
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
Our version of gawk does not seem to like printing, at least in the way that
|
|
this attempts to use it. Instead, make it print to console and use working
|
|
bash redirects.
|
|
|
|
--- lib/et/compile_et.sh.in 2022-05-18 19:26:17.182054784 +1000
|
|
+++ lib/et/compile_et.sh.in 2022-05-18 19:30:16.489294776 +1000
|
|
@@ -44,14 +44,14 @@
|
|
exit 1;
|
|
fi
|
|
|
|
-$AWK -f "${DIR}/et_h.awk" "outfile=${BASE}.h.$$" "outfn=${BASE}.h" "$ROOT.et"
|
|
+$AWK -f "${DIR}/et_h.awk" "$ROOT.et" > ${BASE}.h
|
|
if test -f ${BASE}.h && cmp -s ${BASE}.h.$$ ${BASE}.h ; then
|
|
rm -f ${BASE}.h.$$
|
|
else
|
|
mv -f ${BASE}.h.$$ ${BASE}.h
|
|
chmod a-w ${BASE}.h
|
|
fi
|
|
-$AWK -f "${DIR}/et_c.awk" "outfile=${BASE}.c.$$" "outfn=${BASE}.c" "$ROOT.et"
|
|
+$AWK -f "${DIR}/et_c.awk" "$ROOT.et" > ${BASE}.c
|
|
if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then
|
|
rm -f ${BASE}.c.$$
|
|
else
|
|
--- lib/ss/mk_cmds.sh.in 2022-05-18 19:33:16.024962919 +1000
|
|
+++ lib/ss/mk_cmds.sh.in 2022-05-18 19:33:39.650576476 +1000
|
|
@@ -43,7 +43,7 @@
|
|
fi
|
|
|
|
${SED} -f "${DIR}/ct_c.sed" "${FILE}" \
|
|
- | ${AWK} -f "${DIR}/ct_c.awk" "rootname=${ROOT}" "outfile=${TMP}" -
|
|
+ | ${AWK} -f "${DIR}/ct_c.awk" "rootname=${ROOT}" - > "${TMP}"
|
|
|
|
if grep "^#__ERROR_IN_FILE" "${TMP}" > /dev/null; then
|
|
rm "${TMP}"
|