Skip to content

Commit 0b171bd

Browse files
committed
Fixed busybox not being included, noticed during tests as telnetd wasn't available. Also added CONFIG_GEMINI_ETHERNET=y driver.
1 parent f714583 commit 0b171bd

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

board/shredos/kernel-6.6.22-defconfig.config

+1
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ CONFIG_CHELSIO_T1_1G=y
287287
CONFIG_CHELSIO_T4_DCB=y
288288
CONFIG_CHELSIO_T4VF=y
289289
CONFIG_ENIC=y
290+
CONFIG_GEMINI_ETHERNET=y
290291
CONFIG_DNET=y
291292
CONFIG_NET_TULIP=y
292293
CONFIG_DE2104X=y

configs/shredos_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.confi
2222
BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
2323
BR2_PACKAGE_LINUX_TOOLS_PERF=y
2424
BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y
25+
# BR2_PACKAGE_BUSYBOX_SELINUX is not set
2526
BR2_PACKAGE_FFMPEG=y
2627
BR2_PACKAGE_FFMPEG_GPL=y
2728
BR2_PACKAGE_FFMPEG_NONFREE=y

package/busybox/busybox.config

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
33
# Busybox version: 1.36.1
4-
# Wed May 8 17:25:31 2024
4+
# Fri Jan 10 23:36:53 2025
55
#
66
CONFIG_HAVE_DOT_CONFIG=y
77

@@ -17,7 +17,7 @@ CONFIG_SHOW_USAGE=y
1717
CONFIG_FEATURE_VERBOSE_USAGE=y
1818
# CONFIG_FEATURE_COMPRESS_USAGE is not set
1919
CONFIG_LFS=y
20-
# CONFIG_PAM is not set
20+
CONFIG_PAM=y
2121
CONFIG_FEATURE_DEVPTS=y
2222
CONFIG_FEATURE_UTMP=y
2323
CONFIG_FEATURE_WTMP=y
@@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID=y
3232
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
3333
# CONFIG_FEATURE_PREFER_APPLETS is not set
3434
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
35-
# CONFIG_SELINUX is not set
35+
CONFIG_SELINUX=y
3636
# CONFIG_FEATURE_CLEAN_UP is not set
3737
CONFIG_FEATURE_SYSLOG_INFO=y
3838
CONFIG_FEATURE_SYSLOG=y
@@ -43,9 +43,9 @@ CONFIG_FEATURE_SYSLOG=y
4343
# CONFIG_STATIC is not set
4444
# CONFIG_PIE is not set
4545
# CONFIG_NOMMU is not set
46-
# CONFIG_BUILD_LIBBUSYBOX is not set
46+
CONFIG_BUILD_LIBBUSYBOX=y
4747
# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
48-
# CONFIG_FEATURE_INDIVIDUAL is not set
48+
CONFIG_FEATURE_INDIVIDUAL=y
4949
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
5050
CONFIG_CROSS_COMPILER_PREFIX=""
5151
CONFIG_SYSROOT=""
@@ -802,7 +802,7 @@ CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
802802
# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
803803
# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
804804
# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
805-
CONFIG_HEXEDIT=y
805+
# CONFIG_HEXEDIT is not set
806806
CONFIG_I2CGET=y
807807
CONFIG_I2CSET=y
808808
CONFIG_I2CDUMP=y
@@ -976,10 +976,10 @@ CONFIG_TELNET=y
976976
CONFIG_FEATURE_TELNET_TTYPE=y
977977
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
978978
CONFIG_FEATURE_TELNET_WIDTH=y
979-
# CONFIG_TELNETD is not set
980-
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
981-
CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
982-
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
979+
CONFIG_TELNETD=y
980+
CONFIG_FEATURE_TELNETD_STANDALONE=y
981+
CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
982+
CONFIG_FEATURE_TELNETD_INETD_WAIT=y
983983
CONFIG_TFTP=y
984984
# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
985985
CONFIG_FEATURE_TFTP_HPA_COMPAT=y
@@ -1016,7 +1016,7 @@ CONFIG_UDHCPC=y
10161016
CONFIG_FEATURE_UDHCPC_ARPING=y
10171017
CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
10181018
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
1019-
CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
1019+
CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
10201020
# CONFIG_UDHCPC6 is not set
10211021
# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
10221022
# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -1112,13 +1112,17 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
11121112
CONFIG_SVC=y
11131113
CONFIG_SVOK=y
11141114
# CONFIG_SVLOGD is not set
1115+
1116+
#
1117+
# SELinux Utilities
1118+
#
11151119
# CONFIG_CHCON is not set
11161120
# CONFIG_GETENFORCE is not set
11171121
# CONFIG_GETSEBOOL is not set
11181122
# CONFIG_LOAD_POLICY is not set
11191123
# CONFIG_MATCHPATHCON is not set
11201124
# CONFIG_RUNCON is not set
1121-
# CONFIG_SELINUXENABLED is not set
1125+
CONFIG_SELINUXENABLED=y
11221126
# CONFIG_SESTATUS is not set
11231127
# CONFIG_SETENFORCE is not set
11241128
# CONFIG_SETFILES is not set

0 commit comments

Comments
 (0)