diff --git a/Makefile b/Makefile index 34e284798..2678c4c82 100644 --- a/Makefile +++ b/Makefile @@ -459,6 +459,8 @@ bin_modules-$(CONFIG_HOTPKEY) += hotp-verification bin_modules-$(CONFIG_MSRTOOLS) += msrtools bin_modules-$(CONFIG_NKSTORECLI) += nkstorecli bin_modules-$(CONFIG_UTIL_LINUX) += util-linux +bin_modules-$(CONFIG_ZSTD) += zstd +bin_modules-$(CONFIG_BLAKE2) += blake2 $(foreach m, $(bin_modules-y), \ $(call map,initrd_bin_add,$(call bins,$m)) \ diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config index a7226da29..d4a618752 100644 --- a/boards/x230-hotp-maximized/x230-hotp-maximized.config +++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config @@ -37,6 +37,10 @@ CONFIG_TPMTOTP=y #With/Without TPM support CONFIG_HOTPKEY=y +#wyng-backup support +CONFIG_ZSTD=y +CONFIG_BLAKE2=y + #Nitrokey Storage admin tool CONFIG_NKSTORECLI=n diff --git a/config/busybox.config b/config/busybox.config index 3df67ef82..3b22dc1b3 100644 --- a/config/busybox.config +++ b/config/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.32.0 -# Wed Dec 30 20:23:50 2020 +# Busybox version: 1.35.0 +# Mon Jul 11 16:24:21 2022 # CONFIG_HAVE_DOT_CONFIG=y @@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_SYSLOG_INFO is not set # CONFIG_FEATURE_SYSLOG is not set -CONFIG_PLATFORM_LINUX=y # # Build Options @@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set CONFIG_STACK_OPTIMIZATION_386=y +CONFIG_STATIC_LIBGCC=y # # Installation Options ("make install" behavior) @@ -94,9 +94,12 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -120,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y # # Applets @@ -162,6 +157,8 @@ CONFIG_FEATURE_BZIP2_DECOMPRESS=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y +CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y +CONFIG_FEATURE_CPIO_RENUMBER_INODES=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set CONFIG_GZIP=y @@ -197,6 +194,22 @@ CONFIG_FEATURE_UNZIP_CDF=y # # Coreutils # +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for date and touch +# +# CONFIG_FEATURE_TIMEZONE is not set + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_FEATURE_CATN=y @@ -207,11 +220,13 @@ CONFIG_CHMOD=y # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y # CONFIG_CKSUM is not set +CONFIG_CRC32=y # CONFIG_COMM is not set CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_FEATURE_CP_REFLINK=y CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set @@ -223,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -289,7 +305,7 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SEQ=y CONFIG_SHRED=y -# CONFIG_SHUF is not set +CONFIG_SHUF=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_SORT=y @@ -316,13 +332,12 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y # CONFIG_TIMEOUT is not set CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y -# CONFIG_TRUNCATE is not set +CONFIG_TRUNCATE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -331,6 +346,7 @@ CONFIG_UNIQ=y # CONFIG_UNLINK is not set CONFIG_USLEEP=y # CONFIG_UUDECODE is not set +CONFIG_BASE32=y CONFIG_BASE64=y # CONFIG_UUENCODE is not set CONFIG_WC=y @@ -341,21 +357,6 @@ CONFIG_FEATURE_WC_LARGE=y # CONFIG_WHOAMI is not set # CONFIG_YES is not set -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - # # Console Utilities # @@ -419,6 +420,7 @@ CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_COLON_EXPAND=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -432,6 +434,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_UNDO=y CONFIG_FEATURE_VI_UNDO_QUEUE=y CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_VI_VERBOSE_STATUS=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -440,7 +443,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y CONFIG_FIND=y CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_ATIME=y +CONFIG_FEATURE_FIND_CTIME=y CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_AMIN=y +CONFIG_FEATURE_FIND_CMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_EXECUTABLE=y @@ -448,6 +455,7 @@ CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_SAMEFILE=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y @@ -619,7 +627,6 @@ CONFIG_FSFREEZE=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y CONFIG_HD=y CONFIG_XXD=y CONFIG_HWCLOCK=y @@ -711,6 +718,7 @@ CONFIG_VOLUMEID=y CONFIG_FEATURE_VOLUMEID_BCACHE=y CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_EROFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_F2FS=y @@ -738,6 +746,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BC is not set @@ -833,6 +842,7 @@ CONFIG_TIME=y # CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -841,6 +851,9 @@ CONFIG_TIME=y # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_HWIB=y # CONFIG_FEATURE_TLS_SHA1 is not set CONFIG_ARP=y # CONFIG_ARPING is not set @@ -859,6 +872,7 @@ CONFIG_ARP=y # CONFIG_HOSTNAME is not set # CONFIG_DNSDOMAINNAME is not set # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -870,6 +884,10 @@ CONFIG_ARP=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_FEATURE_HTTPD_GZIP is not set +# CONFIG_FEATURE_HTTPD_ETAG is not set +# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set +# CONFIG_FEATURE_HTTPD_DATE is not set +# CONFIG_FEATURE_HTTPD_ACL_IP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -947,6 +965,7 @@ CONFIG_SSL_CLIENT=y # CONFIG_FEATURE_TELNET_WIDTH is not set # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set CONFIG_TFTP=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y @@ -967,6 +986,7 @@ CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y # CONFIG_FEATURE_WGET_STATUSBAR is not set +CONFIG_FEATURE_WGET_FTP=y # CONFIG_FEATURE_WGET_AUTHENTICATION is not set CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_FEATURE_WGET_HTTPS=y @@ -992,6 +1012,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/sbin/config-dhcp.sh" # # Common options for DHCP applets # +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 @@ -1009,17 +1030,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +CONFIG_FEATURE_SHOW_THREADS=y # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_IOSTAT is not set @@ -1058,7 +1081,6 @@ CONFIG_FEATURE_TOPMEM=y # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_WATCH is not set -CONFIG_FEATURE_SHOW_THREADS=y # # Runit Utilities @@ -1123,8 +1145,8 @@ CONFIG_ASH_CMDCMD=y # CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set diff --git a/config/linux-x230-maximized.config b/config/linux-x230-maximized.config index c886b9695..6d7386cf5 100644 --- a/config/linux-x230-maximized.config +++ b/config/linux-x230-maximized.config @@ -97,6 +97,8 @@ CONFIG_SATA_AHCI=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=y CONFIG_DM_VERITY=y CONFIG_DM_VERITY_FEC=y CONFIG_NETDEVICES=y diff --git a/initrd/etc/lvm/lvm.conf b/initrd/etc/lvm/lvm.conf new file mode 100644 index 000000000..347ff2f37 --- /dev/null +++ b/initrd/etc/lvm/lvm.conf @@ -0,0 +1,217 @@ +config { + checks=1 + abort_on_errors=0 + profile_dir="/etc/lvm/profile" +} +devices { + dir="/dev" + scan=["/dev"] + obtain_device_list_from_udev=1 + external_device_info_source="none" + # filter=["a|.*/|"] + # global_filter=["a|.*/|"] + cache_dir="/etc/lvm/cache" + cache_file_prefix="" + write_cache_state=1 + sysfs_scan=1 + multipath_component_detection=1 + md_component_detection=1 + fw_raid_component_detection=0 + md_chunk_alignment=1 + # default_data_alignment=1 + data_alignment_detection=1 + data_alignment=0 + data_alignment_offset_detection=1 + ignore_suspended_devices=0 + ignore_lvm_mirrors=1 + disable_after_error_count=0 + require_restorefile_with_uuid=1 + pv_min_size=2048 + issue_discards=0 + allow_changes_with_duplicate_pvs=0 +} +allocation { + maximise_cling=1 + use_blkid_wiping=0 + wipe_signatures_when_zeroing_new_lvs=1 + mirror_logs_require_separate_pvs=0 + # raid_stripe_all_devices=0 + cache_pool_metadata_require_separate_pvs=0 + # cache_mode="writethrough" + # cache_settings { + # } + thin_pool_metadata_require_separate_pvs=0 + # thin_pool_zero=1 + # thin_pool_discards="passdown" + # thin_pool_chunk_size_policy="generic" + # physical_extent_size=4096 +} +log { + # report_command_log=0 + # command_log_sort="log_seq_num" + # command_log_cols="log_seq_num,log_type,log_context,log_object_type,log_object_name,log_object_id,log_object_group,log_object_group_id,log_message,log_errno,log_ret_code" + # command_log_selection="!(log_type=status && message=success)" + verbose=0 + silent=0 + syslog=1 + overwrite=0 + level=0 + indent=1 + command_names=0 + prefix=" " + activation=0 + debug_classes=["memory","devices","activation","allocation","lvmetad","metadata","cache","locking","lvmpolld","dbus"] +} +backup { + backup=1 + backup_dir="/etc/lvm/backup" + archive=1 + archive_dir="/etc/lvm/archive" + retain_min=10 + retain_days=30 +} +shell { + history_size=100 +} +global { + umask=077 + test=0 + units="h" + si_unit_consistency=1 + suffix=1 + activation=1 + # fallback_to_lvm1=0 + # format="lvm2" + proc="/proc" + etc="/etc" + locking_type=1 + wait_for_locks=1 + fallback_to_clustered_locking=1 + fallback_to_local_locking=1 + locking_dir="/run/lock/lvm" + prioritise_write_locks=1 + # locking_library="liblvm2clusterlock.so" + abort_on_internal_errors=0 + detect_internal_vg_cache_corruption=0 + metadata_read_only=0 + mirror_segtype_default="raid1" + raid10_segtype_default="raid10" + sparse_segtype_default="thin" + # lvdisplay_shows_full_device_path=0 + use_lvmetad=0 + # lvmetad_update_wait_time=10 + use_lvmlockd=0 + # lvmlockd_lock_retries=3 + # sanlock_lv_extend=256 + thin_check_executable="" + thin_dump_executable="" + thin_repair_executable="" + # thin_check_options=["-q"] + # thin_repair_options=[""] + cache_check_executable="" + cache_dump_executable="" + cache_repair_executable="" + # cache_check_options=["-q"] + # cache_repair_options=[""] + system_id_source="none" + use_lvmpolld=0 + notify_dbus=1 +} +activation { + checks=0 + udev_sync=1 + udev_rules=1 + verify_udev_operations=0 + retry_deactivation=1 + missing_stripe_filler="error" + use_linear_target=1 + reserved_stack=64 + reserved_memory=8192 + process_priority=-18 + raid_region_size=512 + # error_when_full=0 + readahead="auto" + raid_fault_policy="warn" + mirror_image_fault_policy="remove" + mirror_log_fault_policy="allocate" + snapshot_autoextend_threshold=100 + snapshot_autoextend_percent=20 + thin_pool_autoextend_threshold=100 + thin_pool_autoextend_percent=20 + use_mlockall=0 + monitoring=1 + polling_interval=15 + # auto_set_activation_skip=1 + activation_mode="degraded" +} +# metadata { + # check_pv_device_sizes=1 + # record_lvs_history=0 + # lvs_history_retention_time=0 + # pvmetadatacopies=1 + # vgmetadatacopies=0 + # pvmetadatasize=255 + # pvmetadataignore=0 + # stripesize=64 +# } +# report { + # output_format="basic" + # compact_output=0 + # compact_output_cols="" + # aligned=1 + # buffered=1 + # headings=1 + # separator=" " + # list_item_separator="," + # prefixes=0 + # quoted=1 + # columns_as_rows=0 + # binary_values_as_numeric=0 + # time_format="%Y-%m-%d %T %z" + # devtypes_sort="devtype_name" + # devtypes_cols="devtype_name,devtype_max_partitions,devtype_description" + # devtypes_cols_verbose="devtype_name,devtype_max_partitions,devtype_description" + # lvs_sort="vg_name,lv_name" + # lvs_cols="lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,metadata_percent,move_pv,mirror_log,copy_percent,convert_lv" + # lvs_cols_verbose="lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,lv_kernel_major,lv_kernel_minor,pool_lv,origin,data_percent,metadata_percent,move_pv,copy_percent,mirror_log,convert_lv,lv_uuid,lv_profile" + # vgs_sort="vg_name" + # vgs_cols="vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free" + # vgs_cols_verbose="vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid,vg_profile" + # pvs_sort="pv_name" + # pvs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free" + # pvs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,dev_size,pv_uuid" + # segs_sort="vg_name,lv_name,seg_start" + # segs_cols="lv_name,vg_name,lv_attr,stripes,segtype,seg_size" + # segs_cols_verbose="lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize" + # pvsegs_sort="pv_name,pvseg_start" + # pvsegs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size" + # pvsegs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges" + # vgs_cols_full="vg_all" + # pvs_cols_full="pv_all" + # lvs_cols_full="lv_all" + # pvsegs_cols_full="pvseg_all,pv_uuid,lv_uuid" + # segs_cols_full="seg_all,lv_uuid" + # vgs_sort_full="vg_name" + # pvs_sort_full="pv_name" + # lvs_sort_full="vg_name,lv_name" + # pvsegs_sort_full="pv_uuid,pvseg_start" + # segs_sort_full="lv_uuid,seg_start" + # mark_hidden_devices=1 + # two_word_unknown_device=0 +# } +dmeventd { + mirror_library="libdevmapper-event-lvm2mirror.so" + # raid_library="libdevmapper-event-lvm2raid.so" + snapshot_library="libdevmapper-event-lvm2snapshot.so" + thin_library="libdevmapper-event-lvm2thin.so" + # executable="" +} +# tags { + # hosttags=0 + # tag { + # } +# } +local { + # system_id="" + # host_id=0 +} diff --git a/modules/blake2 b/modules/blake2 new file mode 100644 index 000000000..40c52d576 --- /dev/null +++ b/modules/blake2 @@ -0,0 +1,28 @@ +modules-$(CONFIG_BLAKE2) += blake2 + +blake2_depends := $(musl_dep) + +blake2_version := 54f4faa4c16ea34bcd59d16e8da46a64b259fc07 +blake2_dir := blake2-$(blake2_version) +blake2_tar := blake2-$(blake2_version).tar.gz +blake2_url := https://github.com/BLAKE2/BLAKE2/archive/$(blake2_version).tar.gz +blake2_hash := 710753a61f3f67eff11bc1a4e3374651a266493e6c1691c70197e72c3c6379d9 + +blake2_target := \ + $(MAKE_JOBS) \ + $(CROSS_TOOLS) \ + CFLAGS=" -Os -std=c89 -Wall -Wextra -pedantic -Wno-long-long -I../sse" \ + CROSS="$(CROSS)" \ + PREFIX="/" \ + DESTDIR="$(INSTALL)" \ + -C ./b2sum \ + + + +blake2_output := \ + b2sum/b2sum \ + +#blake2_configure := \ +# INSTALL="$(INSTALL)" \ +# CROSS="$(CROSS)" \ +# $(CROSS_TOOLS) $(MAKE) GITVERSION="" PKGCONFIG="" && $(MAKE) install INSTALL="$(INSTALL)" diff --git a/modules/busybox b/modules/busybox index ae240690b..2016313d8 100644 --- a/modules/busybox +++ b/modules/busybox @@ -2,11 +2,11 @@ CONFIG_BUSYBOX ?= y modules-$(CONFIG_BUSYBOX) += busybox -busybox_version := 1.32.0 +busybox_version := 1.35.0 busybox_dir := busybox-$(busybox_version) busybox_tar := busybox-$(busybox_version).tar.bz2 busybox_url := https://busybox.net/downloads/$(busybox_tar) -busybox_hash := c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 +busybox_hash := faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox_configure := $(MAKE) CC="$(heads_cc)" oldconfig busybox_config := config/busybox.config diff --git a/modules/zstd b/modules/zstd new file mode 100644 index 000000000..6c87002a4 --- /dev/null +++ b/modules/zstd @@ -0,0 +1,25 @@ +modules-$(CONFIG_ZSTD) += zstd + +zstd_depends := $(musl_dep) + +zstd_version := 1.4.9 +zstd_dir := zstd-$(zstd_version) +zstd_tar := zstd-$(zstd_version).tar.gz +zstd_url := https://github.com/facebook/zstd/releases/download/v$(zstd_version)/$(zstd_tar) +zstd_hash := 29ac74e19ea28659017361976240c4b5c5c24db3b89338731a6feb97c038d293 + +zstd_target := \ + CFLAGS="-Os" \ + $(MAKE_JOBS) \ + $(CROSS_TOOLS) \ + #LDFLAGS="-L$(INSTALL)/lib" \ + CROSS="$(CROSS)" \ + PREFIX="/" \ + DESTDIR="$(INSTALL)" \ + zstd install \ + +zstd_output := \ + zstd \ + +zstd_libraries:= \ + lib/libzstd.so.$(zstd_version) \ diff --git a/patches/busybox-1.35.0.patch b/patches/busybox-1.35.0.patch new file mode 100644 index 000000000..a706ade2f --- /dev/null +++ b/patches/busybox-1.35.0.patch @@ -0,0 +1,26 @@ +diff -u --recursive clean/busybox-1.28.0/libbb/messages.c busybox-1.28.0/libbb/messages.c +--- clean/busybox-1.28.0/libbb/messages.c 2017-10-20 04:36:58.000000000 -0400 ++++ busybox-1.35.0/libbb/messages.c 2018-02-09 12:02:45.918726483 -0500 +@@ -13,7 +13,7 @@ + + /* allow version to be extended, via CFLAGS */ + #ifndef BB_EXTRA_VERSION +-#define BB_EXTRA_VERSION " ("AUTOCONF_TIMESTAMP")" ++#define BB_EXTRA_VERSION " (heads)" + #endif + + const char bb_banner[] ALIGN1 = "BusyBox v" BB_VER BB_EXTRA_VERSION; +--- Makefile.orig 2022-08-26 12:39:20.559000000 -0400 ++++ busybox-1.35.0/Makefile 2022-08-26 12:39:32.850000000 -0400 +@@ -278,8 +278,8 @@ + # We need some generic definitions + include $(srctree)/scripts/Kbuild.include + +-HOSTCFLAGS += $(call hostcc-option,-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer,) +-HOSTCXXFLAGS += -O2 ++HOSTCFLAGS += $(call hostcc-option,-Wall -Wstrict-prototypes -Os -fomit-frame-pointer,) ++HOSTCXXFLAGS += -Os + + # For maximum performance (+ possibly random breakage, uncomment + # the following) +