From a9252ff50ac61563b1661c5cba03e62f3be290e7 2019-10-22 22:52:23 From: Unknown Date: 2019-10-22 22:52:23 Subject: [PATCH] RIP4, new kernel param, disable mmc hack since 4.19 --- diff --git a/README.md b/README.md index 79908f0..fb198ea 100644 --- a/README.md +++ b/README.md @@ -317,6 +317,18 @@ Build and install the latest RPi 0/1/2/3 Linux kernel. Currently only the defaul ##### `CROSS_COMPILE`="arm-linux-gnueabihf-" This sets the cross-compile environment for the compiler. +##### `KERNEL_BTRFS`="false" +enable btrfs kernel support + +##### `KERNEL_POEHAT`="false" +enable Enable RPI POE HAT fan kernel support + +##### `KERNEL_NSPAWN`="false" +Enable per-interface network priority control - for systemd-nspawn + +##### `KERNEL_DHKEY`="true" +Diffie-Hellman operations on retained keys - required for >keyutils-1.6 + ##### `KERNEL_ARCH`="arm" This sets the kernel architecture for the compiler. diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh index 45c8556..0355ffe 100644 --- a/bootstrap.d/13-kernel.sh +++ b/bootstrap.d/13-kernel.sh @@ -102,13 +102,38 @@ if [ "$BUILD_KERNEL" = true ] ; then #Switch to KERNELSRC_DIR so we can use set_kernel_config cd "${KERNEL_DIR}" || exit + # Enable RPI POE HAT fan + if [ "$KERNEL_POEHAT" = true ]; then + set_kernel_config CONFIG_SENSORS_RPI_POE_FAN m + fi + + # Enable per-interface network priority control + # (for systemd-nspawn) + if [ "$KERNEL_NSPAN" = true ]; then + set_kernel_config CONFIG_CGROUP_NET_PRIO y + fi + + # Compile in BTRFS + if [ "$KERNEL_BTRFS" = true ]; then + set_kernel_config CONFIG_BTRFS_FS y + set_kernel_config CONFIG_BTRFS_FS_POSIX_ACL y + set_kernel_config CONFIG_BTRFS_FS_REF_VERIFY y + fi + + # Diffie-Hellman operations on retained keys + # (required for >keyutils-1.6) + if [ "$KERNEL_DHKEY" = true ]; then + set_kernel_config CONFIG_KEY_DH_OPERATIONS y + fi + if [ "$KERNEL_ARCH" = arm64 ] && [ "$ENABLE_QEMU" = false ]; then + # Mask this temporarily during switch to rpi-4.19.y #Fix SD_DRIVER upstream and downstream mess in 64bit RPIdeb_config # use correct driver MMC_BCM2835_MMC instead of MMC_BCM2835_SDHOST - see https://www.raspberrypi.org/forums/viewtopic.php?t=210225 - set_kernel_config CONFIG_MMC_BCM2835 n - set_kernel_config CONFIG_MMC_SDHCI_IPROC n - set_kernel_config CONFIG_USB_DWC2 n - sed -i "s|depends on MMC_BCM2835_MMC && MMC_BCM2835_DMA|depends on MMC_BCM2835_MMC|" "${KERNEL_DIR}"/drivers/mmc/host/Kconfig + #set_kernel_config CONFIG_MMC_BCM2835 n + #set_kernel_config CONFIG_MMC_SDHCI_IPROC n + #set_kernel_config CONFIG_USB_DWC2 n + #sed -i "s|depends on MMC_BCM2835_MMC && MMC_BCM2835_DMA|depends on MMC_BCM2835_MMC|" "${KERNEL_DIR}"/drivers/mmc/host/Kconfig #VLAN got disabled without reason in arm64bit set_kernel_config CONFIG_IPVLAN m @@ -122,15 +147,234 @@ if [ "$BUILD_KERNEL" = true ] ; then set_kernel_config CONFIG_Z3FOLD y set_kernel_config CONFIG_ZSMALLOC y set_kernel_config CONFIG_PGTABLE_MAPPING y - set_kernel_config CONFIG_LZO_COMPRESS y - + set_kernel_config CONFIG_LZO_COMPRESS y fi + + if [ RPI_MODEL = 4 ] ; then + # Following are set in current 32-bit LPAE kernel + set_kernel_config CONFIG_CGROUP_PIDS y + set_kernel_config CONFIG_NET_IPVTI m + set_kernel_config CONFIG_NF_TABLES_SET m + set_kernel_config CONFIG_NF_TABLES_INET y + set_kernel_config CONFIG_NF_TABLES_NETDEV y + set_kernel_config CONFIG_NF_FLOW_TABLE m + set_kernel_config CONFIG_NFT_FLOW_OFFLOAD m + set_kernel_config CONFIG_NFT_CONNLIMIT m + set_kernel_config CONFIG_NFT_TUNNEL m + set_kernel_config CONFIG_NFT_OBJREF m + set_kernel_config CONFIG_NFT_FIB_IPV4 m + set_kernel_config CONFIG_NFT_FIB_IPV6 m + set_kernel_config CONFIG_NFT_FIB_INET m + set_kernel_config CONFIG_NFT_SOCKET m + set_kernel_config CONFIG_NFT_OSF m + set_kernel_config CONFIG_NFT_TPROXY m + set_kernel_config CONFIG_NF_DUP_NETDEV m + set_kernel_config CONFIG_NFT_DUP_NETDEV m + set_kernel_config CONFIG_NFT_FWD_NETDEV m + set_kernel_config CONFIG_NFT_FIB_NETDEV m + set_kernel_config CONFIG_NF_FLOW_TABLE_INET m + set_kernel_config CONFIG_NF_FLOW_TABLE m + set_kernel_config CONFIG_NETFILTER_XT_MATCH_SOCKET m + set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV6 m + set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV6 m + set_kernel_config CONFIG_NFT_MASQ_IPV6 m + set_kernel_config CONFIG_NFT_REDIR_IPV6 m + set_kernel_config CONFIG_NFT_REJECT_IPV6 m + set_kernel_config CONFIG_NFT_DUP_IPV6 m + set_kernel_config CONFIG_NFT_FIB_IPV6 m + set_kernel_config CONFIG_NF_FLOW_TABLE_IPV6 m + set_kernel_config CONFIG_NF_TABLES_BRIDGE m + set_kernel_config CONFIG_NFT_BRIDGE_REJECT m + set_kernel_config CONFIG_NF_LOG_BRIDGE m + set_kernel_config CONFIG_MT76_CORE m + set_kernel_config CONFIG_MT76_LEDS m + set_kernel_config CONFIG_MT76_USB m + set_kernel_config CONFIG_MT76x2_COMMON m + set_kernel_config CONFIG_MT76x0U m + set_kernel_config CONFIG_MT76x2U m + set_kernel_config CONFIG_TOUCHSCREEN_ILI210X m + set_kernel_config CONFIG_BCM_VC_SM m + set_kernel_config CONFIG_BCM2835_SMI_DEV m + set_kernel_config CONFIG_RPIVID_MEM m + set_kernel_config CONFIG_HW_RANDOM_BCM2835 y + set_kernel_config CONFIG_TCG_TPM m + set_kernel_config CONFIG_HW_RANDOM_TPM y + set_kernel_config CONFIG_TCG_TIS m + set_kernel_config CONFIG_TCG_TIS_SPI m + set_kernel_config CONFIG_I2C_MUX m + set_kernel_config CONFIG_I2C_MUX_GPMUX m + set_kernel_config CONFIG_I2C_MUX_PCA954x m + set_kernel_config CONFIG_SPI_GPIO m + set_kernel_config CONFIG_BATTERY_MAX17040 m + set_kernel_config CONFIG_SENSORS_GPIO_FAN m + set_kernel_config CONFIG_SENSORS_RASPBERRYPI_HWMON m + set_kernel_config CONFIG_BCM2835_THERMAL y + set_kernel_config CONFIG_RC_CORE y + set_kernel_config CONFIG_RC_MAP y + set_kernel_config CONFIG_LIRC y + set_kernel_config CONFIG_RC_DECODERS y + set_kernel_config CONFIG_IR_NEC_DECODER m + set_kernel_config CONFIG_IR_RC5_DECODER m + set_kernel_config CONFIG_IR_RC6_DECODER m + set_kernel_config CONFIG_IR_JVC_DECODER m + set_kernel_config CONFIG_IR_SONY_DECODER m + set_kernel_config CONFIG_IR_SANYO_DECODER m + set_kernel_config CONFIG_IR_SHARP_DECODER m + set_kernel_config CONFIG_IR_MCE_KBD_DECODER m + set_kernel_config CONFIG_IR_XMP_DECODER m + set_kernel_config CONFIG_IR_IMON_DECODER m + set_kernel_config CONFIG_RC_DEVICES y + set_kernel_config CONFIG_RC_ATI_REMOTE m + set_kernel_config CONFIG_IR_IMON m + set_kernel_config CONFIG_IR_MCEUSB m + set_kernel_config CONFIG_IR_REDRAT3 m + set_kernel_config CONFIG_IR_STREAMZAP m + set_kernel_config CONFIG_IR_IGUANA m + set_kernel_config CONFIG_IR_TTUSBIR m + set_kernel_config CONFIG_RC_LOOPBACK m + set_kernel_config CONFIG_IR_GPIO_CIR m + set_kernel_config CONFIG_IR_GPIO_TX m + set_kernel_config CONFIG_IR_PWM_TX m + set_kernel_config CONFIG_VIDEO_V4L2_SUBDEV_API y + set_kernel_config CONFIG_VIDEO_AU0828_RC y + set_kernel_config CONFIG_VIDEO_CX231XX m + set_kernel_config CONFIG_VIDEO_CX231XX_RC y + set_kernel_config CONFIG_VIDEO_CX231XX_ALSA m + set_kernel_config CONFIG_VIDEO_CX231XX_DVB m + set_kernel_config CONFIG_VIDEO_TM6000 m + set_kernel_config CONFIG_VIDEO_TM6000_ALSA m + set_kernel_config CONFIG_VIDEO_TM6000_DVB m + set_kernel_config CONFIG_DVB_USB m + set_kernel_config CONFIG_DVB_USB_DIB3000MC m + set_kernel_config CONFIG_DVB_USB_A800 m + set_kernel_config CONFIG_DVB_USB_DIBUSB_MB m + set_kernel_config CONFIG_DVB_USB_DIBUSB_MB_FAULTY y + set_kernel_config CONFIG_DVB_USB_DIBUSB_MC m + set_kernel_config CONFIG_DVB_USB_DIB0700 m + set_kernel_config CONFIG_DVB_USB_UMT_010 m + set_kernel_config CONFIG_DVB_USB_CXUSB m + set_kernel_config CONFIG_DVB_USB_M920X m + set_kernel_config CONFIG_DVB_USB_DIGITV m + set_kernel_config CONFIG_DVB_USB_VP7045 m + set_kernel_config CONFIG_DVB_USB_VP702X m + set_kernel_config CONFIG_DVB_USB_GP8PSK m + set_kernel_config CONFIG_DVB_USB_NOVA_T_USB2 m + set_kernel_config CONFIG_DVB_USB_TTUSB2 m + set_kernel_config CONFIG_DVB_USB_DTT200U m + set_kernel_config CONFIG_DVB_USB_OPERA1 m + set_kernel_config CONFIG_DVB_USB_AF9005 m + set_kernel_config CONFIG_DVB_USB_AF9005_REMOTE m + set_kernel_config CONFIG_DVB_USB_PCTV452E m + set_kernel_config CONFIG_DVB_USB_DW2102 m + set_kernel_config CONFIG_DVB_USB_CINERGY_T2 m + set_kernel_config CONFIG_DVB_USB_DTV5100 m + set_kernel_config CONFIG_DVB_USB_AZ6027 m + set_kernel_config CONFIG_DVB_USB_TECHNISAT_USB2 m + set_kernel_config CONFIG_DVB_USB_AF9015 m + set_kernel_config CONFIG_DVB_USB_LME2510 m + set_kernel_config CONFIG_DVB_USB_RTL28XXU m + set_kernel_config CONFIG_VIDEO_EM28XX_RC m + set_kernel_config CONFIG_SMS_SIANO_RC m + set_kernel_config CONFIG_VIDEO_IR_I2C m + set_kernel_config CONFIG_VIDEO_ADV7180 m + set_kernel_config CONFIG_VIDEO_TC358743 m + set_kernel_config CONFIG_VIDEO_OV5647 m + set_kernel_config CONFIG_DVB_M88DS3103 m + set_kernel_config CONFIG_DVB_AF9013 m + set_kernel_config CONFIG_DVB_RTL2830 m + set_kernel_config CONFIG_DVB_RTL2832 m + set_kernel_config CONFIG_DVB_SI2168 m + set_kernel_config CONFIG_DVB_GP8PSK_FE m + set_kernel_config CONFIG_DVB_USB m + set_kernel_config CONFIG_DVB_LGDT3306A m + set_kernel_config CONFIG_FB_SIMPLE y + set_kernel_config CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC m + set_kernel_config CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M m + set_kernel_config CONFIG_SND_AUDIOSENSE_PI m + set_kernel_config CONFIG_SND_SOC_AD193X m + set_kernel_config CONFIG_SND_SOC_AD193X_SPI m + set_kernel_config CONFIG_SND_SOC_AD193X_I2C m + set_kernel_config CONFIG_SND_SOC_CS4265 m + set_kernel_config CONFIG_SND_SOC_DA7213 m + set_kernel_config CONFIG_SND_SOC_ICS43432 m + set_kernel_config CONFIG_SND_SOC_TLV320AIC32X4 m + set_kernel_config CONFIG_SND_SOC_TLV320AIC32X4_I2C m + set_kernel_config CONFIG_SND_SOC_I_SABRE_CODEC m + set_kernel_config CONFIG_HID_BIGBEN_FF m + #set_kernel_config CONFIG_USB_XHCI_PLATFORM y + set_kernel_config CONFIG_USB_TMC m + set_kernel_config CONFIG_USB_UAS y + set_kernel_config CONFIG_USBIP_VUDC m + set_kernel_config CONFIG_USB_CONFIGFS m + set_kernel_config CONFIG_USB_CONFIGFS_SERIAL y + set_kernel_config CONFIG_USB_CONFIGFS_ACM y + set_kernel_config CONFIG_USB_CONFIGFS_OBEX y + set_kernel_config CONFIG_USB_CONFIGFS_NCM y + set_kernel_config CONFIG_USB_CONFIGFS_ECM y + set_kernel_config CONFIG_USB_CONFIGFS_ECM_SUBSET y + set_kernel_config CONFIG_USB_CONFIGFS_RNDIS y + set_kernel_config CONFIG_USB_CONFIGFS_EEM y + set_kernel_config CONFIG_USB_CONFIGFS_MASS_STORAGE y + set_kernel_config CONFIG_USB_CONFIGFS_F_LB_SS y + set_kernel_config CONFIG_USB_CONFIGFS_F_FS y + set_kernel_config CONFIG_USB_CONFIGFS_F_UAC1 y + set_kernel_config CONFIG_USB_CONFIGFS_F_UAC2 y + set_kernel_config CONFIG_USB_CONFIGFS_F_MIDI y + set_kernel_config CONFIG_USB_CONFIGFS_F_HID y + set_kernel_config CONFIG_USB_CONFIGFS_F_UVC y + set_kernel_config CONFIG_USB_CONFIGFS_F_PRINTER y + set_kernel_config CONFIG_LEDS_PCA963X m + set_kernel_config CONFIG_LEDS_IS31FL32XX m + set_kernel_config CONFIG_LEDS_TRIGGER_NETDEV m + set_kernel_config CONFIG_RTC_DRV_RV3028 m + set_kernel_config CONFIG_AUXDISPLAY y + set_kernel_config CONFIG_HD44780 m + set_kernel_config CONFIG_FB_TFT_SH1106 m + set_kernel_config CONFIG_VIDEO_CODEC_BCM2835 m + set_kernel_config CONFIG_BCM2835_POWER y + set_kernel_config CONFIG_INV_MPU6050_IIO m + set_kernel_config CONFIG_INV_MPU6050_I2C m + set_kernel_config CONFIG_SECURITYFS y + + # Safer to build this in + set_kernel_config CONFIG_BINFMT_MISC y + + # pulseaudio wants a buffer of at least this size + set_kernel_config CONFIG_SND_HDA_PREALLOC_SIZE 2048 + + # PR#3063: enable 3D acceleration with 64-bit kernel on RPi4 + # set the appropriate kernel configs unlocked by this PR + set_kernel_config CONFIG_ARCH_BCM y + set_kernel_config CONFIG_ARCH_BCM2835 y + set_kernel_config CONFIG_DRM_V3D m + set_kernel_config CONFIG_DRM_VC4 m + set_kernel_config CONFIG_DRM_VC4_HDMI_CEC y + + # PR#3144: add arm64 pcie bounce buffers; enables 4GiB on RPi4 + # required by PR#3144; should already be applied, but just to be safe + set_kernel_config CONFIG_PCIE_BRCMSTB y + set_kernel_config CONFIG_BCM2835_MMC y + + # Snap needs squashfs. The ubuntu eoan-preinstalled-server image at + # http://cdimage.ubuntu.com/ubuntu-server/daily-preinstalled/current/ uses snap + # during cloud-init setup at first boot. Without this the login accounts are not + # created and the user can not login. + set_kernel_config CONFIG_SQUASHFS y + + # Ceph support for Block Device (RBD) and Filesystem (FS) + # https://docs.ceph.com/docs/master/ + set_kernel_config CONFIG_CEPH_LIB m + set_kernel_config CONFIG_CEPH_LIB_USE_DNS_RESOLVER y + set_kernel_config CONFIG_CEPH_FS m + set_kernel_config CONFIG_CEPH_FSCACHE y + set_kernel_config CONFIG_CEPH_FS_POSIX_ACL y + set_kernel_config CONFIG_BLK_DEV_RBD m # enable basic KVM support; see https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=210546&start=25#p1300453 if [ "$KERNEL_VIRT" = true ] && { [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ]; } ; then - set_kernel_config CONFIG_HAVE_KVM y - set_kernel_config CONFIG_HIGH_RES_TIMERS y - set_kernel_config CONFIG_HAVE_KVM_IRQCHIP y + set_kernel_config CONFIG_HAVE_KVM y + set_kernel_config CONFIG_HIGH_RES_TIMERS y + set_kernel_config CONFIG_HAVE_KVM_IRQCHIP y set_kernel_config CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL y set_kernel_config CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT y set_kernel_config CONFIG_HAVE_KVM_EVENTFD y @@ -144,7 +388,7 @@ if [ "$BUILD_KERNEL" = true ] ; then set_kernel_config CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT y set_kernel_config CONFIG_KVM_MMIO y set_kernel_config CONFIG_KVM_VFIO y - set_kernel_config CONFIG_KVM_MMU_AUDIT y + set_kernel_config CONFIG_KVM_MMU_AUDIT y set_kernel_config CONFIG_VHOST m set_kernel_config CONFIG_VHOST_CROSS_ENDIAN_LEGACY y set_kernel_config CONFIG_VHOST_NET m @@ -201,12 +445,6 @@ if [ "$BUILD_KERNEL" = true ] ; then set_kernel_config CONFIG_SECURITY_PATH y set_kernel_config CONFIG_SECURITY_YAMA n - # New Options - if [ "$KERNEL_NF" = true ] ; then - set_kernel_config CONFIG_IP_NF_SECURITY m - set_kernel_config CONFIG_NETLABEL y - set_kernel_config CONFIG_IP6_NF_SECURITY m - fi set_kernel_config CONFIG_SECURITY_SELINUX n set_kernel_config CONFIG_SECURITY_SMACK n set_kernel_config CONFIG_SECURITY_TOMOYO n @@ -219,12 +457,11 @@ if [ "$BUILD_KERNEL" = true ] ; then set_kernel_config CONFIG_NFSD_V4_SECURITY_LABEL y set_kernel_config CONFIG_PKCS7_MESSAGE_PARSER y set_kernel_config CONFIG_SYSTEM_TRUSTED_KEYRING y - set_kernel_config CONFIG_SYSTEM_TRUSTED_KEYS y set_kernel_config CONFIG_SYSTEM_EXTRA_CERTIFICATE y set_kernel_config CONFIG_SECONDARY_TRUSTED_KEYRING y set_kernel_config CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY n - set_kernel_config CONFIG_SYSTEM_TRUSTED_KEYS m - set_kernel_config CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE 4096 + set_kernel_config CONFIG_SYSTEM_TRUSTED_KEYS m + set_kernel_config CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE 4096 set_kernel_config CONFIG_ARM64_CRYPTO y set_kernel_config CONFIG_CRYPTO_SHA256_ARM64 m @@ -241,11 +478,13 @@ if [ "$BUILD_KERNEL" = true ] ; then set_kernel_config CONFIG_CRYPTO_AES_ARM64_NEON_BLK m set_kernel_config CONFIG_CRYPTO_CHACHA20_NEON m set_kernel_config CONFIG_CRYPTO_AES_ARM64_BS m - set_kernel_config SYSTEM_TRUSTED_KEYS fi # Netfilter kernel support See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406 if [ "$KERNEL_NF" = true ] ; then + set_kernel_config CONFIG_IP_NF_SECURITY m + set_kernel_config CONFIG_NETLABEL y + set_kernel_config CONFIG_IP6_NF_SECURITY m set_kernel_config CONFIG_IP_NF_TARGET_SYNPROXY m set_kernel_config CONFIG_NETFILTER_XT_TARGET_AUDIT m set_kernel_config CONFIG_NETFILTER_XT_MATCH_CGROUP m @@ -271,7 +510,6 @@ if [ "$BUILD_KERNEL" = true ] ; then set_kernel_config CONFIG_IP6_NF_NAT m set_kernel_config CONFIG_IP6_NF_TARGET_MASQUERADE m set_kernel_config CONFIG_IP6_NF_TARGET_NPT m - set_kernel_config CONFIG_IP_NF_SECURITY m set_kernel_config CONFIG_IP_SET_BITMAP_IPMAC m set_kernel_config CONFIG_IP_SET_BITMAP_PORT m set_kernel_config CONFIG_IP_SET_HASH_IP m @@ -351,28 +589,28 @@ if [ "$BUILD_KERNEL" = true ] ; then set_kernel_config CONFIG_NF_TABLES_IPV4 y set_kernel_config CONFIG_NF_TABLES_IPV6 y set_kernel_config CONFIG_NF_TABLES_NETDEV m - set_kernel_config CONFIG_NF_TABLES_SET m - set_kernel_config CONFIG_NF_TABLES_INET y - set_kernel_config CONFIG_NF_TABLES_NETDEV y - set_kernel_config CONFIG_NFT_CONNLIMIT m - set_kernel_config CONFIG_NFT_TUNNEL m - set_kernel_config CONFIG_NFT_SOCKET m - set_kernel_config CONFIG_NFT_TPROXY m - set_kernel_config CONFIG_NF_FLOW_TABLE m - set_kernel_config CONFIG_NFT_FLOW_OFFLOAD m - set_kernel_config CONFIG_NF_FLOW_TABLE_INET m - set_kernel_config CONFIG_NF_TABLES_ARP y - set_kernel_config CONFIG_NF_FLOW_TABLE_IPV4 y - set_kernel_config CONFIG_NF_FLOW_TABLE_IPV6 y - set_kernel_config CONFIG_NF_TABLES_BRIDGE y - set_kernel_config CONFIG_NF_CT_NETLINK_TIMEOUT m - set_kernel_config CONFIG_NFT_OSF m + set_kernel_config CONFIG_NF_TABLES_SET m + set_kernel_config CONFIG_NF_TABLES_INET y + set_kernel_config CONFIG_NF_TABLES_NETDEV y + set_kernel_config CONFIG_NFT_CONNLIMIT m + set_kernel_config CONFIG_NFT_TUNNEL m + set_kernel_config CONFIG_NFT_SOCKET m + set_kernel_config CONFIG_NFT_TPROXY m + set_kernel_config CONFIG_NF_FLOW_TABLE m + set_kernel_config CONFIG_NFT_FLOW_OFFLOAD m + set_kernel_config CONFIG_NF_FLOW_TABLE_INET m + set_kernel_config CONFIG_NF_TABLES_ARP y + set_kernel_config CONFIG_NF_FLOW_TABLE_IPV4 y + set_kernel_config CONFIG_NF_FLOW_TABLE_IPV6 y + set_kernel_config CONFIG_NF_TABLES_BRIDGE y + set_kernel_config CONFIG_NF_CT_NETLINK_TIMEOUT m + set_kernel_config CONFIG_NFT_OSF m fi # Enables BPF syscall for systemd-journald see https://github.com/torvalds/linux/blob/master/init/Kconfig#L848 or https://groups.google.com/forum/#!topic/linux.gentoo.user/_2aSc_ztGpA if [ "$KERNEL_BPF" = true ] ; then - set_kernel_config CONFIG_BPF_SYSCALL y + set_kernel_config CONFIG_BPF_SYSCALL y set_kernel_config CONFIG_BPF_EVENTS y set_kernel_config CONFIG_BPF_STREAM_PARSER y set_kernel_config CONFIG_CGROUP_BPF y diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh index a8e335e..2a2fa9e 100755 --- a/rpi23-gen-image.sh +++ b/rpi23-gen-image.sh @@ -194,6 +194,10 @@ KERNEL_BPF=${KERNEL_BPF:=false} KERNEL_DEFAULT_GOV=${KERNEL_DEFAULT_GOV:=ondemand} KERNEL_SECURITY=${KERNEL_SECURITY:=false} KERNEL_NF=${KERNEL_NF:=false} +KERNEL_DHKEY=${KERNEL_DHKEY:=true} +KERNEL_BTRFS=${KERNEL_BTRFS:=false} +KERNEL_NSPAN=${KERNEL_NSPAN:=false} +KERNEL_POEHAT=${KERNEL_POEHAT:=false} # Kernel compilation from source directory settings KERNELSRC_DIR=${KERNELSRC_DIR:=""} @@ -227,7 +231,7 @@ CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""} # Packages required in the chroot build environment APT_INCLUDES=${APT_INCLUDES:=""} -APT_INCLUDES="${APT_INCLUDES},libssl-dev,apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd" +APT_INCLUDES="${APT_INCLUDES},flex,bison,libssl-dev,apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd" # Packages to exclude from chroot build environment APT_EXCLUDES=${APT_EXCLUDES:=""} @@ -292,13 +296,15 @@ if [ -n "$SET_ARCH" ] ; then if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then if [ "$RPI_MODEL" != 4 ] ; then KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig} + KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img} else KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig} + KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7l.img} fi REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf" RELEASE_ARCH=${RELEASE_ARCH:=armhf} - KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img} + CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-} fi fi