mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-10 21:35:24 +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.
62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
|
|
Regenerating help is not trivial. Help is unnecessary.
|
|
Disable help.
|
|
|
|
diff -ru src/Makefile.inc src/Makefile.inc
|
|
--- src/Makefile.inc
|
|
+++ src/Makefile.inc
|
|
@@ -70,11 +70,9 @@
|
|
tool_formparse.c \
|
|
tool_getparam.c \
|
|
tool_getpass.c \
|
|
- tool_help.c \
|
|
tool_helpers.c \
|
|
tool_hugehelp.c \
|
|
tool_libinfo.c \
|
|
- tool_listhelp.c \
|
|
tool_main.c \
|
|
tool_msgs.c \
|
|
tool_operate.c \
|
|
@@ -111,7 +109,6 @@
|
|
tool_formparse.h \
|
|
tool_getparam.h \
|
|
tool_getpass.h \
|
|
- tool_help.h \
|
|
tool_helpers.h \
|
|
tool_hugehelp.h \
|
|
tool_libinfo.h \
|
|
diff -ru src/tool_operate.c src/tool_operate.c
|
|
--- src/tool_operate.c
|
|
+++ src/tool_operate.c
|
|
@@ -80,7 +80,6 @@
|
|
#include "tool_writeout.h"
|
|
#include "tool_xattr.h"
|
|
#include "tool_vms.h"
|
|
-#include "tool_help.h"
|
|
#include "tool_hugehelp.h"
|
|
#include "tool_progress.h"
|
|
#include "dynbuf.h"
|
|
@@ -2703,19 +2702,7 @@
|
|
if(res) {
|
|
result = CURLE_OK;
|
|
|
|
- /* Check if we were asked for the help */
|
|
- if(res == PARAM_HELP_REQUESTED)
|
|
- tool_help(global->help_category);
|
|
- /* Check if we were asked for the manual */
|
|
- else if(res == PARAM_MANUAL_REQUESTED)
|
|
- hugehelp();
|
|
- /* Check if we were asked for the version information */
|
|
- else if(res == PARAM_VERSION_INFO_REQUESTED)
|
|
- tool_version_info();
|
|
- /* Check if we were asked to list the SSL engines */
|
|
- else if(res == PARAM_ENGINES_REQUESTED)
|
|
- tool_list_engines();
|
|
- else if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL)
|
|
+ if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL)
|
|
result = CURLE_UNSUPPORTED_PROTOCOL;
|
|
else if(res == PARAM_READ_ERROR)
|
|
result = CURLE_READ_ERROR;
|