mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-02 01:18:08 +01:00
Remove the notion of "sys*"
- 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.
This commit is contained in:
parent
0907cfd073
commit
6ed2e09f3a
546 changed files with 700 additions and 1299 deletions
68
steps/autogen-5.18.16/pass1.sh
Executable file
68
steps/autogen-5.18.16/pass1.sh
Executable file
|
|
@ -0,0 +1,68 @@
|
|||
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
|
||||
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
noextract="autogen-5.18.16.tar.xz"
|
||||
|
||||
src_prepare() {
|
||||
mkdir build
|
||||
mv ../autogen-5.18.16 build/src
|
||||
mv ../autogen-5.18.16.tar.xz build/
|
||||
rm -f build/src/add-on/char-mapper/cm.tar
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
(
|
||||
set -e
|
||||
declare -x PKG_CONFIG_PATH="${LIBDIR}/pkgconfig"
|
||||
sed -i "s/make install/make install DESTDIR=\${DESTDIR}/" bootstrap_tarball.sh
|
||||
sed -i "/make check/d" bootstrap_tarball.sh
|
||||
declare -x FINALPREFIX="${PREFIX}"
|
||||
declare -x GUILE_STATIC="--static"
|
||||
declare -x GNULIBDIR="${PWD}"/../gnulib-8f4538a5
|
||||
declare -x MAN_PAGE_DATE=1970-01-01
|
||||
|
||||
SKIP_MAIN=1 . ./bootstrap_tarball.sh
|
||||
prepare_tarball
|
||||
bootstrap_columns
|
||||
bootstrap_getdefs
|
||||
bootstrap_autogen
|
||||
bootstrap_tpl_config
|
||||
|
||||
# Build stage2 autogen (stage1 autogen is not easy to install into /usr)
|
||||
rm -R build/tarball
|
||||
cp -ar build/autogen-5.18.16 build/tarball
|
||||
cd build/tarball
|
||||
|
||||
# These files does not respect MAN_PAGE_DATE
|
||||
sed -i "s/+%Y/+1970/; s/%m/01/; s/%d'/01'/; s/%Y/2018/" autoopts/aoconf.tpl
|
||||
sed -i 's/%Y/2018/' autoopts/options_h.tpl
|
||||
|
||||
SOURCE_DIR="$PWD" ./config/bootstrap
|
||||
# Specify timeout to avoid non-reproducibility
|
||||
CPPFLAGS=-D_LARGEFILE64_SOURCE=1 ./configure \
|
||||
--prefix="${FINALPREFIX}" \
|
||||
--libdir="${FINALPREFIX}/lib/i386-unknown-linux-musl" \
|
||||
--disable-shared \
|
||||
--enable-timeout=15
|
||||
touch doc/agdoc.texi # build later
|
||||
make -j1 CFLAGS=-Wno-error
|
||||
|
||||
# Fix non-reproducible man-page
|
||||
awk '{gsub("\\(/tmp/.*", "", $7); print}' agen5/autogen.1 > autogen.1
|
||||
mv autogen.1 agen5/autogen.1
|
||||
|
||||
cd ../..
|
||||
)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd build/tarball
|
||||
make DESTDIR="${DESTDIR}" install MAN_PAGE_DATE=1970-01-01
|
||||
|
||||
# Some reproducibility issues and generally not useful for bootstrapping
|
||||
rm "${DESTDIR}${PREFIX}/share/autogen/libopts-"*.tar.gz
|
||||
|
||||
cd ../..
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue