diff --git a/build.sh b/build.sh index b43abc6b..8121b11e 100755 --- a/build.sh +++ b/build.sh @@ -37,6 +37,7 @@ OMR_ALL_PACKAGES=${OMR_ALL_PACKAGES:-no} OMR_TARGET=${OMR_TARGET:-x86_64} OMR_TARGET_CONFIG="config-$OMR_TARGET" UPSTREAM=${UPSTREAM:-no} +SYSLOG=${SYSLOG:-busybox-syslogd} OMR_KERNEL=${OMR_KERNEL:-5.4} SHORTCUT_FE=${SHORTCUT_FE:-no} DISABLE_FAILSAFE=${DISABLE_FAILSAFE:-no} @@ -55,6 +56,7 @@ OMR_OPENWRT=${OMR_OPENWRT:-default} OMR_FORCE_DSA=${OMR_FORCE_DSA:-0} + if [ "$OMR_KERNEL" = "5.4" ] && [ "$OMR_TARGET" = "rutx12" ]; then OMR_TARGET_CONFIG="config-rutx" fi @@ -309,6 +311,18 @@ if [ "$OMR_PACKAGES" = "mini" ]; then echo "CONFIG_PACKAGE_${OMR_DIST}-mini=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" fi +if [ "$SYSLOG" = "busybox-syslogd" ]; then + echo "CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" + echo "CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_CFG=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" + echo "CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMP=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" + echo "CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" + echo "CONFIG_BUSYBOX_CONFIG_FEATURE_REMOTE_LOG=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" + echo "CONFIG_BUSYBOX_CONFIG_SYSLOGD=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" + echo "CONFIG_PACKAGE_syslogd=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" +elif [ "$SYSLOG" = "syslog-ng" ]; then + echo "CONFIG_PACKAGE_syslog-ng=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" +fi + if [ "$SHORTCUT_FE" = "yes" ]; then echo "CONFIG_PACKAGE_kmod-fast-classifier=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" echo "CONFIG_PACKAGE_kmod-shortcut-fe=y" >> "$OMR_TARGET/${OMR_KERNEL}/source/.config" diff --git a/config b/config index be3bf6a1..387d7b6e 100644 --- a/config +++ b/config @@ -20,11 +20,6 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2=y CONFIG_BUSYBOX_CONFIG_FEATURE_SHOW_THREADS=y CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FILESYSTEM=y CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG=y -CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_CFG=y -CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMP=y -CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 -CONFIG_BUSYBOX_CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS is not set # CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU is not set # CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS is not set