Update several packages, various fixes to compilation, various boot fixes

This commit is contained in:
Nathan Fisher 2022-08-26 10:33:22 -04:00
parent 828f465435
commit 2f9598382b
50 changed files with 177 additions and 30413 deletions

View File

@ -69,7 +69,7 @@ $(build)/.built: $(tooldir)/.built $(build)/.skeleton.built
find $(build)/lib $(build)/usr/lib $(build)/usr/lib64 -name '*.la' -delete find $(build)/lib $(build)/usr/lib $(build)/usr/lib64 -name '*.la' -delete
touch $@ touch $@
buildkernel: $(build)/.kernel.built buildkernel: $(build)/.kernel.built $(build)/.firmware.built
$(info $(grn)=== Kernel build complete ===$(reset)) $(info $(grn)=== Kernel build complete ===$(reset))
.PHONY: buildkernel .PHONY: buildkernel
@ -78,6 +78,10 @@ $(build)/.kernel.built:
$(MAKE) -C kernel $(MAKE) -C kernel
touch $@ touch $@
$(build)/.firmware.built:
$(MAKE) -C firmware
touch $@
strip: $(build)/.stripped strip: $(build)/.stripped
.PHONY: strip .PHONY: strip

View File

@ -63,6 +63,7 @@ libressl-${libressl_version}.tar.gz \
libtool-${libtool_version}.tar.xz \ libtool-${libtool_version}.tar.xz \
libz-${libz_version}.tar.gz \ libz-${libz_version}.tar.gz \
linux-${linux_version}.tar.xz \ linux-${linux_version}.tar.xz \
linux-firmware-$(linux-firmware_version).tar.xz \
m4-${m4_version}.tar.xz \ m4-${m4_version}.tar.xz \
make-${make_version}.tar.gz \ make-${make_version}.tar.gz \
mandoc-${mandoc_version}.tar.gz \ mandoc-${mandoc_version}.tar.gz \
@ -375,6 +376,11 @@ linux: linux-${linux_version}.tar.xz
linux-${linux_version}.tar.xz: linux-${linux_version}.tar.xz:
wget -c ${kernel}/kernel/v5.x/$@ wget -c ${kernel}/kernel/v5.x/$@
linux-firmware: linux-formware-$(linux-firmware_version).tar.xz
linux-firmware-$(linux-firmware_version).tar.xz:
wget -c https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/$@
linux_rpi: linux_rpi-${linux_rpi_version}.tar.xz linux_rpi: linux_rpi-${linux_rpi_version}.tar.xz
linux_rpi-${linux_rpi_version}.tar.xz: linux_rpi-${linux_rpi_version}.tar.xz:
@ -519,7 +525,7 @@ sed-${sed_version}.tar.xz:
shadow: shadow-${shadow_version}.tar.xz shadow: shadow-${shadow_version}.tar.xz
shadow-${shadow_version}.tar.xz: shadow-${shadow_version}.tar.xz:
wget -c ${github}/shadow-maint/shadow/releases/download/v${shadow_version}/$@ wget -c ${github}/shadow-maint/shadow/releases/download/${shadow_version}/$@
skalibs: skalibs-${skalibs_version}.tar.gz skalibs: skalibs-${skalibs_version}.tar.gz

23
firmware/Makefile Normal file
View File

@ -0,0 +1,23 @@
# Makefile - hhl - /usr/src/world/linux-firmware
# Copyright 2022 Nathan Fisher <nfisher.sr@gmail.com>
#
distname = linux-firmware
default_goal = install_firmware
include world.mk
objdir = $(srcdir)
install_firmware: $(objdir)/.installed
$(objdir)/.installed: $(srcdir)/.dirstamp | $(DESTDIR)/lib/firmware
cp -Rv $(srcdir)/* $(DESTDIR)/lib/firmware
$(DESTDIR)/lib/firmware:
install -d $@
$(srcdir)/.dirstamp: $(distlocal)
$(info $(grn)=== Extracting $(distlocal) ===$(reset))
tar -xf $(distlocal) -C $(basedir)/build/src-world-$(arch)
touch $@
$(distlocal):
$(MAKE) -C ../distfiles $(distfile)

View File

@ -19,13 +19,13 @@ curl_version = 7.84.0
dash_version = 0.5.11 dash_version = 0.5.11
dbus_version = 1.12.18 dbus_version = 1.12.18
diffutils_version = 3.8 diffutils_version = 3.8
dhcpcd_version = 8.1.6 dhcpcd_version = 9.4.1
e2fsprogs_version = 1.46.5 e2fsprogs_version = 1.46.5
elfutils_version = 0.186 elfutils_version = 0.187
eudev_version = 3.2.11 eudev_version = 3.2.11
execline_version = 2.9.0.1 execline_version = 2.9.0.1
expat_version = 2.4.8 expat_version = 2.4.8
file_version = 5.41 file_version = 5.42
findutils_version = 4.9.0 findutils_version = 4.9.0
flex_version = 2.6.4 flex_version = 2.6.4
gawk_version = 5.1.1 gawk_version = 5.1.1
@ -39,28 +39,29 @@ gperf_version = 3.1
grep_version = 3.7 grep_version = 3.7
groff_version = 1.22.4 groff_version = 1.22.4
grub_version = 2.06 grub_version = 2.06
gzip_version = 1.11 gzip_version = 1.12
haveged_version = 1.9.18 haveged_version = 1.9.18
iana-etc_version = 20220207 iana-etc_version = 20220812
inetutils_version = 2.2 inetutils_version = 2.3
intltool_version = 0.51.0 intltool_version = 0.51.0
iproute2_version = 5.16.0 iproute2_version = 5.19.0
kbd_version = 2.4.0 kbd_version = 2.5.1
kmod_version = 29 kmod_version = 30
less_version = 590 less_version = 590
libcap_version = 2.47 libcap_version = 2.65
libedit_version = 20191231-3.1 libedit_version = 20191231-3.1
libelf-compat_version = 0.152 libelf-compat_version = 0.152
libffi_version = 3.4.2 libffi_version = 3.4.2
libnl_version = 3.5.0 libnl_version = 3.5.0
libressl_version = 3.0.2 libressl_version = 3.0.2
libtool_version = 2.4.6 libtool_version = 2.4.7
libz_version = 1.2.8.2015.12.26 libz_version = 1.2.8.2015.12.26
linux_version = 5.19.3 linux_version = 5.19.4
linux-firmware_version = 20220815
linux_rpi_version = 5.4.45 linux_rpi_version = 5.4.45
m4_version = 1.4.19 m4_version = 1.4.19
make_version = 4.3 make_version = 4.3
man-pages_version = 5.10 man-pages_version = 5.13
mandoc_version = 1.14.5 mandoc_version = 1.14.5
meson_version = 0.61.1 meson_version = 0.61.1
mpc_version = 1.2.1 mpc_version = 1.2.1
@ -69,27 +70,27 @@ musl_version = 1.2.2
musl-fts_version = 1.2.7 musl-fts_version = 1.2.7
ncurses_version = 6.3 ncurses_version = 6.3
netbsd-curses_version = 0.3.1 netbsd-curses_version = 0.3.1
ninja_version = 1.10.2 ninja_version = 1.11.0
openssl_version = 3.0.1 openssl_version = 3.0.5
patch_version = 2.7.6 patch_version = 2.7.6
pcre_version = 8.45 pcre_version = 8.45
perl_version = 5.36.0 perl_version = 5.36.0
perl-cross_version = 1.3.5 perl-cross_version = 1.3.5
pkg-config_version = 0.29.2 pkg-config_version = 0.29.2
pkgsrc_version = 2020Q3 pkgsrc_version = 2022Q2
procps-ng_version = 3.3.16 procps-ng_version = 3.3.16
psmisc_version = 23.4 psmisc_version = 23.5
python_version = 3.10.2 python_version = 3.10.6
s6_version = 2.11.1.2 s6_version = 2.11.1.2
s6-linux-init_version = 1.0.8.0 s6-linux-init_version = 1.0.8.0
s6-rc_version = 0.5.3.2 s6-rc_version = 0.5.3.2
sed_version = 4.8 sed_version = 4.8
shadow_version = 4.11.1 shadow_version = 4.12.2
skalibs_version = 2.12.0.1 skalibs_version = 2.12.0.1
sysklogd_version = 1.5.1 sysklogd_version = 1.5.1
tar_version = 1.34 tar_version = 1.34
texinfo_version = 6.8 texinfo_version = 6.8
tzdata_version = 2021e tzdata_version = 2022c
u-boot_version = 2021.01 u-boot_version = 2021.01
udev-lfs_version = 20171102 udev-lfs_version = 20171102
util-linux_version = 2.36.1 util-linux_version = 2.36.1
@ -98,6 +99,6 @@ wget_version = 1.21.3
wireless_tools_version = 29 wireless_tools_version = 29
wpa_supplicant_version = 2.9 wpa_supplicant_version = 2.9
XML-Parser_version = 2.46 XML-Parser_version = 2.46
xz_version = 5.2.5 xz_version = 5.2.6
zsh_version = 5.8.1 zsh_version = 5.8.1
zstd_version = 1.5.2 zstd_version = 1.5.2

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -5,6 +5,7 @@ distname = glibc
patches += glibc-2.31-fhs-1.patch patches += glibc-2.31-fhs-1.patch
patches += glibc-no-test-installation.patch patches += glibc-no-test-installation.patch
patches += glibc-ldd-bash-in.patch
include world.mk include world.mk
-include locales.mk -include locales.mk

View File

@ -0,0 +1,9 @@
diff -Naur glibc-2.36.orig/elf/ldd.bash.in glibc-2.36/elf/ldd.bash.in
--- glibc-2.36.orig/elf/ldd.bash.in 2022-08-25 16:05:09.631944502 -0400
+++ glibc-2.36/elf/ldd.bash.in 2022-08-25 16:05:36.539082495 -0400
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Copyright (C) 1996-2022 Free Software Foundation, Inc.
# This file is part of the GNU C Library.

View File

@ -47,6 +47,7 @@ subdirs += gettext
#subdirs += argp-standalone #subdirs += argp-standalone
subdirs += elfutils subdirs += elfutils
subdirs += libffi subdirs += libffi
subdirs += gawk
#subdirs += libressl #subdirs += libressl
subdirs += openssl subdirs += openssl
subdirs += wget subdirs += wget

10
world/gawk/Makefile Normal file
View File

@ -0,0 +1,10 @@
# Makefile - hhl - /usr/src/world/gawk
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
#
distname = gawk
include world.mk
config_opts += --host=$(tgt)
config_opts += --with-sysroot=$(build)
include targets.mk

View File

@ -1,17 +1,17 @@
diff -Naur libcap-2.47.orig/Make.Rules libcap-2.47/Make.Rules diff -Naur libcap-2.65.orig/Make.Rules libcap-2.65/Make.Rules
--- libcap-2.47.orig/Make.Rules 2021-01-23 21:06:05.000000000 -0500 --- libcap-2.65.orig/Make.Rules 2022-08-25 21:32:12.478981513 -0400
+++ libcap-2.47/Make.Rules 2021-02-02 23:53:56.595677007 -0500 +++ libcap-2.65/Make.Rules 2022-08-25 21:33:55.027444454 -0400
@@ -76,7 +76,7 @@ @@ -63,7 +63,7 @@
KERNEL_HEADERS := $(topdir)/libcap/include/uapi
BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) LIBCAP_INCLUDES = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-SYSTEM_HEADERS = /usr/include -SYSTEM_HEADERS = /usr/include
+SYSTEM_HEADERS = $(SYSROOT)/usr/include +SYSTEM_HEADERS = $(SYSROOT)/usr/include
INCS=$(topdir)/libcap/include/sys/capability.h
LDFLAGS += -L$(topdir)/libcap SUDO := sudo
CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) CC := $(CROSS_COMPILE)gcc
@@ -89,7 +89,7 @@ @@ -121,7 +121,7 @@
# DYNAMIC controls how capsh etc are linked - to shared or static libraries # Force enabled with "make DYNAMIC=yes ...".
DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo $(SHARED); else echo no ; fi) DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo $(SHARED); else echo no ; fi)
-PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo $(SHARED) ; else echo no ; fi) -PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo $(SHARED) ; else echo no ; fi)

View File

@ -2,8 +2,9 @@
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com> # Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
# #
distname = man-pages distname = man-pages
patches += man-pages-destdir.patch
no_objdir = 1 no_objdir = 1
use_configure = 0 use_configure = 0
include world.mk include world.mk
build_cmd =
install_cmd = $(MAKE) DESTDIR=$(DESTDIR) prefix=/usr -C $(objdir) install
include targets.mk include targets.mk

View File

@ -1,22 +0,0 @@
diff -Naur man-pages-5.10.orig/Makefile man-pages-5.10/Makefile
--- man-pages-5.10.orig/Makefile 2020-12-21 10:20:40.000000000 -0500
+++ man-pages-5.10/Makefile 2021-02-01 15:42:12.024004277 -0500
@@ -1,6 +1,5 @@
-DESTDIR=
prefix?=/usr
-MANDIR=$(prefix)/share/man
+MANDIR=$(DESTDIR)$(prefix)/share/man
all: remove install
@@ -24,8 +23,8 @@
install:
for i in man?; do \
- install -d -m 755 $(DESTDIR)$(MANDIR)/"$$i" || exit $$?; \
- install -m 644 "$$i"/* $(DESTDIR)$(MANDIR)/"$$i" || exit $$?; \
+ install -d -m 755 $(MANDIR)/"$$i" || exit $$?; \
+ install -m 644 "$$i"/* $(MANDIR)/"$$i" || exit $$?; \
done
# Check if groff reports warnings (may be words of sentences not displayed)

View File

@ -2,7 +2,6 @@
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com> # Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
# #
distname = psmisc distname = psmisc
patches += psmisc-malloc.patch
include world.mk include world.mk
config_opts += --host=$(tgt) config_opts += --host=$(tgt)
export CFLAGS = --sysroot=$(DESTDIR) export CFLAGS = --sysroot=$(DESTDIR)

View File

@ -1,55 +0,0 @@
diff -Naur psmisc-23.3.orig/configure psmisc-23.3/configure
--- psmisc-23.3.orig/configure 2019-10-24 06:25:15.231547509 -0400
+++ psmisc-23.3/configure 2021-02-03 00:15:16.265839933 -0500
@@ -9658,25 +9658,9 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-else
- $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
- case " $LIBOBJS " in
- *" malloc.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
$as_echo_n "checking for working memcmp... " >&6; }
if ${ac_cv_func_memcmp_working+:} false; then :
@@ -9787,25 +9771,9 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
-if test $ac_cv_func_realloc_0_nonnull = yes; then :
$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
-else
- $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
-
- case " $LIBOBJS " in
- *" realloc.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define realloc rpl_realloc" >>confdefs.h
-
-fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
$as_echo_n "checking whether stat accepts an empty string... " >&6; }
if ${ac_cv_func_stat_empty_string_bug+:} false; then :

Binary file not shown.

View File

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,5 @@
#!/bin/execlineb -P
if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
envfile /etc/s6/sv/getty-tty1/conf
importas -iu SPAWN SPAWN
exec getty tty1

View File

@ -0,0 +1,5 @@
#!/bin/execlineb -P
if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
envfile /etc/s6/sv/getty-tty2/conf
importas -iu SPAWN SPAWN
exec getty tty2

View File

@ -0,0 +1,5 @@
#!/bin/execlineb -P
if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
envfile /etc/s6/sv/getty-tty3/conf
importas -iu SPAWN SPAWN
exec getty tty3

View File

@ -0,0 +1,5 @@
#!/bin/execlineb -P
if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
envfile /etc/s6/sv/getty-tty4/conf
importas -iu SPAWN SPAWN
exec getty tty4

View File

@ -0,0 +1,5 @@
#!/bin/execlineb -P
if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
envfile /etc/s6/sv/agetty-tty5/conf
importas -iu SPAWN SPAWN
exec getty tty5

View File

@ -0,0 +1,5 @@
#!/bin/execlineb -P
if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
envfile /etc/s6/sv/agetty-tty6/conf
importas -iu SPAWN SPAWN
exec getty tty6

View File

@ -0,0 +1 @@
../../uid/0/env

View File

@ -0,0 +1 @@
S6_FDHOLDER_STORE_REGEX

View File

@ -0,0 +1,17 @@
#!/usr/bin/execlineb -P
pipeline -dw --
{
if --
{
forstdin -x0 -- i
exit 0
}
if -nt --
{
redirfd -r 0 ./data/autofilled
s6-ipcclient -l0 -- s
/usr/libexec/s6-rc-fdholder-filler -1 --
}
s6-svc -t .
}
s6-fdholder-daemon -1 -i data/rules -- s

View File

@ -0,0 +1,8 @@
#!/usr/bin/execlineb -P
fdmove -c 2 1
fdmove 1 3
s6-ipcserver-socketbinder -- s
s6-ipcserverd -1 --
s6-ipcserver-access -v0 -E -l0 -i data/rules --
s6-sudod -t 30000 --
/usr/libexec/s6-rc-oneshot-run -l ../.. --

View File

@ -0,0 +1,3 @@
#!/usr/bin/execlineb -P
s6-fdholder-retrieve ../s6rc-fdholder/s "pipe:s6rc-r-udevd-log"
./run.user

View File

@ -0,0 +1,5 @@
#!/bin/execlineb -P
foreground { if -n -t { test -d /var/log/udevd } install -d -m 0755 -o s6log -g s6log /var/log/udevd }
envfile /etc/s6/sv/udevd-log/conf
importas -sCiu DIRECTIVES DIRECTIVES
s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /var/log/udevd

View File

@ -0,0 +1,5 @@
#!/usr/bin/execlineb -P
fdmove 1 0
s6-fdholder-retrieve ../s6rc-fdholder/s "pipe:s6rc-w-udevd-log"
fdswap 0 1
./run.user

View File

@ -0,0 +1,3 @@
#!/bin/execlineb -P
fdmove -c 2 1
exec udevd -D

View File

@ -2,7 +2,7 @@
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com> # Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
# #
subdirs = $(shell find . -maxdepth 1 -mindepth 1 -type d | grep -v file) subdirs = $(shell find . -maxdepth 1 -mindepth 1 -type d | grep -v file | grep -v awk)
all: ${subdirs} all: ${subdirs}