Skip to content

Commit 25ce08a

Browse files
committed
config/linux-x230-maximized: add lvm thin provisioning and lvm snapshot support
modules/busybox: version bump to have better ash<-> bash compatibility config/busybox.config: add truncate and other needed stuff initd/etc/lvm/lvm.config: deactivate thin-provisioning binaries lookup modules/blake2: bsum2 checksuming support (wyng-backups requirement, not under busybox) modules/zstd: zstd 1.4.9 support (best compression algo, thanks to facebook. wyng-backup-extract.sh requirement) - pass ZSTD_LIB_MINIFY=1 to build to have -Os and other space optimized build Makefile: add glue to pack blake2 and zstd if configured in board boards/x230-hotp-maximized: add blake2 and zstd modules (working) PR for wyng-extract (non-working.... still in the process of removing bashisms but was not completely successful): tasket/wyng-backup#104
1 parent 493149b commit 25ce08a

File tree

9 files changed

+364
-38
lines changed

9 files changed

+364
-38
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,8 @@ bin_modules-$(CONFIG_HOTPKEY) += hotp-verification
459459
bin_modules-$(CONFIG_MSRTOOLS) += msrtools
460460
bin_modules-$(CONFIG_NKSTORECLI) += nkstorecli
461461
bin_modules-$(CONFIG_UTIL_LINUX) += util-linux
462+
bin_modules-$(CONFIG_ZSTD) += zstd
463+
bin_modules-$(CONFIG_BLAKE2) += blake2
462464

463465
$(foreach m, $(bin_modules-y), \
464466
$(call map,initrd_bin_add,$(call bins,$m)) \

boards/x230-hotp-maximized/x230-hotp-maximized.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ CONFIG_TPMTOTP=y
3737
#With/Without TPM support
3838
CONFIG_HOTPKEY=y
3939

40+
#wyng-backup support
41+
CONFIG_ZSTD=y
42+
CONFIG_BLAKE2=y
43+
4044
#Nitrokey Storage admin tool
4145
CONFIG_NKSTORECLI=n
4246

config/busybox.config

Lines changed: 58 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Busybox version: 1.32.0
4-
# Wed Dec 30 20:23:50 2020
3+
# Busybox version: 1.35.0
4+
# Mon Jul 11 16:24:21 2022
55
#
66
CONFIG_HAVE_DOT_CONFIG=y
77

@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
3636
# CONFIG_FEATURE_CLEAN_UP is not set
3737
# CONFIG_FEATURE_SYSLOG_INFO is not set
3838
# CONFIG_FEATURE_SYSLOG is not set
39-
CONFIG_PLATFORM_LINUX=y
4039

4140
#
4241
# Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
5554
CONFIG_EXTRA_LDLIBS=""
5655
# CONFIG_USE_PORTABLE_CODE is not set
5756
CONFIG_STACK_OPTIMIZATION_386=y
57+
CONFIG_STATIC_LIBGCC=y
5858

5959
#
6060
# Installation Options ("make install" behavior)
@@ -94,9 +94,12 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
9494
CONFIG_PASSWORD_MINLEN=6
9595
CONFIG_MD5_SMALL=1
9696
CONFIG_SHA3_SMALL=1
97-
# CONFIG_FEATURE_FAST_TOP is not set
98-
# CONFIG_FEATURE_ETC_NETWORKS is not set
99-
# CONFIG_FEATURE_ETC_SERVICES is not set
97+
CONFIG_FEATURE_NON_POSIX_CP=y
98+
# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
99+
CONFIG_FEATURE_USE_SENDFILE=y
100+
CONFIG_FEATURE_COPYBUF_KB=4
101+
CONFIG_MONOTONIC_SYSCALL=y
102+
CONFIG_IOCTL_HEX2STR_ERROR=y
100103
CONFIG_FEATURE_EDITING=y
101104
CONFIG_FEATURE_EDITING_MAX_LEN=1024
102105
# CONFIG_FEATURE_EDITING_VI is not set
@@ -120,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
120123
# CONFIG_UNICODE_BIDI_SUPPORT is not set
121124
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
122125
# CONFIG_UNICODE_PRESERVE_BROKEN is not set
123-
CONFIG_FEATURE_NON_POSIX_CP=y
124-
# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
125-
CONFIG_FEATURE_USE_SENDFILE=y
126-
CONFIG_FEATURE_COPYBUF_KB=4
127-
CONFIG_FEATURE_SKIP_ROOTFS=y
128-
CONFIG_MONOTONIC_SYSCALL=y
129-
CONFIG_IOCTL_HEX2STR_ERROR=y
130-
CONFIG_FEATURE_HWIB=y
131126

132127
#
133128
# Applets
@@ -162,6 +157,8 @@ CONFIG_FEATURE_BZIP2_DECOMPRESS=y
162157
CONFIG_CPIO=y
163158
CONFIG_FEATURE_CPIO_O=y
164159
CONFIG_FEATURE_CPIO_P=y
160+
CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y
161+
CONFIG_FEATURE_CPIO_RENUMBER_INODES=y
165162
# CONFIG_DPKG is not set
166163
# CONFIG_DPKG_DEB is not set
167164
CONFIG_GZIP=y
@@ -197,6 +194,22 @@ CONFIG_FEATURE_UNZIP_CDF=y
197194
#
198195
# Coreutils
199196
#
197+
CONFIG_FEATURE_VERBOSE=y
198+
199+
#
200+
# Common options for date and touch
201+
#
202+
# CONFIG_FEATURE_TIMEZONE is not set
203+
204+
#
205+
# Common options for cp and mv
206+
#
207+
CONFIG_FEATURE_PRESERVE_HARDLINKS=y
208+
209+
#
210+
# Common options for df, du, ls
211+
#
212+
CONFIG_FEATURE_HUMAN_READABLE=y
200213
CONFIG_BASENAME=y
201214
CONFIG_CAT=y
202215
CONFIG_FEATURE_CATN=y
@@ -207,11 +220,13 @@ CONFIG_CHMOD=y
207220
# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
208221
CONFIG_CHROOT=y
209222
# CONFIG_CKSUM is not set
223+
CONFIG_CRC32=y
210224
# CONFIG_COMM is not set
211225
CONFIG_CP=y
212226
CONFIG_FEATURE_CP_LONG_OPTIONS=y
213227
CONFIG_FEATURE_CP_REFLINK=y
214228
CONFIG_CUT=y
229+
CONFIG_FEATURE_CUT_REGEX=y
215230
CONFIG_DATE=y
216231
CONFIG_FEATURE_DATE_ISOFMT=y
217232
# CONFIG_FEATURE_DATE_NANO is not set
@@ -223,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y
223238
CONFIG_FEATURE_DD_STATUS=y
224239
CONFIG_DF=y
225240
CONFIG_FEATURE_DF_FANCY=y
241+
CONFIG_FEATURE_SKIP_ROOTFS=y
226242
CONFIG_DIRNAME=y
227243
# CONFIG_DOS2UNIX is not set
228244
# CONFIG_UNIX2DOS is not set
@@ -289,7 +305,7 @@ CONFIG_RM=y
289305
CONFIG_RMDIR=y
290306
CONFIG_SEQ=y
291307
CONFIG_SHRED=y
292-
# CONFIG_SHUF is not set
308+
CONFIG_SHUF=y
293309
CONFIG_SLEEP=y
294310
CONFIG_FEATURE_FANCY_SLEEP=y
295311
CONFIG_SORT=y
@@ -316,13 +332,12 @@ CONFIG_TEST2=y
316332
CONFIG_FEATURE_TEST_64=y
317333
# CONFIG_TIMEOUT is not set
318334
CONFIG_TOUCH=y
319-
CONFIG_FEATURE_TOUCH_NODEREF=y
320335
CONFIG_FEATURE_TOUCH_SUSV3=y
321336
CONFIG_TR=y
322337
CONFIG_FEATURE_TR_CLASSES=y
323338
CONFIG_FEATURE_TR_EQUIV=y
324339
CONFIG_TRUE=y
325-
# CONFIG_TRUNCATE is not set
340+
CONFIG_TRUNCATE=y
326341
CONFIG_TTY=y
327342
CONFIG_UNAME=y
328343
CONFIG_UNAME_OSNAME="GNU/Linux"
@@ -331,6 +346,7 @@ CONFIG_UNIQ=y
331346
# CONFIG_UNLINK is not set
332347
CONFIG_USLEEP=y
333348
# CONFIG_UUDECODE is not set
349+
CONFIG_BASE32=y
334350
CONFIG_BASE64=y
335351
# CONFIG_UUENCODE is not set
336352
CONFIG_WC=y
@@ -341,21 +357,6 @@ CONFIG_FEATURE_WC_LARGE=y
341357
# CONFIG_WHOAMI is not set
342358
# CONFIG_YES is not set
343359

344-
#
345-
# Common options
346-
#
347-
CONFIG_FEATURE_VERBOSE=y
348-
349-
#
350-
# Common options for cp and mv
351-
#
352-
CONFIG_FEATURE_PRESERVE_HARDLINKS=y
353-
354-
#
355-
# Common options for df, du, ls
356-
#
357-
CONFIG_FEATURE_HUMAN_READABLE=y
358-
359360
#
360361
# Console Utilities
361362
#
@@ -419,6 +420,7 @@ CONFIG_VI=y
419420
CONFIG_FEATURE_VI_MAX_LEN=4096
420421
# CONFIG_FEATURE_VI_8BIT is not set
421422
CONFIG_FEATURE_VI_COLON=y
423+
CONFIG_FEATURE_VI_COLON_EXPAND=y
422424
CONFIG_FEATURE_VI_YANKMARK=y
423425
CONFIG_FEATURE_VI_SEARCH=y
424426
# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -432,6 +434,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
432434
CONFIG_FEATURE_VI_UNDO=y
433435
CONFIG_FEATURE_VI_UNDO_QUEUE=y
434436
CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
437+
CONFIG_FEATURE_VI_VERBOSE_STATUS=y
435438
CONFIG_FEATURE_ALLOW_EXEC=y
436439

437440
#
@@ -440,14 +443,19 @@ CONFIG_FEATURE_ALLOW_EXEC=y
440443
CONFIG_FIND=y
441444
CONFIG_FEATURE_FIND_PRINT0=y
442445
CONFIG_FEATURE_FIND_MTIME=y
446+
CONFIG_FEATURE_FIND_ATIME=y
447+
CONFIG_FEATURE_FIND_CTIME=y
443448
CONFIG_FEATURE_FIND_MMIN=y
449+
CONFIG_FEATURE_FIND_AMIN=y
450+
CONFIG_FEATURE_FIND_CMIN=y
444451
CONFIG_FEATURE_FIND_PERM=y
445452
CONFIG_FEATURE_FIND_TYPE=y
446453
CONFIG_FEATURE_FIND_EXECUTABLE=y
447454
CONFIG_FEATURE_FIND_XDEV=y
448455
CONFIG_FEATURE_FIND_MAXDEPTH=y
449456
CONFIG_FEATURE_FIND_NEWER=y
450457
CONFIG_FEATURE_FIND_INUM=y
458+
CONFIG_FEATURE_FIND_SAMEFILE=y
451459
CONFIG_FEATURE_FIND_EXEC=y
452460
CONFIG_FEATURE_FIND_EXEC_PLUS=y
453461
CONFIG_FEATURE_FIND_USER=y
@@ -619,7 +627,6 @@ CONFIG_FSFREEZE=y
619627
CONFIG_GETOPT=y
620628
CONFIG_FEATURE_GETOPT_LONG=y
621629
CONFIG_HEXDUMP=y
622-
CONFIG_FEATURE_HEXDUMP_REVERSE=y
623630
CONFIG_HD=y
624631
CONFIG_XXD=y
625632
CONFIG_HWCLOCK=y
@@ -711,6 +718,7 @@ CONFIG_VOLUMEID=y
711718
CONFIG_FEATURE_VOLUMEID_BCACHE=y
712719
CONFIG_FEATURE_VOLUMEID_BTRFS=y
713720
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
721+
CONFIG_FEATURE_VOLUMEID_EROFS=y
714722
CONFIG_FEATURE_VOLUMEID_EXFAT=y
715723
CONFIG_FEATURE_VOLUMEID_EXT=y
716724
CONFIG_FEATURE_VOLUMEID_F2FS=y
@@ -738,6 +746,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
738746
# Miscellaneous Utilities
739747
#
740748
# CONFIG_ADJTIMEX is not set
749+
CONFIG_ASCII=y
741750
# CONFIG_BBCONFIG is not set
742751
# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
743752
# CONFIG_BC is not set
@@ -833,6 +842,7 @@ CONFIG_TIME=y
833842
# CONFIG_UBIRENAME is not set
834843
# CONFIG_VOLNAME is not set
835844
# CONFIG_WATCHDOG is not set
845+
# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
836846

837847
#
838848
# Networking Utilities
@@ -841,6 +851,9 @@ CONFIG_TIME=y
841851
# CONFIG_FEATURE_UNIX_LOCAL is not set
842852
# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
843853
# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
854+
# CONFIG_FEATURE_ETC_NETWORKS is not set
855+
# CONFIG_FEATURE_ETC_SERVICES is not set
856+
CONFIG_FEATURE_HWIB=y
844857
# CONFIG_FEATURE_TLS_SHA1 is not set
845858
CONFIG_ARP=y
846859
# CONFIG_ARPING is not set
@@ -859,6 +872,7 @@ CONFIG_ARP=y
859872
# CONFIG_HOSTNAME is not set
860873
# CONFIG_DNSDOMAINNAME is not set
861874
# CONFIG_HTTPD is not set
875+
CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0
862876
# CONFIG_FEATURE_HTTPD_RANGES is not set
863877
# CONFIG_FEATURE_HTTPD_SETUID is not set
864878
# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
@@ -870,6 +884,10 @@ CONFIG_ARP=y
870884
# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
871885
# CONFIG_FEATURE_HTTPD_PROXY is not set
872886
# CONFIG_FEATURE_HTTPD_GZIP is not set
887+
# CONFIG_FEATURE_HTTPD_ETAG is not set
888+
# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
889+
# CONFIG_FEATURE_HTTPD_DATE is not set
890+
# CONFIG_FEATURE_HTTPD_ACL_IP is not set
873891
CONFIG_IFCONFIG=y
874892
CONFIG_FEATURE_IFCONFIG_STATUS=y
875893
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -947,6 +965,7 @@ CONFIG_SSL_CLIENT=y
947965
# CONFIG_FEATURE_TELNET_WIDTH is not set
948966
# CONFIG_TELNETD is not set
949967
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
968+
CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
950969
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
951970
CONFIG_TFTP=y
952971
CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
@@ -967,6 +986,7 @@ CONFIG_VCONFIG=y
967986
CONFIG_WGET=y
968987
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
969988
# CONFIG_FEATURE_WGET_STATUSBAR is not set
989+
CONFIG_FEATURE_WGET_FTP=y
970990
# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
971991
CONFIG_FEATURE_WGET_TIMEOUT=y
972992
CONFIG_FEATURE_WGET_HTTPS=y
@@ -992,6 +1012,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/sbin/config-dhcp.sh"
9921012
#
9931013
# Common options for DHCP applets
9941014
#
1015+
CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
9951016
# CONFIG_FEATURE_UDHCP_PORT is not set
9961017
CONFIG_UDHCP_DEBUG=9
9971018
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1009,17 +1030,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
10091030
#
10101031
# Mail Utilities
10111032
#
1033+
CONFIG_FEATURE_MIME_CHARSET=""
10121034
# CONFIG_MAKEMIME is not set
10131035
# CONFIG_POPMAILDIR is not set
10141036
# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
10151037
# CONFIG_REFORMIME is not set
10161038
# CONFIG_FEATURE_REFORMIME_COMPAT is not set
10171039
# CONFIG_SENDMAIL is not set
1018-
CONFIG_FEATURE_MIME_CHARSET=""
10191040

10201041
#
10211042
# Process Utilities
10221043
#
1044+
# CONFIG_FEATURE_FAST_TOP is not set
1045+
CONFIG_FEATURE_SHOW_THREADS=y
10231046
# CONFIG_FREE is not set
10241047
# CONFIG_FUSER is not set
10251048
# CONFIG_IOSTAT is not set
@@ -1058,7 +1081,6 @@ CONFIG_FEATURE_TOPMEM=y
10581081
# CONFIG_UPTIME is not set
10591082
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
10601083
# CONFIG_WATCH is not set
1061-
CONFIG_FEATURE_SHOW_THREADS=y
10621084

10631085
#
10641086
# Runit Utilities
@@ -1123,8 +1145,8 @@ CONFIG_ASH_CMDCMD=y
11231145
# CONFIG_SHELL_HUSH is not set
11241146
# CONFIG_HUSH_BASH_COMPAT is not set
11251147
# CONFIG_HUSH_BRACE_EXPANSION is not set
1126-
# CONFIG_HUSH_LINENO_VAR is not set
11271148
# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
1149+
# CONFIG_HUSH_LINENO_VAR is not set
11281150
# CONFIG_HUSH_INTERACTIVE is not set
11291151
# CONFIG_HUSH_SAVEHISTORY is not set
11301152
# CONFIG_HUSH_JOB is not set

config/linux-x230-maximized.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ CONFIG_SATA_AHCI=y
9797
CONFIG_MD=y
9898
CONFIG_BLK_DEV_DM=y
9999
CONFIG_DM_CRYPT=y
100+
CONFIG_DM_SNAPSHOT=y
101+
CONFIG_DM_THIN_PROVISIONING=y
100102
CONFIG_DM_VERITY=y
101103
CONFIG_DM_VERITY_FEC=y
102104
CONFIG_NETDEVICES=y

0 commit comments

Comments
 (0)