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
11
steps/make-3.82/files/putenv_stub.c
Normal file
11
steps/make-3.82/files/putenv_stub.c
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2023 Paul Dersey <pdersey@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
int putenv(char *string)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
1
steps/make-3.82/make-3.82.checksums
Normal file
1
steps/make-3.82/make-3.82.checksums
Normal file
|
|
@ -0,0 +1 @@
|
|||
7dac94ec2651bb6ca9666c2234171ebe51278cbb7ff533ee84ab0fb1b3dd432e /usr/bin/make
|
||||
74
steps/make-3.82/pass1.kaem
Executable file
74
steps/make-3.82/pass1.kaem
Executable file
|
|
@ -0,0 +1,74 @@
|
|||
#!/bin/sh
|
||||
|
||||
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
set -ex
|
||||
|
||||
# Check tarball checksums
|
||||
checksum-transcriber sources
|
||||
sha256sum -c sources.SHA256SUM
|
||||
|
||||
mkdir build src
|
||||
cd build
|
||||
|
||||
# Extract
|
||||
unbz2 --file ${DISTFILES}/${pkg}.tar.bz2 --output ../src/${pkg}.tar
|
||||
untar --file ../src/${pkg}.tar
|
||||
rm ../src/${pkg}.tar
|
||||
cd ${pkg}
|
||||
|
||||
# Create .h files
|
||||
catm config.h
|
||||
|
||||
# Prepare
|
||||
cp ../../files/putenv_stub.c putenv_stub.c
|
||||
|
||||
# Compile
|
||||
tcc -c getopt.c
|
||||
tcc -c getopt1.c
|
||||
tcc -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_STDINT_H ar.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_FCNTL_H arscan.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 commands.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DSCCS_GET=\"/nullop\" default.c
|
||||
tcc -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_DIRENT_H dir.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART expand.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 file.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -Dvfork=fork function.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART implicit.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_DUP2 -DHAVE_STRCHR -Dvfork=fork job.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DLOCALEDIR=\"/fake-locale\" -DPACKAGE=\"fake-make\" -DHAVE_MKTEMP -DHAVE_GETCWD main.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_STRERROR -DHAVE_VPRINTF -DHAVE_ANSI_COMPILER -DHAVE_STDARG_H misc.c
|
||||
tcc -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DINCLUDEDIR=\"${PREFIX}/include\" read.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 -DHAVE_FCNTL_H -DLIBDIR=\"${PREFIX}/lib\" remake.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART rule.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART signame.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART strcache.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART variable.c
|
||||
tcc -c -I. -DVERSION=\"3.82\" version.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART vpath.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART hash.c
|
||||
tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART remote-stub.c
|
||||
tcc -c -DHAVE_FCNTL_H getloadavg.c
|
||||
tcc -c -Iglob -DSTDC_HEADERS glob/fnmatch.c
|
||||
tcc -c -Iglob -DHAVE_STRDUP -DHAVE_DIRENT_H glob/glob.c
|
||||
tcc -c putenv_stub.c
|
||||
|
||||
# Link
|
||||
tcc -static -o ${BINDIR}/make getopt.o getopt1.o ar.o arscan.o commands.o default.o dir.o expand.o file.o function.o implicit.o job.o main.o misc.o read.o remake.o rule.o signame.o strcache.o variable.o version.o vpath.o hash.o remote-stub.o getloadavg.o fnmatch.o glob.o putenv_stub.o
|
||||
|
||||
# Test
|
||||
make --version
|
||||
|
||||
cd ../..
|
||||
|
||||
# Checksums
|
||||
if match x${UPDATE_CHECKSUMS} xTrue; then
|
||||
sha256sum -o ${pkg}.checksums \
|
||||
/usr/bin/make
|
||||
|
||||
cp ${pkg}.checksums ${SRCDIR}
|
||||
else
|
||||
sha256sum -c ${pkg}.checksums
|
||||
fi
|
||||
28
steps/make-3.82/pass2.sh
Executable file
28
steps/make-3.82/pass2.sh
Executable file
|
|
@ -0,0 +1,28 @@
|
|||
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
rm doc/make.info
|
||||
touch doc/make.info
|
||||
|
||||
# We don't have autopoint from gettext yet
|
||||
AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./configure \
|
||||
--prefix="${PREFIX}" \
|
||||
--build=i386-unknown-linux-gnu \
|
||||
--disable-nls
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
make "${MAKEJOBS}" MAKEINFO="true"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make install MAKEINFO="true" DESTDIR="${DESTDIR}"
|
||||
}
|
||||
1
steps/make-3.82/sources
Normal file
1
steps/make-3.82/sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
https://mirrors.kernel.org/gnu/make/make-3.82.tar.bz2 e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966
|
||||
Loading…
Add table
Add a link
Reference in a new issue