From 6473a658a062b9dfb4b44d5617ca6f580aa25c76 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 15 Aug 2023 15:48:28 -0500 Subject: [PATCH] mainline: linux: config, connect network on startup Signed-off-by: Robert Nelson --- 04_build_linux.sh | 13 +++++++++++++ 06_generate_debian_console_root.sh | 16 ++++++++++++++-- build_linux_menuconfig.sh | 13 +++++++++++++ patches/linux/mainline/defconfig | 11 ++++++----- 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/04_build_linux.sh b/04_build_linux.sh index 8f74e5b..c4309d4 100755 --- a/04_build_linux.sh +++ b/04_build_linux.sh @@ -123,6 +123,13 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then #./scripts/config --disable CONFIG_VMAP_STACK #./scripts/config --disable CONFIG_SMP + + #Optimize: + ./scripts/config --enable CONFIG_IP_NF_IPTABLES + ./scripts/config --enable CONFIG_NETFILTER_XTABLES + ./scripts/config --enable CONFIG_NLS_ISO8859_1 + ./scripts/config --enable CONFIG_BLK_DEV_DM + echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig" make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig else @@ -187,6 +194,12 @@ else ./scripts/config --disable CONFIG_DRM_NOUVEAU ./scripts/config --disable CONFIG_DRM_SUN4I + #Optimize: + ./scripts/config --enable CONFIG_IP_NF_IPTABLES + ./scripts/config --enable CONFIG_NETFILTER_XTABLES + ./scripts/config --enable CONFIG_NLS_ISO8859_1 + ./scripts/config --enable CONFIG_BLK_DEV_DM + echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig" make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig fi diff --git a/06_generate_debian_console_root.sh b/06_generate_debian_console_root.sh index 9bcd9dd..293f631 100755 --- a/06_generate_debian_console_root.sh +++ b/06_generate_debian_console_root.sh @@ -65,7 +65,19 @@ rm -rf ./ignore/.root/etc/systemd/system/multi-user.target.wants/wpa_supplicant@ #ln -L -f -s -v /lib/systemd/system/resize_filesystem.service --target-directory=./etc/systemd/system/multi-user.target.wants/ #cd ../../ -cp -v ./ignore/.root/etc/bbb.io/templates/eth0-DHCP.network ./ignore/.root/etc/systemd/network/eth0.network || true +if [ -f ./ignore/.root/etc/bbb.io/templates/eth0-DHCP.network ] ; then + cp -v ./ignore/.root/etc/bbb.io/templates/eth0-DHCP.network ./ignore/.root/etc/systemd/network/eth0.network || true +else + echo '[Match]' > ./ignore/.root/etc/systemd/network/eth0.network + echo 'Name=eth0' >> ./ignore/.root/etc/systemd/network/eth0.network + echo 'Type=ether' >> ./ignore/.root/etc/systemd/network/eth0.network + echo '' >> ./ignore/.root/etc/systemd/network/eth0.network + echo '[Link]' >> ./ignore/.root/etc/systemd/network/eth0.network + echo 'RequiredForOnline=yes' >> ./ignore/.root/etc/systemd/network/eth0.network + echo '' >> ./ignore/.root/etc/systemd/network/eth0.network + echo '[Network]' >> ./ignore/.root/etc/systemd/network/eth0.network + echo 'DHCP=ipv4' >> ./ignore/.root/etc/systemd/network/eth0.network +fi # setuid root ping+ping6 chmod u+s ./ignore/.root/usr/bin/ping ./ignore/.root/usr/bin/ping6 @@ -82,7 +94,7 @@ echo 'File Size' du -sh ignore/.root/ || true echo '---------------------' -dd if=/dev/zero of=./deploy/input/root.ext4 bs=1 count=0 seek=2048M +dd if=/dev/zero of=./deploy/input/root.ext4 bs=1 count=0 seek=2200M mkfs.ext4 -F ./deploy/input/root.ext4 -d ./ignore/.root if [ -f ./.06_generate_root.sh ] ; then diff --git a/build_linux_menuconfig.sh b/build_linux_menuconfig.sh index d7a2257..d532167 100755 --- a/build_linux_menuconfig.sh +++ b/build_linux_menuconfig.sh @@ -123,6 +123,13 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then #./scripts/config --disable CONFIG_VMAP_STACK #./scripts/config --disable CONFIG_SMP + + #Optimize: + ./scripts/config --enable CONFIG_IP_NF_IPTABLES + ./scripts/config --enable CONFIG_NETFILTER_XTABLES + ./scripts/config --enable CONFIG_NLS_ISO8859_1 + ./scripts/config --enable CONFIG_BLK_DEV_DM + echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig" make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig else @@ -187,6 +194,12 @@ else ./scripts/config --disable CONFIG_DRM_NOUVEAU ./scripts/config --disable CONFIG_DRM_SUN4I + #Optimize: + ./scripts/config --enable CONFIG_IP_NF_IPTABLES + ./scripts/config --enable CONFIG_NETFILTER_XTABLES + ./scripts/config --enable CONFIG_NLS_ISO8859_1 + ./scripts/config --enable CONFIG_BLK_DEV_DM + echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig" make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig fi diff --git a/patches/linux/mainline/defconfig b/patches/linux/mainline/defconfig index 02f9416..ee8f37c 100644 --- a/patches/linux/mainline/defconfig +++ b/patches/linux/mainline/defconfig @@ -823,7 +823,7 @@ CONFIG_NF_NAT_TFTP=m CONFIG_NF_NAT_REDIRECT=y CONFIG_NF_NAT_MASQUERADE=y # CONFIG_NF_TABLES is not set -CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XTABLES=y # CONFIG_NETFILTER_XTABLES_COMPAT is not set # @@ -968,7 +968,7 @@ CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_IPV4=m CONFIG_NF_REJECT_IPV4=m -CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_IPTABLES=y # CONFIG_IP_NF_MATCH_AH is not set # CONFIG_IP_NF_MATCH_ECN is not set # CONFIG_IP_NF_MATCH_RPFILTER is not set @@ -1637,7 +1637,7 @@ CONFIG_MD=y # CONFIG_BLK_DEV_MD is not set # CONFIG_BCACHE is not set CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=m +CONFIG_BLK_DEV_DM=y # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set @@ -1658,6 +1658,7 @@ CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_MULTIPATH is not set # CONFIG_DM_DELAY is not set # CONFIG_DM_DUST is not set +# CONFIG_DM_INIT is not set # CONFIG_DM_UEVENT is not set # CONFIG_DM_FLAKEY is not set # CONFIG_DM_VERITY is not set @@ -4167,7 +4168,7 @@ CONFIG_NFS_V4=y CONFIG_NFS_V4_1=y CONFIG_NFS_V4_2=y CONFIG_PNFS_FILE_LAYOUT=y -CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_BLOCK=y CONFIG_PNFS_FLEXFILE_LAYOUT=y CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" # CONFIG_NFS_V4_1_MIGRATION is not set @@ -4222,7 +4223,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set