diff options
| -rw-r--r-- | sub/busybox/Makefile | 4 | ||||
| -rw-r--r-- | sub/busybox/host-full-config | 14 | ||||
| -rw-r--r-- | sub/kernel/Makefile | 2 | ||||
| -rw-r--r-- | sub/skarnet.org/Makefile | 2 |
4 files changed, 14 insertions, 8 deletions
diff --git a/sub/busybox/Makefile b/sub/busybox/Makefile index e362ff0..d516be0 100644 --- a/sub/busybox/Makefile +++ b/sub/busybox/Makefile @@ -1,5 +1,5 @@ -# Version from 2020-01-03 -BUSYBOX_VERSION := bd754746394a382e04d116df02547f61b2026da9 +# Version from 2020-01-20 +BUSYBOX_VERSION := 020abc8856f94d6e355f4daa972ac75fb05ae113 clean-busybox: rm -f $(OUTPUT)/sources/.lh_bb_cloned diff --git a/sub/busybox/host-full-config b/sub/busybox/host-full-config index 3261ec7..74b2ba6 100644 --- a/sub/busybox/host-full-config +++ b/sub/busybox/host-full-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.31.0.git -# Fri May 3 16:36:36 2019 +# Busybox version: 1.32.0.git +# Mon Jan 20 16:54:48 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -124,7 +125,7 @@ CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y CONFIG_FEATURE_USE_SENDFILE=y CONFIG_FEATURE_COPYBUF_KB=4 # CONFIG_FEATURE_SKIP_ROOTFS is not set -# CONFIG_MONOTONIC_SYSCALL is not set +CONFIG_MONOTONIC_SYSCALL=y CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_HWIB is not set @@ -420,7 +421,7 @@ CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_REGEX_SEARCH=n +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -458,6 +459,7 @@ CONFIG_FEATURE_ALLOW_EXEC=y # CONFIG_FEATURE_FIND_PRUNE is not set # CONFIG_FEATURE_FIND_QUIT is not set # CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_EMPTY is not set # CONFIG_FEATURE_FIND_PATH is not set # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -636,6 +638,7 @@ CONFIG_HD=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # CONFIG_MKE2FS is not set @@ -687,6 +690,7 @@ CONFIG_FEATURE_MOUNT_OTHERTAB=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set # CONFIG_UEVENT is not set # CONFIG_UMOUNT is not set # CONFIG_FEATURE_UMOUNT_ALL is not set @@ -945,6 +949,7 @@ CONFIG_FEATURE_NETSTAT_PRG=y # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -1150,6 +1155,7 @@ CONFIG_ASH_TEST=y # CONFIG_FEATURE_SH_MATH=y # CONFIG_FEATURE_SH_MATH_64 is not set +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set diff --git a/sub/kernel/Makefile b/sub/kernel/Makefile index 049069d..3c46acc 100644 --- a/sub/kernel/Makefile +++ b/sub/kernel/Makefile @@ -1,5 +1,5 @@ -KERNEL_VERSION ?= 5.4.7 +KERNEL_VERSION ?= 5.4.13 KERNEL_MAJOR := $(firstword $(subst ., ,$(KERNEL_VERSION))) KERNEL_ENV := DEPMOD=$(OUTPUT)/build-build/opt/kmod/bin/depmod INSTALL_MOD_PATH=$(OUTPUT)/rootfs CROSS_COMPILE=$(BUILD_HOST_PREFIX)- ARCH=$(KERNEL_GENERIC_ARCH) INSTALL_MOD_STRIP="-R .note -R .comment -R .note.GNU-stack --strip-debug" diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index 5381e03..1094023 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -306,7 +306,7 @@ $(OUTPUT)/build-host/.lh_s6li_laidout: $(OUTPUT)/build-host/.lh_s6li_installed | exec chown 98:98 $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir/run-image/uncaught-logs exec chmod 02750 $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir/run-image/uncaught-logs exec rm -rf $(OUTPUT)/rootfs/etc/s6-linux-init/current - exec mv -f $(OUTPUT)/build-host/s6lidir $(OUTPUT)/rootfs/etc/s6-linux-init/current + exec mv -f $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir $(OUTPUT)/rootfs/etc/s6-linux-init/current exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-host/.lh_mdevd_copied: $(OUTPUT)/sources/.lh_mdevd_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed |