diff --git a/VERSION b/VERSION index 78b7fc9..f31c877 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.15.1-valiot.10 +1.15.1-valiot.11 diff --git a/linux-5.4.defconfig b/linux-5.4.defconfig index a1cf43f..e56a861 100644 --- a/linux-5.4.defconfig +++ b/linux-5.4.defconfig @@ -8,7 +8,9 @@ CONFIG_PREEMPT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y +CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_FREEZER=y @@ -16,10 +18,7 @@ CONFIG_CPUSETS=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set +CONFIG_USER_NS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_EMBEDDED=y # CONFIG_PERF_EVENTS is not set @@ -117,10 +116,15 @@ CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_VS=m +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_RPFILTER=m CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -134,6 +138,9 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_CAN=y CONFIG_CAN_MCP251X=y CONFIG_BRIDGE=m +CONFIG_NET_SCHED=y +CONFIG_NET_CLS_CGROUP=m +CONFIG_CGROUP_NET_PRIO=y CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_MAC80211_MESH=y @@ -151,8 +158,14 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=m CONFIG_SCSI_ISCSI_ATTRS=y +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y CONFIG_NETDEVICES=y +ONFIG_MACVLAN=m +CONFIG_IPVLAN=m +CONFIG_VXLAN=m CONFIG_TUN=m +CONFIG_VETH=m # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set # CONFIG_NET_VENDOR_AGERE is not set @@ -398,8 +411,12 @@ CONFIG_BCM2835_MBOX=y CONFIG_RASPBERRYPI_POWER=y CONFIG_EXTCON=m CONFIG_GENERIC_PHY=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y +CONFIG_OVERLAY_FS=m CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_SQUASHFS=y diff --git a/nerves_defconfig b/nerves_defconfig index 2d06378..e7953d9 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -57,6 +57,7 @@ BR2_PACKAGE_RPI_USERLAND=y # BR2_PACKAGE_ALSA_LIB_SEQ is not set # BR2_PACKAGE_ALSA_LIB_ALISP is not set # BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS is not set +BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBP11=y BR2_PACKAGE_MBEDTLS=y BR2_PACKAGE_MBEDTLS_COMPRESSION=y @@ -67,6 +68,12 @@ BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_IPROUTE2=y BR2_PACKAGE_MOSQUITTO=y BR2_PACKAGE_SOCKETCAND=y +BR2_PACKAGE_LIBCGROUP=y +BR2_PACKAGE_LIBCGROUP_TOOLS=y +BR2_PACKAGE_AVAHI=y +BR2_PACKAGE_AVAHI_DAEMON=y +BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y +BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_WIRELESS_REGDB=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y @@ -76,8 +83,12 @@ BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_PACKAGE_DOCKER_CLI=y +BR2_PACKAGE_DOCKER_CLI_STATIC=y +BR2_PACKAGE_DOCKER_COMPOSE=y +BR2_PACKAGE_DOCKER_ENGINE=y # BR2_TARGET_ROOTFS_TAR is not set -BR2_NERVES_SYSTEM_NAME="nerves_system_rpi4" +BR2_NERVES_SYSTEM_NAME="valiot_system_rpi4" BR2_NERVES_ADDITIONAL_IMAGE_FILES="${NERVES_DEFCONFIG_DIR}/fwup.conf ${NERVES_DEFCONFIG_DIR}/cmdline.txt ${NERVES_DEFCONFIG_DIR}/config.txt" BR2_PACKAGE_NBTTY=y BR2_PACKAGE_NERVES_CONFIG=y diff --git a/rootfs_overlay/etc/docker b/rootfs_overlay/etc/docker new file mode 120000 index 0000000..061129f --- /dev/null +++ b/rootfs_overlay/etc/docker @@ -0,0 +1 @@ +/root/etc/docker \ No newline at end of file diff --git a/rootfs_overlay/etc/erlinit.config b/rootfs_overlay/etc/erlinit.config index dcca6f5..3b3dd4f 100644 --- a/rootfs_overlay/etc/erlinit.config +++ b/rootfs_overlay/etc/erlinit.config @@ -63,6 +63,7 @@ -m pstore:/sys/fs/pstore:pstore:nodev,noexec,nosuid: -m tmpfs:/sys/fs/cgroup:tmpfs:nodev,noexec,nosuid:mode=755,size=1024k -m cpu:/sys/fs/cgroup/cpu:cgroup:nodev,noexec,nosuid:cpu +-m devices:/sys/fs/cgroup/devices:cgroup:nodev,noexec,nosuid:devices # Erlang release search path -r /srv/erlang