mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-07 03:45:23 +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.
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
|
|
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
|
|
|
SPDX-License-Identifier: bzip2-1.0.6
|
|
|
|
Disable all coreutils calls in the Makefile which we do not have at this
|
|
point of the bootstrap. ranlib can be unconditionally disabled as we do not
|
|
have it either.
|
|
|
|
diff -r -N -U3 Makefile Makefile
|
|
--- Makefile 2019-07-13 18:50:05.000000000 +0100
|
|
+++ Makefile 2021-01-14 15:45:17.558516299 +0000
|
|
@@ -21,7 +21,7 @@
|
|
LDFLAGS=
|
|
|
|
BIGFILES=-D_FILE_OFFSET_BITS=64
|
|
-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
|
|
+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) -I .
|
|
|
|
# Where you want it installed when you do 'make install'
|
|
PREFIX=/usr/local
|
|
@@ -44,11 +44,6 @@
|
|
|
|
libbz2.a: $(OBJS)
|
|
$(AR) cq libbz2.a $(OBJS)
|
|
- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
|
|
- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
|
|
- echo $(RANLIB) libbz2.a ; \
|
|
- $(RANLIB) libbz2.a ; \
|
|
- fi
|
|
|
|
check: test
|
|
test: bzip2
|
|
@@ -114,7 +108,6 @@
|
|
sample1.tst sample2.tst sample3.tst
|
|
|
|
blocksort.o: blocksort.c
|
|
- @cat words0
|
|
$(CC) $(CFLAGS) -c blocksort.c
|
|
huffman.o: huffman.c
|
|
$(CC) $(CFLAGS) -c huffman.c
|