mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-13 06:45: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
12
steps/tar-1.12/files/getdate_stub.c
Normal file
12
steps/tar-1.12/files/getdate_stub.c
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include "getdate.h"
|
||||
|
||||
time_t get_date (const char *p, const time_t *now)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
29
steps/tar-1.12/files/stat_override.c
Normal file
29
steps/tar-1.12/files/stat_override.c
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
||||
* SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <linux/syscall.h>
|
||||
#include <linux/x86/syscall.h>
|
||||
|
||||
int _lstat(const char *path, struct stat *buf) {
|
||||
int rc = lstat(path, buf);
|
||||
if (rc == 0) {
|
||||
buf->st_atime = 0;
|
||||
buf->st_mtime = 0;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* stat is deliberately hacked to be lstat.
|
||||
In src/system.h tar already defines lstat to be stat
|
||||
since S_ISLNK is not defined in mes C library
|
||||
Hence, we can't use something like #define lstat(a,b) _lstat(a,b)
|
||||
to have separate stat and lstat functions.
|
||||
Thus here we break tar with --dereference option but we don't use
|
||||
this option in live-bootstrap.
|
||||
*/
|
||||
#define stat(a,b) _lstat(a,b)
|
||||
36
steps/tar-1.12/mk/main.mk
Normal file
36
steps/tar-1.12/mk/main.mk
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
CC = tcc
|
||||
AR = tcc -ar
|
||||
|
||||
# -DSIZEOF_UNSIGNED_LONG=4 forces use of simulated arithmetic
|
||||
# This is to avoid running configure test to determine sizeof(long long)
|
||||
CPPFLAGS = -DHAVE_FCNTL_H \
|
||||
-DHAVE_DIRENT_H \
|
||||
-DHAVE_GETCWD_H \
|
||||
-DHAVE_GETCWD \
|
||||
-DSIZEOF_UNSIGNED_LONG=4 \
|
||||
-DVERSION=\"1.12\" \
|
||||
-DPACKAGE=\"tar\"
|
||||
|
||||
CFLAGS = -I . -I lib
|
||||
LDFLAGS = -L . -ltar -static
|
||||
|
||||
.PHONY: all
|
||||
|
||||
LIB_SRC = argmatch backupfile error fnmatch ftruncate getdate_stub getopt getopt1 getversion modechange msleep xgetcwd xmalloc xstrdup
|
||||
|
||||
LIB_OBJ = $(addprefix lib/, $(addsuffix .o, $(LIB_SRC)))
|
||||
|
||||
TAR_SRC = arith buffer compare create delete extract incremen list mangle misc names open3 rtapelib tar update
|
||||
TAR_OBJ = $(addprefix src/, $(addsuffix .o, $(TAR_SRC)))
|
||||
|
||||
all: tar
|
||||
|
||||
libtar.a: $(LIB_OBJ)
|
||||
$(AR) cr $@ $^
|
||||
|
||||
tar: libtar.a $(TAR_OBJ)
|
||||
$(CC) $^ $(LDFLAGS) -o $@
|
||||
49
steps/tar-1.12/pass1.kaem
Executable file
49
steps/tar-1.12/pass1.kaem
Executable file
|
|
@ -0,0 +1,49 @@
|
|||
#!/bin/sh
|
||||
|
||||
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
|
||||
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
|
||||
# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
|
||||
#
|
||||
# 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
|
||||
untar --file ../src/${pkg}.tar
|
||||
rm ../src/${pkg}.tar
|
||||
|
||||
cd ${pkg}
|
||||
|
||||
# Prepare
|
||||
cp ../../mk/main.mk Makefile
|
||||
cp ../../files/getdate_stub.c lib/getdate_stub.c
|
||||
catm src/create.c.new ../../files/stat_override.c src/create.c
|
||||
cp src/create.c.new src/create.c
|
||||
|
||||
# Build
|
||||
make -f Makefile
|
||||
|
||||
# Install
|
||||
cp tar ${PREFIX}/bin/tar
|
||||
chmod 755 ${PREFIX}/bin/tar
|
||||
|
||||
cd ../..
|
||||
|
||||
# Checksums
|
||||
if match x${UPDATE_CHECKSUMS} xTrue; then
|
||||
sha256sum -o ${pkg}.checksums \
|
||||
/usr/bin/tar
|
||||
|
||||
cp ${pkg}.checksums ${SRCDIR}
|
||||
else
|
||||
sha256sum -c ${pkg}.checksums
|
||||
fi
|
||||
1
steps/tar-1.12/sources
Normal file
1
steps/tar-1.12/sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
https://mirrors.kernel.org/gnu/tar/tar-1.12.tar.gz c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a
|
||||
1
steps/tar-1.12/tar-1.12.checksums
Normal file
1
steps/tar-1.12/tar-1.12.checksums
Normal file
|
|
@ -0,0 +1 @@
|
|||
0b14f1849c2c8dab671399905753e0503f7ba60bfc807b0be13132da6c9814e9 /usr/bin/tar
|
||||
Loading…
Add table
Add a link
Reference in a new issue