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
92
steps/bash-2.05b/mk/main.mk
Normal file
92
steps/bash-2.05b/mk/main.mk
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
|
||||
# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
include common.mk
|
||||
|
||||
CFLAGS = \
|
||||
-I. \
|
||||
-Iinclude \
|
||||
-Ilib \
|
||||
-Ilib/sh \
|
||||
-Ibuiltins \
|
||||
$(COMMON_CFLAGS)
|
||||
|
||||
LDFLAGS = -L. -Lbuiltins -static
|
||||
LIBRARIES = libsh.a builtins/libbuiltins.a libglob.a libtilde.a
|
||||
|
||||
SHLIB_FILES = clktck getcwd getenv oslib setlinebuf strcasecmp strerror strtod \
|
||||
vprint itos rename zread zwrite shtty inet_aton netopen \
|
||||
strpbrk timeval clock makepath pathcanon pathphys stringlist stringvec \
|
||||
tmpfile spell strtrans strindex shquote snprintf mailstat fmtulong \
|
||||
fmtullong strtoll strtoull strtoimax strtoumax fmtumax netconn mktime \
|
||||
strftime xstrchr zcatfd
|
||||
# FIXME: for some reason these don't get picked up correctly in the
|
||||
# final linking cmd
|
||||
SHLIB_ODD_FILES = zcatfd strtoumax spell pathphys
|
||||
SHLIB_OBJS = $(addprefix lib/sh/, $(addsuffix .o, $(SHLIB_FILES)))
|
||||
SHLIB_ODD_OBJS = $(addprefix lib/sh/, $(addsuffix .o, $(SHLIB_ODD_FILES)))
|
||||
|
||||
MKBUILTINS_OBJS = builtins/mkbuiltins.o
|
||||
BUILTINS_DEFS = $(addprefix builtins/, $(addsuffix .def, $(BUILTINS_DEF_FILES)))
|
||||
|
||||
GLOB_FILES = glob strmatch smatch xmbsrtowcs
|
||||
GLOB_OBJS = $(addprefix lib/glob/, $(addsuffix .o, $(GLOB_FILES)))
|
||||
|
||||
TILDE_OBJS = lib/tilde/tilde.o
|
||||
|
||||
MKSYNTAX_OBJS = mksyntax.o
|
||||
MKSIGNAMES_OBJS = support/mksignames.o
|
||||
|
||||
FILES = shell eval y.tab general make_cmd print_cmd dispose_cmd execute_cmd \
|
||||
variables copy_cmd error expr flags nojobs subst hashcmd hashlib mailcheck \
|
||||
trap input unwind_prot pathexp sig test version alias array arrayfunc \
|
||||
braces bracecomp bashhist bashline list stringlib locale findcmd redir \
|
||||
pcomplete pcomplib syntax xmalloc siglist
|
||||
OBJS = $(addsuffix .o, $(FILES))
|
||||
|
||||
all: bash
|
||||
|
||||
# Builtins
|
||||
|
||||
mkbuiltins: $(MKBUILTINS_OBJS)
|
||||
$(CC) $(CFLAGS) $(MKBUILTINS_OBJS) $(LDFLAGS) -o $@
|
||||
./mkbuiltins -externfile builtins/builtext.h -structfile builtins/builtins.c -noproduction $(BUILTINS_DEFS)
|
||||
|
||||
# libsh
|
||||
|
||||
libsh.a: $(SHLIB_OBJS)
|
||||
$(AR) cr $@ $^
|
||||
|
||||
# libglob
|
||||
|
||||
libglob.a: $(GLOB_OBJS)
|
||||
$(AR) cr $@ $^
|
||||
|
||||
# libtilde
|
||||
|
||||
libtilde.a: $(TILDE_OBJS)
|
||||
$(AR) cr $@ $^
|
||||
|
||||
# The actual program
|
||||
|
||||
mksyntax: $(MKSYNTAX_OBJS)
|
||||
$(CC) $^ $(LDFLAGS) -o $@ -lgetopt
|
||||
|
||||
syntax.c: mksyntax
|
||||
./mksyntax -o $@
|
||||
|
||||
mksignames: $(MKSIGNAMES_OBJS)
|
||||
$(CC) $^ $(LDFLAGS) -o $@ -lgetopt
|
||||
|
||||
signames.h: mksignames
|
||||
./mksignames $@
|
||||
|
||||
y.tab.c: parse.y
|
||||
yacc -d $^
|
||||
|
||||
trap.c: signames.h
|
||||
|
||||
bash: libsh.a libglob.a libtilde.a $(OBJS)
|
||||
$(CC) -o bash $(LIBRARIES) $(OBJS) $(SHLIB_ODD_OBJS) $(LDFLAGS) -lsh -lbuiltins -lglob -ltilde
|
||||
Loading…
Add table
Add a link
Reference in a new issue