Merge remote-tracking branch 'upstream/master'

.gitmodules

@@ -5,3 +5,7 @@
 [submodule "seed/stage0-posix"]
 	path = seed/stage0-posix
 	url = https://github.com/oriansj/stage0-posix
+
+[submodule "builder-hex0"]
+	path = builder-hex0
+	url = https://github.com/ironmeld/builder-hex0

builder-hex0

@@ -0,0 +1 @@
+Subproject commit 8621e56191c635c04fa68687e411016c2b1deab7

lib/generator.py

@@ -29,6 +29,7 @@ class Generator():
         self.external_sources = external_sources
         self.repo_path = repo_path
         self.source_manifest = self.get_source_manifest(not self.external_sources)
+        self.early_source_manifest = self.get_source_manifest(True)
         self.target_dir = None
         self.external_dir = None
 
@@ -59,26 +60,16 @@ class Generator():
         # argument matrix ... or we could just use ext3 instead which
         # is effectively universally the same
         if kernel_bootstrap:
-            init_path = os.path.join(self.target_dir, 'init')
+            self.target_dir = os.path.join(self.target_dir, 'init')
+            os.mkdir(self.target_dir)
 
-            os.mkdir(init_path)
+            if not self.repo_path and not self.external_sources:
-            self.target_dir = init_path
-
-            if self.repo_path or self.external_sources:
-                target.add_disk("external", filesystem="ext3")
-                target.mount_disk("external", "external")
-            else:
                 self.external_dir = os.path.join(self.target_dir, 'external')
         elif using_kernel:
             self.target_dir = os.path.join(self.target_dir, 'disk')
-            target.add_disk("disk",
-                            filesystem="ext3",
-                            size=(str(target_size) + "M") if target_size else "16G",
-                            bootable=True)
-            target.mount_disk("disk", "disk")
             self.external_dir = os.path.join(self.target_dir, 'external')
 
-        os.makedirs(self.external_dir, exist_ok=True)
+        os.makedirs(self.external_dir)
 
         if self.early_preseed:
             # Extract tar containing preseed
@@ -103,10 +94,16 @@ class Generator():
         if kernel_bootstrap:
             self.create_builder_hex0_disk_image(self.target_dir + '.img', target_size)
 
-        if kernel_bootstrap and (self.external_sources or self.repo_path):
+            if self.repo_path or self.external_sources:
-            target.umount_disk('external')
+                mkfs_args = ['-d', os.path.join(target.path, 'external')]
+                target.add_disk("external", filesystem="ext3", mkfs_args=mkfs_args)
         elif using_kernel:
-            target.umount_disk('disk')
+            mkfs_args = ['-d', os.path.join(target.path, 'disk')]
+            target.add_disk("disk",
+                            filesystem="ext3",
+                            size=(str(target_size) + "M") if target_size else "16G",
+                            bootable=True,
+                            mkfs_args=mkfs_args)
 
     def steps(self):
         """Copy in steps."""
@@ -163,9 +160,10 @@ class Generator():
 
     def distfiles(self):
         """Copy in distfiles"""
-        def copy_no_network_distfiles(out):
+        def copy_no_network_distfiles(out, early):
             # Note that "no disk" implies "no network" for kernel bootstrap mode
-            for file in self.source_manifest:
+            manifest = self.early_source_manifest if early else self.source_manifest
+            for file in manifest:
                 file = file[3].strip()
                 shutil.copy2(os.path.join(self.distfiles_dir, file),
                              os.path.join(out, file))
@@ -175,13 +173,13 @@ class Generator():
 
         if early_distfile_dir != main_distfile_dir:
             os.makedirs(early_distfile_dir, exist_ok=True)
-            copy_no_network_distfiles(early_distfile_dir)
+            copy_no_network_distfiles(early_distfile_dir, True)
 
         if self.external_sources:
             shutil.copytree(self.distfiles_dir, main_distfile_dir, dirs_exist_ok=True)
         else:
             os.mkdir(main_distfile_dir)
-            copy_no_network_distfiles(main_distfile_dir)
+            copy_no_network_distfiles(main_distfile_dir, False)
 
     @staticmethod
     def output_dir(srcfs_file, dirpath):
@@ -236,13 +234,14 @@ class Generator():
 
     def create_builder_hex0_disk_image(self, image_file_name, size):
         """Create builder-hex0 disk image"""
-        shutil.copyfile(os.path.join('seed', 'stage0-posix', 'bootstrap-seeds',
-                                     'NATIVE', 'x86', 'builder-hex0-x86-stage1.img'),
-                        image_file_name)
-
         with open(image_file_name, 'ab') as image_file:
+            # Compile and write stage1 binary seed
+            with open(os.path.join('builder-hex0', 'builder-hex0-x86-stage1.hex0'),
+                      encoding="utf-8") as infile:
+                for line in infile:
+                    image_file.write(bytes.fromhex(line.split('#')[0].split(';')[0].strip()))
             # Append stage2 hex0 source
-            with open(os.path.join('kernel-bootstrap', 'builder-hex0-x86-stage2.hex0'),
+            with open(os.path.join('builder-hex0', 'builder-hex0-x86-stage2.hex0'),
                       encoding="utf-8") as infile:
                 image_file.write(infile.read().encode())
             # Pad to next sector

lib/target.py

@@ -8,10 +8,9 @@ Contains a class that represents a target directory
 """
 
 import enum
-import getpass
 import os
 
-from lib.utils import mount, umount, create_disk, run_as_root
+from lib.utils import mount, create_disk
 
 class TargetType(enum.Enum):
     """Different types of target dirs we can have"""
@@ -24,7 +23,6 @@ class Target:
     """
 
     _disks = {}
-    _disk_filesystems = {}
     _mountpoints = {}
 
     def __init__(self, path="target"):
@@ -34,15 +32,6 @@ class Target:
         if not os.path.exists(self.path):
             os.mkdir(self.path)
 
-    def __del__(self):
-        for path in self._mountpoints:
-            print(f"Unmounting {path}")
-            umount(path)
-
-        for disk in self._disks.values():
-            print(f"Detaching {disk}")
-            run_as_root("losetup", "-d", disk)
-
     def tmpfs(self, size="8G"):
         """Mount a tmpfs"""
         print(f"Mounting tmpfs on {self.path}")
@@ -59,32 +48,13 @@ class Target:
                  mkfs_args=None):
         """Add a disk"""
         disk_path = os.path.join(self.path, f"{name}.img")
-        self._disks[name] = create_disk(disk_path,
+        create_disk(disk_path,
-                                        tabletype,
+                    tabletype,
-                                        filesystem,
+                    filesystem,
-                                        size,
+                    size,
-                                        bootable,
+                    bootable,
-                                        mkfs_args)
+                    mkfs_args)
-        self._disk_filesystems[name] = filesystem
+        self._disks[name] = disk_path
-        # Allow executing user to access it
-        run_as_root("chown", getpass.getuser(), self._disks[name])
-
-    def mount_disk(self, name, mountpoint=None):
-        """Mount the disk"""
-        if mountpoint is None:
-            mountpoint = f"{name}_mnt"
-        mountpoint = os.path.join(self.path, mountpoint)
-        os.mkdir(mountpoint)
-        mount(self._disks[name] + "p1", mountpoint, self._disk_filesystems[name])
-        # Allow executing user to access it
-        run_as_root("chown", getpass.getuser(), mountpoint)
-        self._mountpoints[name] = mountpoint
-        return mountpoint
-
-    def umount_disk(self, name):
-        """Unmount a disk"""
-        umount(self._mountpoints[name])
-        del self._mountpoints[name]
 
     def get_disk(self, name):
         """Get the path to a device of a disk"""

lib/utils.py

@@ -37,16 +37,13 @@ def create_disk(image, disk_type, fs_type, size, bootable=False, mkfs_args=None)
     if mkfs_args is None:
         mkfs_args = []
     run('truncate', '-s', size, image)
-    # First find the device we will use, then actually use it
-    loop_dev = run_as_root('losetup', '-f', capture_output=True).stdout.decode().strip()
-    run_as_root('losetup', '-P', loop_dev, image)
     # Create the partition
     if disk_type != "none":
-        run_as_root('parted', '--script', image, 'mklabel', disk_type, 'mkpart',
+        # 1 GiB if bootable, 1 MiB otherwise
-                'primary', fs_type, '1GiB' if bootable else '1MiB', '100%')
+        offset = str(1024 * 1024 * (1024 if bootable else 1))
-        run_as_root('partprobe', loop_dev)
+        run('parted', '--script', image, 'mklabel', disk_type, 'mkpart',
-        run_as_root('mkfs.' + fs_type, loop_dev + "p1", *mkfs_args)
+            'primary', fs_type, offset + 'B', '100%')
-    return loop_dev
+        run('mkfs.' + fs_type, image, '-E', 'offset=' + offset, *mkfs_args)
 
 def mount(source, target, fs_type, options='', **kwargs):
     """Mount filesystem"""

steps/SHA256SUMS.pkgs

@@ -34,7 +34,7 @@ ca7403a7503e8f3bb55e6c5bd54571b8c061b11c96e50ee89e006df6011d1518  bzip2-1.0.8_0.
 543214998317d764595d3dd247a1fb2e0803ad77978b8474bd24d64c161b9530  ca-certificates-3.95_0.tar.bz2
 7450bb38caaa633f8c11269fed44eb680c6ba03bb0e19c18fce3b2450f80e358  coreutils-5.0_0.tar.bz2
 c95fd8c51c3bfbd4d08a4a50d0033ee85394e6efe4ff82703c050e4dbc4347bf  coreutils-6.10_0.tar.bz2
-f49900486ae7f0c8107d729b71ede155ee44544cdf8d562b50fbea4095bd05b2  coreutils-8.32_0.tar.bz2
+9fa31a4aeaa5132205efb796c8f546c94c1cfef6b5c27e64f6ebe06ca0360e67  coreutils-9.4_0.tar.bz2
 6a10f5258650ae75e92eb7aa1a5e6107b72c8b6419a4f64272262a1545c43161  curl-8.5.0_0.tar.bz2
 f9efd6600ceb91918078078ff44a33f2a4fb4a59edb804866aebd288c2cfb24e  curl-8.5.0_1.tar.bz2
 1d4dec2d1885a6b5499a0f0d55e9c2c65dab532c4c593d848b6a542f67789627  dhcpcd-10.0.1_0.tar.bz2

steps/checksum-transcriber-1.0/checksum-transcriber-1.0.amd64.checksums

@@ -1 +1 @@
-4d1a7b8a0e42f278df20893610dd37dec62b609c2c342d9252917907e4d73c03  /usr/bin/checksum-transcriber
+234d061a727502f3ed3252a1767086a09fda04ee509758fc5852a919e994ca20  /usr/bin/checksum-transcriber

steps/coreutils-8.32/import-gnulib.sh

@@ -1,298 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-../gnulib-d279bc/gnulib-tool --import --local-dir=gl \
-    --lib=libcoreutils \
-    --source-base=lib \
-    --m4-base=m4 \
-    --doc-base=doc \
-    --tests-base=gnulib-tests \
-    --aux-dir=build-aux \
-    --with-tests \
-    --makefile-name=gnulib.mk \
-    --no-conditional-dependencies \
-    --no-libtool \
-    --macro-prefix=gl \
-    --avoid=canonicalize-lgpl \
-    --avoid=dummy \
-    acl \
-    alignof \
-    alloca \
-    announce-gen \
-    areadlink-with-size \
-    argmatch \
-    argv-iter \
-    assert \
-    autobuild \
-    backup-rename \
-    backupfile \
-    base32 \
-    base64 \
-    btowc \
-    buffer-lcm \
-    c-strcase \
-    calloc-gnu \
-    canon-host \
-    canonicalize \
-    chmodat \
-    chown \
-    chownat \
-    cl-strtod \
-    cl-strtold \
-    cloexec \
-    closein \
-    closeout \
-    config-h \
-    configmake \
-    crypto/md5 \
-    crypto/sha1 \
-    crypto/sha256 \
-    crypto/sha512 \
-    cycle-check \
-    d-ino \
-    d-type \
-    di-set \
-    diacrit \
-    dirfd \
-    dirname \
-    do-release-commit-and-tag \
-    dtoastr \
-    dup2 \
-    environ \
-    error \
-    euidaccess \
-    exclude \
-    exitfail \
-    explicit_bzero \
-    faccessat \
-    fadvise \
-    fchdir \
-    fclose \
-    fcntl \
-    fcntl-safer \
-    fd-reopen \
-    fdatasync \
-    fdl \
-    fdopen \
-    fdutimensat \
-    file-has-acl \
-    file-type \
-    fileblocks \
-    filemode \
-    filenamecat \
-    filevercmp \
-    flexmember \
-    fnmatch-gnu \
-    fopen-safer \
-    fprintftime \
-    freopen \
-    freopen-safer \
-    fseeko \
-    fstatat \
-    fsusage \
-    fsync \
-    ftoastr \
-    ftruncate \
-    fts \
-    full-read \
-    full-write \
-    getgroups \
-    gethrxtime \
-    getline \
-    getloadavg \
-    getlogin \
-    getndelim2 \
-    getopt-gnu \
-    getpagesize \
-    getpass-gnu \
-    gettext-h \
-    gettime \
-    gettimeofday \
-    getugroups \
-    getusershell \
-    git-version-gen \
-    gitlog-to-changelog \
-    gnu-make \
-    gnu-web-doc-update \
-    gnumakefile \
-    gnupload \
-    group-member \
-    hard-locale \
-    hash \
-    hash-pjw \
-    heap \
-    host-os \
-    human \
-    idcache \
-    ignore-value \
-    inttostr \
-    inttypes \
-    isapipe \
-    isatty \
-    isblank \
-    largefile \
-    lchmod \
-    lchown \
-    ldtoastr \
-    lib-ignore \
-    linebuffer \
-    link \
-    link-follow \
-    linkat \
-    long-options \
-    lstat \
-    maintainer-makefile \
-    malloc-gnu \
-    manywarnings \
-    mbrlen \
-    mbrtowc \
-    mbsalign \
-    mbschr \
-    mbslen \
-    mbswidth \
-    memcasecmp \
-    memchr \
-    memcmp2 \
-    mempcpy \
-    memrchr \
-    mgetgroups \
-    minmax \
-    mkancesdirs \
-    mkdir \
-    mkdir-p \
-    mkfifo \
-    mknod \
-    mkostemp \
-    mkstemp \
-    mktime \
-    modechange \
-    mountlist \
-    mpsort \
-    netinet_in \
-    non-recursive-gnulib-prefix-hack \
-    nproc \
-    nstrftime \
-    obstack \
-    open \
-    openat-safer \
-    parse-datetime \
-    pathmax \
-    perl \
-    physmem \
-    pipe-posix \
-    pipe2 \
-    posix-shell \
-    posixtm \
-    posixver \
-    priv-set \
-    progname \
-    pthread-cond \
-    pthread-mutex \
-    pthread-thread \
-    pthread_sigmask \
-    putenv \
-    quote \
-    quotearg \
-    randint \
-    randperm \
-    read-file \
-    readlink \
-    readtokens \
-    readtokens0 \
-    readutmp \
-    realloc-gnu \
-    regex \
-    remove \
-    rename \
-    renameat \
-    renameatu \
-    rmdir \
-    root-dev-ino \
-    rpmatch \
-    safe-read \
-    same \
-    save-cwd \
-    savedir \
-    savewd \
-    select \
-    selinux-at \
-    setenv \
-    settime \
-    sig2str \
-    sigaction \
-    smack \
-    ssize_t \
-    stat-macros \
-    stat-size \
-    stat-time \
-    statat \
-    stdbool \
-    stdlib-safer \
-    stpcpy \
-    stpncpy \
-    strdup-posix \
-    strncat \
-    strnumcmp \
-    strsignal \
-    strtoimax \
-    strtoumax \
-    symlinkat \
-    sys_ioctl \
-    sys_resource \
-    sys_stat \
-    sys_wait \
-    tempname \
-    termios \
-    time_rz \
-    timer-time \
-    timespec \
-    tzset \
-    uname \
-    unistd-safer \
-    unlink-busy \
-    unlinkat \
-    unlinkdir \
-    unlocked-io \
-    unsetenv \
-    update-copyright \
-    uptime \
-    useless-if-before-free \
-    userspec \
-    utimecmp \
-    utimens \
-    vasprintf-posix \
-    vc-list-files \
-    verify \
-    verror \
-    version-etc-fsf \
-    wchar-single \
-    wcswidth \
-    wcwidth \
-    winsz-ioctl \
-    winsz-termios \
-    write-any-file \
-    xalloc \
-    xbinary-io \
-    xdectoint \
-    xfts \
-    xgetcwd \
-    xgetgroups \
-    xgethostname \
-    xmemcoll \
-    xnanosleep \
-    xprintf \
-    xprintf-posix \
-    xreadlink \
-    xstrtod \
-    xstrtoimax \
-    xstrtol \
-    xstrtol-error \
-    xstrtold \
-    xstrtoumax \
-    year2038 \
-    yesno
-
-../gnulib-d279bc/build-aux/prefix-gnulib-mk --lib-name=libcoreutils lib/gnulib.mk

steps/coreutils-8.32/patches/gperf_dependency.patch

@@ -1,50 +0,0 @@
-SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
-SPDX-License-Identifier: GPL-3.0-or-later
-
-Remove dependency on gperf. This drops support for outputting unicode
-characters. We do that, because inclusion of unicodeio.h and propername.h
-from gnulib brings dependencies on gperf generated files. We don't have
-gperf at this stage so we can't regenerate them.
-
---- ./src/printf.c
-+++ ./src/printf.c
-@@ -59,7 +59,6 @@
- #include "die.h"
- #include "error.h"
- #include "quote.h"
--#include "unicodeio.h"
- #include "xprintf.h"
- 
- /* The official name of this program (e.g., no 'g' prefix).  */
-@@ -292,8 +291,12 @@ print_esc (const char *escstart, bool octal_0)
-           || (uni_value >= 0xd800 && uni_value <= 0xdfff))
-         die (EXIT_FAILURE, 0, _("invalid universal character name \\%c%0*x"),
-              esc_char, (esc_char == 'u' ? 4 : 8), uni_value);
--
--      print_unicode_char (stdout, uni_value, 0);
-+       putchar ('\\');                                                           
-+       if (*p)                                                                   
-+         {                                                                       
-+           putchar (*p);                                                         
-+           p++;                                                                  
-+         }  
-     }
-   else
-     {
---- ./src/system.h
-+++ ./src/system.h
-@@ -361,13 +361,13 @@ enum
- #include "version-etc.h"
- #undef emit_bug_reporting_address
- 
--#include "propername.h"
- /* Define away proper_name (leaving proper_name_utf8, which affects far
-    fewer programs), since it's not worth the cost of adding ~17KB to
-    the x86_64 text size of every single program.  This avoids a 40%
-    (almost ~2MB) increase in the on-disk space utilization for the set
-    of the 100 binaries. */
- #define proper_name(x) (x)
-+#define proper_name_utf8(x, y) (x, y)
- 
- #include "progname.h"
- 

steps/coreutils-8.32/sources

@@ -1,2 +0,0 @@
-http://git.savannah.gnu.org/cgit/coreutils.git/snapshot/coreutils-8.32.tar.gz 6f7cfc0ac6717afb6ba1f41b0da43a713ba0dd97dec1227e32effc12d79f08c1
-http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-d279bc.tar.gz 12cfa21abf618a274017d6b18e95fc6582519d7c08e2403e5c5772ccdd5b85f4

steps/coreutils-9.4/import-gnulib.sh

@@ -0,0 +1,327 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
+# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Regenerate unicode files
+pushd ../gnulib-bb5bb43/lib
+gcc -Iunictype -o gen-uni-tables gen-uni-tables.c
+mv ../../*.txt .
+./gen-uni-tables UnicodeData-15.0.0.txt PropList-15.0.0.txt DerivedCoreProperties-15.0.0.txt emoji-data-15.0.0.txt ArabicShaping-15.0.0.txt Scripts-15.0.0.txt Blocks-15.0.0.txt PropList-3.0.1.txt EastAsianWidth-15.0.0.txt LineBreak-15.0.0.txt WordBreakProperty-15.0.0.txt GraphemeBreakProperty-15.0.0.txt CompositionExclusions-15.0.0.txt SpecialCasing-15.0.0.txt CaseFolding-15.0.0.txt 15.0
+popd
+
+../gnulib-bb5bb43/gnulib-tool --import --local-dir=gl \
+ --lib=libcoreutils \
+ --source-base=lib \
+ --m4-base=m4 \
+ --doc-base=doc \
+ --tests-base=gnulib-tests \
+ --aux-dir=build-aux \
+ --with-tests \
+ --makefile-name=gnulib.mk \
+ --automake-subdir \
+ --no-conditional-dependencies \
+ --no-libtool \
+ --macro-prefix=gl \
+ --avoid=canonicalize-lgpl \
+ --avoid=dummy \
+ acl \
+ alignalloc \
+ alignasof \
+ alloca \
+ announce-gen \
+ areadlink-with-size \
+ areadlinkat-with-size \
+ argmatch \
+ argv-iter \
+ assert \
+ assert-h \
+ assure \
+ attribute \
+ autobuild \
+ backup-rename \
+ backupfile \
+ base32 \
+ base64 \
+ btowc \
+ buffer-lcm \
+ byteswap \
+ c-strcase \
+ calloc-gnu \
+ canon-host \
+ canonicalize \
+ chmodat \
+ chown \
+ chownat \
+ cl-strtod \
+ cl-strtold \
+ cloexec \
+ closein \
+ closeout \
+ config-h \
+ configmake \
+ copy-file-range \
+ count-leading-zeros \
+ crypto/md5 \
+ crypto/sha1 \
+ crypto/sha256 \
+ crypto/sha512 \
+ crypto/sm3 \
+ cycle-check \
+ d-ino \
+ d-type \
+ di-set \
+ dirfd \
+ dirname \
+ do-release-commit-and-tag \
+ dtoastr \
+ dup2 \
+ environ \
+ error \
+ euidaccess \
+ exclude \
+ exitfail \
+ explicit_bzero \
+ faccessat \
+ fadvise \
+ fchdir \
+ fchmodat \
+ fchownat \
+ fclose \
+ fcntl \
+ fcntl-safer \
+ fd-reopen \
+ fdatasync \
+ fdopen \
+ fdutimensat \
+ file-has-acl \
+ file-type \
+ fileblocks \
+ filemode \
+ filenamecat \
+ filevercmp \
+ flexmember \
+ fnmatch-gnu \
+ fopen-safer \
+ fprintftime \
+ fpurge \
+ free-posix \
+ freopen \
+ freopen-safer \
+ fseeko \
+ fstatat \
+ fsusage \
+ fsync \
+ ftoastr \
+ ftruncate \
+ fts \
+ full-read \
+ full-write \
+ getgroups \
+ gethrxtime \
+ getline \
+ getloadavg \
+ getlogin \
+ getndelim2 \
+ getopt-gnu \
+ getpagesize \
+ getpass-gnu \
+ gettext-h \
+ gettime \
+ gettime-res \
+ getugroups \
+ getusershell \
+ git-version-gen \
+ gitlog-to-changelog \
+ gnu-make \
+ gnu-web-doc-update \
+ gnumakefile \
+ gnupload \
+ group-member \
+ hard-locale \
+ hash \
+ hash-triple \
+ heap \
+ host-os \
+ human \
+ idcache \
+ idx \
+ ignore-value \
+ inttostr \
+ inttypes \
+ isapipe \
+ isatty \
+ isblank \
+ largefile \
+ lchmod \
+ lchown \
+ ldtoastr \
+ lib-ignore \
+ libgmp \
+ linebuffer \
+ link \
+ link-follow \
+ linkat \
+ long-options \
+ lstat \
+ maintainer-makefile \
+ malloc-gnu \
+ manywarnings \
+ mbrlen \
+ mbrtowc \
+ mbsalign \
+ mbschr \
+ mbslen \
+ mbswidth \
+ memcasecmp \
+ memchr \
+ memcmp2 \
+ mempcpy \
+ memrchr \
+ mgetgroups \
+ minmax \
+ mkancesdirs \
+ mkdir \
+ mkdir-p \
+ mkdirat \
+ mkfifo \
+ mkfifoat \
+ mknod \
+ mkostemp \
+ mkstemp \
+ mktime \
+ modechange \
+ mountlist \
+ mpsort \
+ netinet_in \
+ nproc \
+ nstrftime \
+ nullptr \
+ obstack \
+ open \
+ openat-safer \
+ parse-datetime \
+ parse-datetime2 \
+ pathmax \
+ perl \
+ physmem \
+ pipe-posix \
+ pipe2 \
+ posix-shell \
+ posixtm \
+ posixver \
+ priv-set \
+ progname \
+ propername-lite \
+ pthread-cond \
+ pthread-mutex \
+ pthread-thread \
+ pthread_sigmask \
+ putenv \
+ quote \
+ quotearg \
+ randint \
+ randperm \
+ rawmemchr \
+ read-file \
+ readlink \
+ readtokens \
+ readtokens0 \
+ readutmp \
+ realloc-gnu \
+ regex \
+ remove \
+ rename \
+ renameat \
+ renameatu \
+ rmdir \
+ root-dev-ino \
+ rpmatch \
+ safe-read \
+ same \
+ save-cwd \
+ savedir \
+ savewd \
+ select \
+ selinux-at \
+ setenv \
+ settime \
+ sig2str \
+ sigaction \
+ smack \
+ ssize_t \
+ stat-macros \
+ stat-size \
+ stat-time \
+ stdbool \
+ stdckdint \
+ stdlib-safer \
+ stpcpy \
+ stpncpy \
+ strdup-posix \
+ strncat \
+ strnumcmp \
+ strsignal \
+ strtoimax \
+ strtoumax \
+ symlinkat \
+ sys_ioctl \
+ sys_resource \
+ sys_stat \
+ sys_wait \
+ targetdir \
+ tempname \
+ termios \
+ time_rz \
+ timer-time \
+ timespec \
+ tmpdir \
+ tzset \
+ uname \
+ unicodeio \
+ unistd-safer \
+ unlink-busy \
+ unlinkat \
+ unlinkdir \
+ unlocked-io \
+ unsetenv \
+ update-copyright \
+ useless-if-before-free \
+ userspec \
+ utimecmp \
+ utimens \
+ utimensat \
+ vasprintf-posix \
+ vc-list-files \
+ verify \
+ verror \
+ version-etc-fsf \
+ wchar-single \
+ wcswidth \
+ wcwidth \
+ winsz-ioctl \
+ winsz-termios \
+ write-any-file \
+ xalignalloc \
+ xalloc \
+ xbinary-io \
+ xdectoint \
+ xfts \
+ xgetcwd \
+ xgetgroups \
+ xgethostname \
+ xmemcoll \
+ xnanosleep \
+ xprintf \
+ xprintf-posix \
+ xreadlink \
+ xstrtod \
+ xstrtoimax \
+ xstrtol \
+ xstrtol-error \
+ xstrtold \
+ xstrtoumax \
+ year2038-recommended \
+ yesno

steps/coreutils-9.4/pass1.sh

@@ -1,5 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
 # SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -8,14 +9,17 @@ regenerate_files() {
     build-aux/gen-lists-of-programs.sh --automake > src/cu-progs.mk
     build-aux/gen-single-binary.sh src/local.mk > src/single-binary.mk
     touch ChangeLog
-    cp ../gnulib-d279bc/build-aux/po/Makefile.in.in po/Makefile.in.in
+    cp ../gnulib-bb5bb43/build-aux/po/Makefile.in.in po/Makefile.in.in
+
+    # Remove pregenerated gnulib files
+    pushd ../gnulib-bb5bb43
+    rm lib/uniwidth/width*.h
+    rm lib/unictype/ctype*.h
+    rm lib/unicase/tolower.h
+    popd
 
     . ../../import-gnulib.sh
 
-    # Disable generation of man pages due to lack of needed perl 5.8
-    # dependency.
-    cp man/dummy-man man/help2man
-
     VERSION=$(basename "${BASH_SOURCE[0]}" .sh | sed 's/coreutils-//')
     echo "$VERSION" > .tarball-version
 
@@ -35,14 +39,16 @@ src_configure() {
     # In some environments, the configure script would set it to
     # "no, but it is partly working", and in others it would set it
     # to "yes", producing different build outputs.
+    # Also, tell coreutils we don't have perl, which disables help2man
     FORCE_UNSAFE_CONFIGURE=1 ./configure CFLAGS="-static" \
         --prefix="${PREFIX}" \
         --build=i386-unknown-linux-musl \
-        gl_cv_func_getcwd_path_max="no, but it is partly working"
+        gl_cv_func_getcwd_path_max="no, but it is partly working" \
+        gl_cv_prog_perl="no"
 }
 
 src_compile() {
-    make "${MAKEJOBS}" PREFIX="${PREFIX}" MAKEINFO="true"
+    make "${MAKEJOBS}" PREFIX="${PREFIX}" MAKEINFO="true" GPERF="true"
 }
 
 src_install() {

steps/coreutils-9.4/patches/force_to_use_nanosleep.patch

@@ -7,8 +7,8 @@ We always assume that kernel doesn't have correct implementation and
 instead use function from gnulib with fix. That fixes reproducibility
 problem across different kernels.
 
---- ../gnulib-d279bc/m4/nanosleep.m4
+--- ../gnulib-bb5bb43/m4/nanosleep.m4
-+++ ../gnulib-d279bc/m4/nanosleep.m4
++++ ../gnulib-bb5bb43/m4/nanosleep.m4
 @@ -85,23 +85,9 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
              ts_sleep.tv_nsec = 1;
              #if HAVE_DECL_ALARM

steps/coreutils-9.4/sources

@@ -0,0 +1,17 @@
+http://git.savannah.gnu.org/cgit/coreutils.git/snapshot/coreutils-9.4.tar.xz 8fb56810310253300b3d6f84e68dc97eb2d74e1f4f78e05776831d9d82e4f2d7
+http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-bb5bb43.tar.gz b8aa1ac1b18c67f081486069e6a7a5564f20431c2313a94c20a46dcfb904be2a
+http://ftp.unicode.org/Public/15.0.0/ucd/UnicodeData.txt 806e9aed65037197f1ec85e12be6e8cd870fc5608b4de0fffd990f689f376a73 UnicodeData-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/PropList.txt e05c0a2811d113dae4abd832884199a3ea8d187ee1b872d8240a788a96540bfd PropList-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/DerivedCoreProperties.txt d367290bc0867e6b484c68370530bdd1a08b6b32404601b8c7accaf83e05628d DerivedCoreProperties-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/emoji/emoji-data.txt 29071dba22c72c27783a73016afb8ffaeb025866740791f9c2d0b55cc45a3470 emoji-data-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/ArabicShaping.txt eb840f36e0a7446293578c684a54c6d83d249abde7bdd4dfa89794af1d7fe9e9 ArabicShaping-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/Scripts.txt cca85d830f46aece2e7c1459ef1249993dca8f2e46d51e869255be140d7ea4b0 Scripts-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/Blocks.txt 529dc5d0f6386d52f2f56e004bbfab48ce2d587eea9d38ba546c4052491bd820 Blocks-15.0.0.txt
+http://ftp.unicode.org/Public/3.0-Update1/PropList-3.0.1.txt 909eef4adbeddbdddcd9487c856fe8cdbb8912aa8eb315ed7885b6ef65f4dc4c
+http://ftp.unicode.org/Public/15.0.0/ucd/EastAsianWidth.txt 743e7bc435c04ab1a8459710b1c3cad56eedced5b806b4659b6e69b85d0adf2a EastAsianWidth-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/LineBreak.txt 012bca868e2c4e59a5a10a7546baf0c6fb1b2ef458c277f054915c8a49d292bf LineBreak-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/auxiliary/WordBreakProperty.txt 5188a56e91593467c2e912601ebc78750e6adc9b04541b8c5becb5441e388ce2 WordBreakProperty-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/auxiliary/GraphemeBreakProperty.txt 5a0f8748575432f8ff95e1dd5bfaa27bda1a844809e17d6939ee912bba6568a1 GraphemeBreakProperty-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/CompositionExclusions.txt 3b019c0a33c3140cbc920c078f4f9af2680ba4f71869c8d4de5190667c70b6a3 CompositionExclusions-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/SpecialCasing.txt 78b29c64b5840d25c11a9f31b665ee551b8a499eca6c70d770fcad7dd710f494 SpecialCasing-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/CaseFolding.txt cdd49e55eae3bbf1f0a3f6580c974a0263cb86a6a08daa10fbf705b4808a56f7 CaseFolding-15.0.0.txt

steps/helpers.sh

@@ -113,11 +113,12 @@ bin_preseed() {
 # that can be overridden on per package basis in the build script.
 # build takes two arguments:
 # 1) name-version of the package
-# 2) optionally specify build script. Default is name-version.sh
+# 2) optionally specify build script. Default is pass$((revision+1)).sh
 # 3) optionally specify directory to cd into
 build() {
     pkg=$1
-    script_name=${2:-${pkg}.sh}
+    get_revision "${pkg}"
+    script_name=${2:-pass$((revision+1)).sh}
     dirname=${3:-${pkg}}
 
     # shellcheck disable=SC2015
@@ -176,7 +177,6 @@ build() {
     call $build_stage
 
     echo "${pkg}: creating package."
-    get_revision "${pkg}"
     cd "${DESTDIR}"
     src_pkg
 

steps/jump/move_disk.sh

@@ -22,7 +22,9 @@ while ! dd if=/dev/${DISK} of=/dev/null bs=512 count=1; do
 done
 
 # Create partition if it doesn't exist
-if [ $(($(stat -c "%Lr" "/dev/${DISK}") % 8)) -eq 0 ]; then
+# 'stat -c "%T"' prints the minor device type in hexadecimal.
+# The decimal version (with "%Lr") is not available in this version of stat.
+if [ $((0x$(stat -c "%T" "/dev/${DISK}") % 8)) -eq 0 ]; then
     echo "Creating partition table..."
     # Start at 1GiB, use -S32 -H64 to align to MiB rather than cylinder boundary
     echo "2097152;" | sfdisk -uS -S32 -H64 --force "/dev/${DISK}"

steps/manifest

@@ -131,7 +131,7 @@ build: xz-5.4.1
 build: file-5.44
 build: libtool-2.4.7
 build: tar-1.34
-build: coreutils-8.32
+build: coreutils-9.4
 build: pkg-config-0.29.2
 build: make-4.2.1
 build: gmp-6.2.1

steps/mes-0.25/mes-0.25.amd64.checksums

@@ -1,14 +1,14 @@
-7493daf2b2777dcaddbc2fcdac7898b76b224ab3a6092deee03cddbda42e3185  /usr/bin/mes
+9c7318aceeb21856d3f0346d41cb41b794bc2c5c7bf3415e6067105c75e3824f  /usr/bin/mes
-5729f623e8175ea5cbd611798b4765bc747e086344a9788d8162f2fc70b81fa5  /usr/bin/mes-m2
+94668ea026e429f38bc37fadc75f987899784af4239f55b2951d87227b72aa98  /usr/bin/mes-m2
-8867e32ca3c3f50628918033bcb5e2773a0c92e3d7fe2fc1e802e6efb6348de5  /usr/bin/mescc.scm
+a7375f00fdafff9d76ec63290471c97123b0e29b21747b21604835235b5bb3b7  /usr/bin/mescc.scm
 c66de1ba72b8019eee113271638e4e30543aa7d34f45c9cc751346dba0d8817c  /usr/lib/x86_64-mes/crt1.s
 d0a80b94228deb99bda15244f0ed3736badd0632c78a3379195ba24a78f68a75  /usr/lib/x86_64-mes/crt1.o
 ff5640d78b9924dd40157596438da4108a97fe658806fbbadced38b4020395f4  /usr/lib/x86_64-mes/x86_64.M1
 684bfcde34f118026d875acf2dbe2e4a39dce96d5f938f534995b582ba1a4241  /usr/lib/x86_64-mes/libmescc.s
-aaee649b01e8792d87c3f4e3224d3af7b50ca8ff8990884176d3399fa533fac3  /usr/lib/x86_64-mes/libc+tcc.s
+7f5c8d9a5226fd33aa310e4d76151fb4f39969387ea00527356f7891f9e7ff6b  /usr/lib/x86_64-mes/libc+tcc.s
 53de3c338d82cb45848193b95d319b7a860d289a14824f1961c655b167aabd68  /usr/lib/x86_64-mes/libc.s
 ad1f1e390f675db2a3545aecc63df798d49317cad2ae5eadb9382df960bbd9f3  /usr/lib/x86_64-mes/libmescc.a
-de562df5c7232ee87629a4cf93ca63be9b91453f9a1538c1c62ad09c597840c9  /usr/lib/x86_64-mes/libc+tcc.a
+5bce272890558f2c628030eeff06889346398d15ebe46bb9d9f116162fa6f547  /usr/lib/x86_64-mes/libc+tcc.a
 264bfb52a14957759e65c9c1224f0ca750713107586db367a2e235729797ecda  /usr/lib/x86_64-mes/libc.a
 48c57492e80a99bf16eeba55e242b60b9e759992482b651d1b512f07ddd9a65a  /usr/lib/linux/x86_64-mes/elf64-header.hex2
 94c796cb34a6e581491d0cf609e7fad01715c84a17b8b2017178a36568a80e48  /usr/lib/linux/x86_64-mes/elf64-footer-single-main.hex2

steps/mes-0.25/mes-0.25.x86.checksums

@@ -5,10 +5,10 @@ ab14556dd405debd1fc4aa18bffea9ee8c89bc8fa89f745e8fb20c9da83e5809  /usr/bin/mes
 494f184a87175abc485a898c250c3831b2b5dcf5aead46591e00b39d1c5529fc  /usr/lib/x86-mes/crt1.o
 8afe05c3e1e8848b6f3e8de751524de5f69818eb8524659827918e3fddde3e1e  /usr/lib/x86-mes/x86.M1
 771988b1df0dfa04bf5f1ab72af18c32b1a8205a07f10e5235d79dac0a072b00  /usr/lib/x86-mes/libmescc.s
-89024362827679beffb4a70287d66609d07a3cf4a1972c1c40797bfa0324a49e  /usr/lib/x86-mes/libc+tcc.s
+d19d053950349296c7d33a6297831e0da12ff79c5b758187ce8b7759192f7d4a  /usr/lib/x86-mes/libc+tcc.s
 5ea659501bda293f9297b599b1385ed4d54bab0e6daf3207fc61429adc9abc78  /usr/lib/x86-mes/libc.s
 52f697278ccdff5e457f27e10f465a91ab9858f0c6cee0683831cadb3109bbb7  /usr/lib/x86-mes/libmescc.a
-7c737307c870d74a309cec58f6b67fa4961d582614f3ed0f39b5794e3705794a  /usr/lib/x86-mes/libc+tcc.a
+90d3e29ecc5af3a94f6540deb6e6f7a713da1c921f7853867f4e4bcc861e4a56  /usr/lib/x86-mes/libc+tcc.a
 db62874a6cebeb0652945cb91cb91ade9783e631aaef5ec279e11aeca6adc421  /usr/lib/x86-mes/libc.a
 82cac4353375a52efecc6fda1f8b37373988fe41ed197b63d8e906321b105d77  /usr/lib/linux/x86-mes/elf32-header.hex2
 f9873d9aab12e70f24d97f8319e17a1e698ca60779ae9a6ab3ede648cd60fc61  /usr/lib/linux/x86-mes/elf32-footer-single-main.hex2

steps/mes-0.25/pass1.kaem

@@ -262,8 +262,8 @@ mescc lib/${MES_ARCH}-mes-mescc/setjmp.c
 mescc lib/linux/close.c
 mescc lib/linux/rmdir.c
 mescc lib/linux/stat.c
-catm ${LIBDIR}/${MES_ARCH}-mes/libc+tcc.a ${LIBDIR}/${MES_ARCH}-mes/libc.a islower.o isupper.o tolower.o toupper.o abtod.o dtoab.o search-path.o execvp.o fclose.o fdopen.o ferror.o fflush.o fopen.o fprintf.o fread.o fseek.o ftell.o fwrite.o printf.o remove.o snprintf.o sprintf.o sscanf.o vfprintf.o vprintf.o vsnprintf.o vsprintf.o vsscanf.o calloc.o qsort.o strtod.o strtof.o strtol.o strtold.o strtoll.o strtoul.o strtoull.o memmem.o strcat.o strchr.o strlwr.o strncpy.o strrchr.o strstr.o strupr.o sigaction.o ldexp.o mprotect.o localtime.o sigemptyset.o setjmp.o close.o rmdir.o stat.o
+catm ${LIBDIR}/${MES_ARCH}-mes/libc+tcc.a ${LIBDIR}/${MES_ARCH}-mes/libc.a islower.o isupper.o tolower.o toupper.o abtod.o dtoab.o search-path.o execvp.o fclose.o fdopen.o ferror.o fflush.o fopen.o fprintf.o fread.o fseek.o ftell.o fwrite.o printf.o remove.o snprintf.o sprintf.o sscanf.o vfprintf.o vprintf.o vsnprintf.o vsprintf.o vsscanf.o abort.o calloc.o qsort.o strtod.o strtof.o strtol.o strtold.o strtoll.o strtoul.o strtoull.o memmem.o strcat.o strchr.o strlwr.o strncpy.o strrchr.o strstr.o strupr.o sigaction.o ldexp.o mprotect.o localtime.o sigemptyset.o setjmp.o close.o rmdir.o stat.o
-catm ${LIBDIR}/${MES_ARCH}-mes/libc+tcc.s ${LIBDIR}/${MES_ARCH}-mes/libc.s islower.s isupper.s tolower.s toupper.s abtod.s dtoab.s search-path.s execvp.s fclose.s fdopen.s ferror.s fflush.s fopen.s fprintf.s fread.s fseek.s ftell.s fwrite.s printf.s remove.s snprintf.s sprintf.s sscanf.s vfprintf.s vprintf.s vsnprintf.s vsprintf.s vsscanf.s calloc.s qsort.s strtod.s strtof.s strtol.s strtold.s strtoll.s strtoul.s strtoull.s memmem.s strcat.s strchr.s strlwr.s strncpy.s strrchr.s strstr.s strupr.s sigaction.s ldexp.s mprotect.s localtime.s sigemptyset.s setjmp.s close.s rmdir.s stat.s
+catm ${LIBDIR}/${MES_ARCH}-mes/libc+tcc.s ${LIBDIR}/${MES_ARCH}-mes/libc.s islower.s isupper.s tolower.s toupper.s abtod.s dtoab.s search-path.s execvp.s fclose.s fdopen.s ferror.s fflush.s fopen.s fprintf.s fread.s fseek.s ftell.s fwrite.s printf.s remove.s snprintf.s sprintf.s sscanf.s vfprintf.s vprintf.s vsnprintf.s vsprintf.s vsscanf.s abort.s calloc.s qsort.s strtod.s strtof.s strtol.s strtold.s strtoll.s strtoul.s strtoull.s memmem.s strcat.s strchr.s strlwr.s strncpy.s strrchr.s strstr.s strupr.s sigaction.s ldexp.s mprotect.s localtime.s sigemptyset.s setjmp.s close.s rmdir.s stat.s
 
 # Make directories
 mkdir ${PREFIX}/lib/linux ${INCDIR}/mes ${INCDIR}/sys ${INCDIR}/linux ${INCDIR}/arch

steps/tcc-0.9.26/tcc-0.9.26.x86.checksums

@@ -1,4 +1,4 @@
-f3c51ecb0e5d0865822dd0e83dc459ccfd2576ecad845bc888558ab010e2a609  /usr/bin/tcc-mes
+48f0ac2f1fb8002a6a6958557732b83778f744de3e09085987d65c6981a57ab3  /usr/bin/tcc-mes
 b758fff28f3d03b057b0414eb92da0c46e22bc8e9da29af33fbe65b01047d25d  /usr/bin/tcc-boot0
 56e267e3031f548ea155d61a97fc3e6e8fff277159d7ae3273820a8c0f4582a0  /usr/bin/tcc-boot1
 3404d1e8f61be09c1caeba03dcf99abae8881a485fe13160e6bb5fe44538d378  /usr/bin/tcc