mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-11 13:55:24 +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
1
steps/bzip2-1.0.8/bzip2-1.0.8.checksums
Normal file
1
steps/bzip2-1.0.8/bzip2-1.0.8.checksums
Normal file
|
|
@ -0,0 +1 @@
|
|||
ce63f5ac31e9a0b9740df12d8c1ce1dd635aac270687e5ede2e32990f301ebe2 /usr/bin/bzip2
|
||||
49
steps/bzip2-1.0.8/pass1.kaem
Executable file
49
steps/bzip2-1.0.8/pass1.kaem
Executable file
|
|
@ -0,0 +1,49 @@
|
|||
#!/bin/sh
|
||||
|
||||
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
|
||||
# SPDX-FileCopyrightText: 2021 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
|
||||
cp ${DISTFILES}/${pkg}.tar.gz ../src/
|
||||
gzip -d -f ../src/${pkg}.tar.gz
|
||||
tar xf ../src/${pkg}.tar
|
||||
cd ${pkg}
|
||||
|
||||
# Patch
|
||||
patch -Np0 -i ../../patches/mes-libc.patch
|
||||
patch -Np0 -i ../../patches/coreutils.patch
|
||||
|
||||
# Build
|
||||
make CC=tcc AR="tcc -ar" LDFLAGS="-static" bzip2
|
||||
|
||||
# Install
|
||||
cp bzip2 ${PREFIX}/bin/bzip2
|
||||
cp bzip2 ${PREFIX}/bin/bunzip2
|
||||
chmod 755 ${PREFIX}/bin/bzip2
|
||||
chmod 755 ${PREFIX}/bin/bunzip2
|
||||
|
||||
# Test
|
||||
bzip2 --help
|
||||
|
||||
cd ../..
|
||||
|
||||
# Checksums
|
||||
if match x${UPDATE_CHECKSUMS} xTrue; then
|
||||
sha256sum -o ${pkg}.checksums \
|
||||
/usr/bin/bzip2
|
||||
|
||||
cp ${pkg}.checksums ${SRCDIR}
|
||||
else
|
||||
sha256sum -c ${pkg}.checksums
|
||||
fi
|
||||
19
steps/bzip2-1.0.8/pass2.sh
Executable file
19
steps/bzip2-1.0.8/pass2.sh
Executable file
|
|
@ -0,0 +1,19 @@
|
|||
# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
|
||||
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
||||
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
src_prepare() {
|
||||
:
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
make "${MAKEJOBS}" CC=tcc AR="tcc -ar" bzip2
|
||||
}
|
||||
|
||||
src_install() {
|
||||
install -D bzip2 "${DESTDIR}${PREFIX}/bin/bzip2"
|
||||
ln -sf "${PREFIX}/bin/bzip2" "${DESTDIR}${PREFIX}/bin/bunzip2"
|
||||
ln -sf "${PREFIX}/bin/bzip2" "${DESTDIR}${PREFIX}/bin/bzcat"
|
||||
}
|
||||
41
steps/bzip2-1.0.8/patches/coreutils.patch
Normal file
41
steps/bzip2-1.0.8/patches/coreutils.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
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
|
||||
33
steps/bzip2-1.0.8/patches/mes-libc.patch
Normal file
33
steps/bzip2-1.0.8/patches/mes-libc.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
|
||||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: bzip2-1.0.6
|
||||
|
||||
mes libc has no time support, so we remove that.
|
||||
|
||||
It also does not have fch{own,mod}, which we don't care about in the bootstrap
|
||||
anyway, so we can null-op those calls.
|
||||
|
||||
diff -r -N -U3 bzip2.c bzip2.c
|
||||
--- bzip2.c 2019-07-13 18:50:05.000000000 +0100
|
||||
+++ bzip2.c 2021-01-14 14:11:40.160213521 +0000
|
||||
@@ -1051,12 +1051,9 @@
|
||||
{
|
||||
# if BZ_UNIX
|
||||
IntNative retVal;
|
||||
- struct utimbuf uTimBuf;
|
||||
|
||||
- uTimBuf.actime = fileMetaInfo.st_atime;
|
||||
- uTimBuf.modtime = fileMetaInfo.st_mtime;
|
||||
|
||||
- retVal = utime ( dstName, &uTimBuf );
|
||||
+ retVal = 0;
|
||||
ERROR_IF_NOT_ZERO ( retVal );
|
||||
# endif
|
||||
}
|
||||
diff -r -N -U3 utime.h utime.h
|
||||
--- utime.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ utime.h 2021-01-14 18:11:11.253825037 +0000
|
||||
@@ -0,0 +1,2 @@
|
||||
+#define fchown(filedes, owner, group) 0
|
||||
+#define fchmod(filedes, mode) 0
|
||||
1
steps/bzip2-1.0.8/sources
Normal file
1
steps/bzip2-1.0.8/sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
|
||||
Loading…
Add table
Add a link
Reference in a new issue