From 98802fd728fcc88f62d3cb2c2196ee12a46969bd Mon Sep 17 00:00:00 2001 From: Valentin Ochs Date: Wed, 10 Mar 2021 21:40:04 +0100 Subject: [PATCH 1/3] Update kernel config, use glibc, fix init script --- config | 245 +++++++++--------------------- kernel.config | 22 +++ root_overlay/etc/init.d/S99nfc.sh | 3 +- 3 files changed, 95 insertions(+), 175 deletions(-) create mode 100644 kernel.config diff --git a/config b/config index ecbb1eb..5c67bf0 100644 --- a/config +++ b/config @@ -221,16 +221,15 @@ BR2_SSP_NONE=y # # RELocation Read Only (RELRO) needs shared libraries # - -# -# Fortify Source needs a glibc toolchain and optimization -# +BR2_FORTIFY_SOURCE_NONE=y +# BR2_FORTIFY_SOURCE_1 is not set +# BR2_FORTIFY_SOURCE_2 is not set # # Toolchain # BR2_TOOLCHAIN=y -BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_USES_GLIBC=y BR2_TOOLCHAIN_BUILDROOT=y # BR2_TOOLCHAIN_EXTERNAL is not set @@ -239,9 +238,9 @@ BR2_TOOLCHAIN_BUILDROOT=y # BR2_TOOLCHAIN_BUILDROOT_VENDOR="buildroot" # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set -# BR2_TOOLCHAIN_BUILDROOT_GLIBC is not set -BR2_TOOLCHAIN_BUILDROOT_MUSL=y -BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set +BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" # # Kernel Header Options @@ -310,7 +309,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD is not set BR2_PACKAGE_LINUX_HEADERS=y -BR2_PACKAGE_MUSL=y + +# +# Glibc Options +# +BR2_PACKAGE_GLIBC=y +# BR2_PACKAGE_GLIBC_UTILS is not set # # Binutils Options @@ -329,10 +333,12 @@ BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="" # BR2_GCC_VERSION_8_X is not set BR2_GCC_VERSION_9_X=y # BR2_GCC_VERSION_10_X is not set +BR2_GCC_SUPPORTS_DLANG=y BR2_GCC_VERSION="9.3.0" BR2_EXTRA_GCC_CONFIG_OPTIONS="" # BR2_TOOLCHAIN_BUILDROOT_CXX is not set # BR2_TOOLCHAIN_BUILDROOT_FORTRAN is not set +# BR2_TOOLCHAIN_BUILDROOT_DLANG is not set # BR2_GCC_ENABLE_LTO is not set # BR2_GCC_ENABLE_OPENMP is not set # BR2_GCC_ENABLE_GRAPHITE is not set @@ -357,7 +363,9 @@ BR2_TOOLCHAIN_HAS_SSP=y BR2_TOOLCHAIN_HAS_SSP_STRONG=y BR2_TOOLCHAIN_HAS_UCONTEXT=y BR2_TOOLCHAIN_SUPPORTS_PIE=y +# BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY is not set BR2_TOOLCHAIN_EXTRA_LIBS="" +BR2_TOOLCHAIN_HAS_FULL_GETTEXT=y BR2_USE_MMU=y BR2_TARGET_OPTIMIZATION="" BR2_TARGET_LDFLAGS="" @@ -445,16 +453,13 @@ BR2_ROOTFS_SKELETON_DEFAULT=y # BR2_ROOTFS_SKELETON_CUSTOM is not set BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" -# BR2_TARGET_GENERIC_PASSWD_SHA256 is not set -BR2_TARGET_GENERIC_PASSWD_SHA512=y -BR2_TARGET_GENERIC_PASSWD_METHOD="sha-512" +BR2_TARGET_GENERIC_PASSWD_SHA256=y +# BR2_TARGET_GENERIC_PASSWD_SHA512 is not set +BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256" BR2_INIT_BUSYBOX=y # BR2_INIT_SYSV is not set # BR2_INIT_OPENRC is not set - -# -# systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5 -# +# BR2_INIT_SYSTEMD is not set # BR2_INIT_NONE is not set # BR2_ROOTFS_DEVICE_CREATION_STATIC is not set # BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set @@ -482,10 +487,11 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="0" BR2_TARGET_GENERIC_GETTY_TERM="vt100" BR2_TARGET_GENERIC_GETTY_OPTIONS="" BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y -BR2_SYSTEM_DHCP="eth0" +BR2_SYSTEM_DHCP="" BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" BR2_ENABLE_LOCALE_PURGE=y BR2_ENABLE_LOCALE_WHITELIST="C en_US" +BR2_GENERATE_LOCALE="" # BR2_SYSTEM_ENABLE_NLS is not set # BR2_TARGET_TZ_INFO is not set BR2_ROOTFS_USERS_TABLES="" @@ -514,7 +520,7 @@ BR2_LINUX_KERNEL_USE_DEFCONFIG=y # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set # BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG is not set BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="../kernel.config" BR2_LINUX_KERNEL_CUSTOM_LOGO_PATH="" # BR2_LINUX_KERNEL_UIMAGE is not set # BR2_LINUX_KERNEL_APPENDED_UIMAGE is not set @@ -541,10 +547,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # # Linux Kernel Extensions # - -# -# xenomai needs a uClibc or glibc toolchain w/ threads -# +# BR2_LINUX_KERNEL_EXT_XENOMAI is not set # BR2_LINUX_KERNEL_EXT_RTAI is not set # BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS is not set # BR2_LINUX_KERNEL_EXT_FBTFT is not set @@ -738,10 +741,7 @@ BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC=y # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_DROPWATCH is not set # BR2_PACKAGE_DSTAT is not set - -# -# dt needs a glibc or uClibc toolchain w/ threads -# +# BR2_PACKAGE_DT is not set # # duma needs a toolchain w/ C++, threads, dynamic library @@ -768,20 +768,14 @@ BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS=y BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS=y # BR2_PACKAGE_LTP_TESTSUITE is not set BR2_PACKAGE_LTRACE_ARCH_SUPPORTS=y - -# -# ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads -# +# BR2_PACKAGE_LTRACE is not set # BR2_PACKAGE_LTTNG_BABELTRACE is not set # BR2_PACKAGE_LTTNG_MODULES is not set # BR2_PACKAGE_LTTNG_TOOLS is not set # BR2_PACKAGE_MEMSTAT is not set # BR2_PACKAGE_NETPERF is not set # BR2_PACKAGE_NETSNIFF_NG is not set - -# -# nmon needs a glibc toolchain -# +# BR2_PACKAGE_NMON is not set BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS=y # @@ -866,6 +860,7 @@ BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny" # BR2_PACKAGE_MAKE is not set # BR2_PACKAGE_PATCH is not set # BR2_PACKAGE_PKGCONF is not set +# BR2_PACKAGE_RIPGREP is not set # BR2_PACKAGE_SED is not set # BR2_PACKAGE_SUBVERSION is not set # BR2_PACKAGE_TREE is not set @@ -875,19 +870,13 @@ BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny" # # BR2_PACKAGE_ABOOTIMG is not set # BR2_PACKAGE_AUFS_UTIL is not set - -# -# autofs needs a glibc or uClibc toolchain w/ NPTL and dynamic library -# +# BR2_PACKAGE_AUTOFS is not set # BR2_PACKAGE_BTRFS_PROGS is not set # BR2_PACKAGE_CIFS_UTILS is not set # BR2_PACKAGE_CPIO is not set # BR2_PACKAGE_CRAMFS is not set # BR2_PACKAGE_CURLFTPFS is not set - -# -# davfs2 needs a glibc or uClibc toolchain -# +# BR2_PACKAGE_DAVFS2 is not set # BR2_PACKAGE_DOSFSTOOLS is not set # BR2_PACKAGE_E2FSPROGS is not set # BR2_PACKAGE_E2TOOLS is not set @@ -1200,10 +1189,7 @@ BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y # # apcupsd needs a toolchain w/ C++, threads # - -# -# avrdude needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library, gcc >= 4.9 -# +# BR2_PACKAGE_AVRDUDE is not set # BR2_PACKAGE_BCACHE_TOOLS is not set # BR2_PACKAGE_BRICKD is not set # BR2_PACKAGE_BRLTTY is not set @@ -1240,10 +1226,7 @@ BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y # BR2_PACKAGE_FMTOOLS is not set # BR2_PACKAGE_FREESCALE_IMX is not set # BR2_PACKAGE_FXLOAD is not set - -# -# gcnano-binaries needs a glibc toolchain w/ threads, dynamic library -# +# BR2_PACKAGE_GCNANO_BINARIES is not set # BR2_PACKAGE_GPM is not set # BR2_PACKAGE_GPSD is not set @@ -1283,10 +1266,7 @@ BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y # BR2_PACKAGE_LSUIO is not set # BR2_PACKAGE_LUKSMETA is not set # BR2_PACKAGE_LVM2 is not set - -# -# mali-t76x needs a glibc toolchain with armhf enabled -# +# BR2_PACKAGE_MALI_T76X is not set # BR2_PACKAGE_MBPFAN is not set # BR2_PACKAGE_MDADM is not set # BR2_PACKAGE_MDEVD is not set @@ -1355,29 +1335,16 @@ BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS=y # BR2_PACKAGE_SREDIRD is not set # BR2_PACKAGE_STATSERIAL is not set # BR2_PACKAGE_STM32FLASH is not set - -# -# sunxi-cedarx needs a glibc toolchain -# - -# -# sunxi-mali needs an EABIhf glibc toolchain -# +# BR2_PACKAGE_SUNXI_CEDARX is not set +# BR2_PACKAGE_SUNXI_MALI_MAINLINE is not set # BR2_PACKAGE_SYSSTAT is not set # BR2_PACKAGE_TARGETCLI_FB is not set - -# -# ti-gfx needs a glibc toolchain and a Linux kernel to be built -# +# BR2_PACKAGE_TI_GFX is not set # BR2_PACKAGE_TI_SGX_KM is not set # # ti-sgx-um needs the ti-sgx-km driver # - -# -# ti-sgx-um needs udev and a glibc toolchain w/ threads -# # BR2_PACKAGE_TI_UIM is not set # BR2_PACKAGE_TI_UTILS is not set # BR2_PACKAGE_TIO is not set @@ -1398,10 +1365,7 @@ BR2_PACKAGE_HAS_UDEV=y # BR2_PACKAGE_USBMOUNT is not set # BR2_PACKAGE_USBUTILS is not set # BR2_PACKAGE_W_SCAN is not set - -# -# wf111 needs a glibc toolchain -# +# BR2_PACKAGE_WF111 is not set # BR2_PACKAGE_WIPE is not set # BR2_PACKAGE_XORRISO is not set BR2_PACKAGE_XR819_XRADIO=y @@ -1418,10 +1382,7 @@ BR2_PACKAGE_ERLANG_ARCH_SUPPORTS=y # BR2_PACKAGE_FICL is not set BR2_PACKAGE_GAUCHE_ARCH_SUPPORTS=y # BR2_PACKAGE_GAUCHE is not set - -# -# guile needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library -# +# BR2_PACKAGE_GUILE is not set # BR2_PACKAGE_HASERL is not set # BR2_PACKAGE_JIMTCL is not set # BR2_PACKAGE_LUA is not set @@ -1618,10 +1579,7 @@ BR2_PACKAGE_PYTHON3_SQLITE=y # BR2_PACKAGE_PYTHON_FROZENLIST is not set # BR2_PACKAGE_PYTHON_FUTURE is not set # BR2_PACKAGE_PYTHON_GITDB2 is not set - -# -# python-gobject needs a glibc toolchain, gcc >= 4.9 -# +# BR2_PACKAGE_PYTHON_GOBJECT is not set # BR2_PACKAGE_PYTHON_GPIOZERO is not set BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS=y # BR2_PACKAGE_PYTHON_GREENLET is not set @@ -2325,6 +2283,10 @@ BR2_PACKAGE_JPEG_SIMD_SUPPORT=y # libraw needs a toolchain w/ C++ # +# +# librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.8 +# + # # libsoil needs an OpenGL backend and a toolchain w/ dynamic library # @@ -2710,10 +2672,7 @@ BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS=y # # BR2_PACKAGE_C_ARES is not set BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y - -# -# canfestival needs a glibc or uClibc toolchain w/ threads and dynamic library -# +# BR2_PACKAGE_CANFESTIVAL is not set # BR2_PACKAGE_CGIC is not set # @@ -2869,14 +2828,8 @@ BR2_PACKAGE_LIBNL=y # # norm needs a toolchain w/ C++, threads, dynamic library # - -# -# nss-myhostname needs a glibc toolchain -# - -# -# nss-pam-ldapd needs a glibc toolchain -# +# BR2_PACKAGE_NSS_MYHOSTNAME is not set +# BR2_PACKAGE_NSS_PAM_LDAPD is not set # # omniORB needs a toolchain w/ C++, threads @@ -2958,7 +2911,6 @@ BR2_PACKAGE_LIBNL=y # # BR2_PACKAGE_APR is not set # BR2_PACKAGE_APR_UTIL is not set -# BR2_PACKAGE_ARGP_STANDALONE is not set # # armadillo needs a toolchain w/ C++ @@ -3017,10 +2969,7 @@ BR2_PACKAGE_LIBNL=y # # eigen needs a toolchain w/ C++ # - -# -# elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads -# +# BR2_PACKAGE_ELFUTILS is not set # BR2_PACKAGE_ELL is not set # BR2_PACKAGE_FFTW is not set @@ -3051,10 +3000,7 @@ BR2_PACKAGE_LIBNL=y # # BR2_PACKAGE_GMP is not set BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS=y - -# -# gobject-introspection needs a glibc toolchain, gcc >= 4.9 -# +# BR2_PACKAGE_GOBJECT_INTROSPECTION is not set # BR2_PACKAGE_GSL is not set # @@ -3172,8 +3118,6 @@ BR2_PACKAGE_LLVM_TARGET_ARCH="ARM" # # msgpack needs a toolchain w/ C++ # -BR2_PACKAGE_MUSL_COMPAT_HEADERS=y -# BR2_PACKAGE_MUSL_FTS is not set BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET="ARMV7" BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS=y # BR2_PACKAGE_OPENBLAS is not set @@ -3389,16 +3333,10 @@ BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y # # cannelloni needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # - -# -# casync needs a glibc toolchain -# +# BR2_PACKAGE_CASYNC is not set # BR2_PACKAGE_CHRONY is not set # BR2_PACKAGE_CIVETWEB is not set - -# -# connman needs a glibc or uClibc toolchain w/ wchar, threads, resolver, dynamic library -# +# BR2_PACKAGE_CONNMAN is not set # # connman-gtk needs libgtk3 and a glibc or uClibc toolchain w/ wchar, threads, resolver, dynamic library @@ -3559,6 +3497,7 @@ BR2_PACKAGE_IW=y # BR2_PACKAGE_MINISSDPD is not set # BR2_PACKAGE_MJPG_STREAMER is not set # BR2_PACKAGE_MODEM_MANAGER is not set +BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS=y # # mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic library @@ -3579,17 +3518,11 @@ BR2_PACKAGE_IW=y # BR2_PACKAGE_NETATALK is not set # BR2_PACKAGE_NETCALC is not set BR2_PACKAGE_NETCAT=y - -# -# netcat-openbsd needs a glibc toolchain w/ dynamic library, threads, headers >= 3.12 -# +# BR2_PACKAGE_NETCAT_OPENBSD is not set # BR2_PACKAGE_NETPLUG is not set # BR2_PACKAGE_NETSNMP is not set # BR2_PACKAGE_NETSTAT_NAT is not set - -# -# NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library, wchar, threads -# +# BR2_PACKAGE_NETWORK_MANAGER is not set # BR2_PACKAGE_NFACCT is not set # BR2_PACKAGE_NFTABLES is not set # BR2_PACKAGE_NGINX is not set @@ -3634,10 +3567,7 @@ BR2_PACKAGE_NTP_NTPDATE=y # BR2_PACKAGE_PIMD is not set # BR2_PACKAGE_PIXIEWPS is not set # BR2_PACKAGE_POUND is not set - -# -# pppd needs a uClibc or glibc toolchain w/ dynamic library -# +# BR2_PACKAGE_PPPD is not set # BR2_PACKAGE_PPTP_LINUX is not set # BR2_PACKAGE_PRIVOXY is not set # BR2_PACKAGE_PROFTPD is not set @@ -3658,10 +3588,7 @@ BR2_PACKAGE_NTP_NTPDATE=y # BR2_PACKAGE_RADVD is not set # BR2_PACKAGE_REAVER is not set # BR2_PACKAGE_REDIR is not set - -# -# rp-pppoe needs a uClibc or glibc toolchain w/ dynamic library -# +# BR2_PACKAGE_RP_PPPOE is not set # BR2_PACKAGE_RPCBIND is not set # BR2_PACKAGE_RSH_REDONE is not set # BR2_PACKAGE_RSYNC is not set @@ -3673,10 +3600,7 @@ BR2_PACKAGE_NTP_NTPDATE=y # BR2_PACKAGE_RYGEL is not set # BR2_PACKAGE_S6_DNS is not set # BR2_PACKAGE_S6_NETWORKING is not set - -# -# samba4 needs a uClibc or glibc toolchain w/ wchar, dynamic library, NPTL -# +# BR2_PACKAGE_SAMBA4 is not set # # sconeserver needs a toolchain with dynamic library, C++, NPTL @@ -3707,6 +3631,7 @@ BR2_PACKAGE_NTP_NTPDATE=y # BR2_PACKAGE_SSLH is not set # BR2_PACKAGE_STRONGSWAN is not set # BR2_PACKAGE_STUNNEL is not set +# BR2_PACKAGE_SURICATA is not set # BR2_PACKAGE_TCPDUMP is not set # BR2_PACKAGE_TCPING is not set # BR2_PACKAGE_TCPREPLAY is not set @@ -3822,10 +3747,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y # Real-Time # BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS=y - -# -# xenomai needs a glibc or uClibc toolchain w/ threads -# +# BR2_PACKAGE_XENOMAI is not set # # Security @@ -3838,10 +3760,7 @@ BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS=y # BR2_PACKAGE_IMA_EVM_UTILS is not set # BR2_PACKAGE_OPTEE_BENCHMARK is not set # BR2_PACKAGE_OPTEE_CLIENT is not set - -# -# paxtest needs a glibc toolchain -# +# BR2_PACKAGE_PAXTEST is not set # BR2_PACKAGE_POLICYCOREUTILS is not set # BR2_PACKAGE_REFPOLICY is not set # BR2_PACKAGE_RESTORECOND is not set @@ -3915,10 +3834,7 @@ BR2_PACKAGE_AUDIT_ARCH_SUPPORTS=y # BR2_PACKAGE_COREUTILS is not set # BR2_PACKAGE_CPULOAD is not set # BR2_PACKAGE_DAEMON is not set - -# -# dc3dd needs a glibc or uClibc toolchain w/ threads -# +# BR2_PACKAGE_DC3DD is not set # BR2_PACKAGE_DCRON is not set # @@ -3951,19 +3867,14 @@ BR2_PACKAGE_INITSCRIPTS=y BR2_PACKAGE_KMOD=y # BR2_PACKAGE_KMOD_TOOLS is not set # BR2_PACKAGE_KVMTOOL is not set - -# -# libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar -# +# BR2_PACKAGE_LIBOSTREE is not set # BR2_PACKAGE_LXC is not set BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS=y - -# -# makedumpfile needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads -# +# BR2_PACKAGE_MAKEDUMPFILE is not set # BR2_PACKAGE_MENDER is not set # BR2_PACKAGE_MFOC is not set # BR2_PACKAGE_MONIT is not set +# BR2_PACKAGE_MULTIPATH_TOOLS is not set # BR2_PACKAGE_NCDU is not set # @@ -3988,10 +3899,7 @@ BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS=y # BR2_PACKAGE_QUOTA is not set # BR2_PACKAGE_QUOTATOOL is not set # BR2_PACKAGE_RAUC is not set - -# -# rsyslog needs a uClibc or glibc toolchain w/ threads, dynamic library -# +# BR2_PACKAGE_RSYSLOG is not set # BR2_PACKAGE_RUNC is not set # BR2_PACKAGE_S6 is not set # BR2_PACKAGE_S6_LINUX_INIT is not set @@ -4017,10 +3925,7 @@ BR2_PACKAGE_SYSTEMD_BOOTCHART_ARCH_SUPPORTS=y # BR2_PACKAGE_TPM2_ABRMD is not set # BR2_PACKAGE_TPM2_TOOLS is not set # BR2_PACKAGE_TPM2_TOTP is not set - -# -# unscd needs a glibc toolchain -# +# BR2_PACKAGE_UNSCD is not set BR2_PACKAGE_UTIL_LINUX=y BR2_PACKAGE_UTIL_LINUX_LIBS=y BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y @@ -4047,10 +3952,7 @@ BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y # BR2_PACKAGE_UTIL_LINUX_LAST is not set # BR2_PACKAGE_UTIL_LINUX_LINE is not set # BR2_PACKAGE_UTIL_LINUX_LOGGER is not set - -# -# login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library -# +# BR2_PACKAGE_UTIL_LINUX_LOGIN is not set # BR2_PACKAGE_UTIL_LINUX_LOSETUP is not set # BR2_PACKAGE_UTIL_LINUX_LSLOGINS is not set # BR2_PACKAGE_UTIL_LINUX_LSMEM is not set @@ -4068,17 +3970,11 @@ BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y # BR2_PACKAGE_UTIL_LINUX_RAW is not set # BR2_PACKAGE_UTIL_LINUX_RENAME is not set # BR2_PACKAGE_UTIL_LINUX_RFKILL is not set - -# -# runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library -# +# BR2_PACKAGE_UTIL_LINUX_RUNUSER is not set # BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS is not set # BR2_PACKAGE_UTIL_LINUX_SETPRIV is not set # BR2_PACKAGE_UTIL_LINUX_SETTERM is not set - -# -# su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library -# +# BR2_PACKAGE_UTIL_LINUX_SU is not set # BR2_PACKAGE_UTIL_LINUX_SULOGIN is not set # BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set # BR2_PACKAGE_UTIL_LINUX_TUNELP is not set @@ -4129,7 +4025,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_GEN=4 BR2_TARGET_ROOTFS_EXT2_REV=1 BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ROOTFS_EXT2_SIZE="80M" BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=5 BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit" @@ -4296,6 +4192,7 @@ BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS=y # BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT is not set # BR2_PACKAGE_HOST_RAUC is not set BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS=y +BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_RUSTC_ARCH="armv7" BR2_PACKAGE_HOST_RUSTC_ABI="eabihf" # BR2_PACKAGE_HOST_RUSTC is not set diff --git a/kernel.config b/kernel.config new file mode 100644 index 0000000..a9653bf --- /dev/null +++ b/kernel.config @@ -0,0 +1,22 @@ +# spidev +CONFIG_SPI_SPIDEV=y + +# spi nor +CONFIG_MTD=y +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_M25P80=y + +# wireless core +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_CFG80211_WEXT=y + +# wireless drivers +CONFIG_WLAN=y + +# ondemand cpufreq governor +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y + +CONFIG_USB_ACM=y diff --git a/root_overlay/etc/init.d/S99nfc.sh b/root_overlay/etc/init.d/S99nfc.sh index 0366bcb..8d892c3 100755 --- a/root_overlay/etc/init.d/S99nfc.sh +++ b/root_overlay/etc/init.d/S99nfc.sh @@ -1,3 +1,4 @@ -mkfifo /var/nfc_fifo +rm /tmp/nfc_fifo +mkfifo /tmp/nfc_fifo start-stop-daemon -S -m -p /tmp/watcher.pid -x /bin/watcher -b From 7a439df1bc66afd33dfcb7dd119f01f4e61f0c8d Mon Sep 17 00:00:00 2001 From: Valentin Ochs Date: Wed, 10 Mar 2021 21:40:44 +0100 Subject: [PATCH 2/3] Update door control script --- door_control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/door_control b/door_control index e48f0f6..2efc234 160000 --- a/door_control +++ b/door_control @@ -1 +1 @@ -Subproject commit e48f0f63385f5990440524c66ba925466f8e292f +Subproject commit 2efc2343b68a4b65dd239cbb0426074826d6f1b6 From b2e55cc70d134afe3966fbc167235f92f176231a Mon Sep 17 00:00:00 2001 From: Valentin Ochs Date: Wed, 10 Mar 2021 22:22:22 +0100 Subject: [PATCH 3/3] rename test.py -> door.py --- .gitignore | 2 +- Makefile | 6 +++--- root_overlay/bin/watcher | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2fc4603..d6568c1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ /root_overlay/etc/door_tokens /root_overlay/etc/dropbear /root_overlay/root/key -/root_overlay/bin/test.py +/root_overlay/bin/door.py /root_overlay/bin/poll_desfire /root_overlay/etc/wpa_supplicant /root_overlay/root/.ssh/authorized_keys diff --git a/Makefile b/Makefile index 85017d1..dca12f5 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ sdcard.img: buildroot/.config make -C buildroot all cp buildroot/output/images/sdcard.img sdcard.img -root_overlay: root_overlay/bin/test.py +root_overlay: root_overlay/bin/door.py root_overlay: root_overlay/etc/door_tokens root_overlay: root_overlay/etc/dropbear/dropbear_ecdsa_host_key root_overlay: root_overlay/etc/wpa_supplicant/wpa_supplicant.conf @@ -29,7 +29,7 @@ root_overlay/root/key: mkdir -p `dirname $@` dd if=/dev/urandom of=$@ bs=1 count=16 -root_overlay/bin/test.py: door_control/door.py +root_overlay/bin/door.py: door_control/door.py mkdir -p `dirname $@` cp $< $@ @@ -46,7 +46,7 @@ clean: make -C buildroot clean rm -f sdcard.img rm -f root_overlay/root/.ssh/authorized_keys - rm -f root_overlay/bin/test.py + rm -f root_overlay/bin/door.py menuconfig: make -C buildroot menuconfig diff --git a/root_overlay/bin/watcher b/root_overlay/bin/watcher index 23e90d8..cf13ab5 100755 --- a/root_overlay/bin/watcher +++ b/root_overlay/bin/watcher @@ -1,6 +1,6 @@ #!/bin/sh while true; do start-stop-daemon -S -m -p /tmp/poll_desfire.pid -x /bin/poll_desfire -b -- /root/key /tmp/nfc_fifo - start-stop-daemon -v -p /tmp/fcpy.pid -S -b -m -v -x /usr/bin/python -- /bin/test.py + start-stop-daemon -v -p /tmp/fcpy.pid -S -b -m -v -x /usr/bin/python -- /bin/door.py sleep 30 done