put back adb, removed sdl package (to be changed in buildroot repo)

FunKey/board/funkey/busybox.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.32.0
-# Mon Aug  1 19:33:14 2022
+# Wed Mar 15 23:27:39 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 

FunKey/board/funkey/rootfs-overlay/etc/inittab

@@ -16,7 +16,7 @@
 # Startup the system
 ::sysinit:/bin/cat /etc/issue
 ::sysinit:/bin/mount -t proc proc /proc
-#::sysinit:/bin/mount -o remount,rw /
+::sysinit:/bin/mount -o remount,rw /
 ::sysinit:/bin/mkdir -p /dev/pts /dev/shm
 ::sysinit:/bin/mount -a
 ::sysinit:/sbin/swapon -a

FunKey/board/funkey/rootfs-overlay/root/.profile

@@ -94,3 +94,8 @@ instant_play load
 # Start frontend
 echo "Start frontend"
 frontend init >/dev/null 2>&1 &
+
+# Debug
+touch /mnt/adb
+touch /mnt/disable_frontend
+funkey_prod_screens TEARING 60 &

FunKey/configs/funkey_defconfig

@@ -25,8 +25,6 @@ BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/users_table.tx
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/post-build.sh"
 BR2_LINUX_KERNEL=y
-#BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-#BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/FunKey-Project/linux/archive/refs/tags/linux-FunKey-1.0.2.tar.gz"
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/FunKey-Project/linux"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="22d08fe51503130d40d20529b12d02cdb913979b"
@@ -100,6 +98,7 @@ BR2_PACKAGE_FMT=y
 BR2_PACKAGE_ICU=y
 BR2_PACKAGE_DHCPCD=y
 BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_ANDROID_TOOLS=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_SWUPDATE=y
 BR2_PACKAGE_SWUPDATE_CONFIG="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/swupdate.config"

FunKey/package/sdl/Config.in

@@ -1,26 +0,0 @@
-config BR2_PACKAGE_SDL
-	bool "SDL"
-	help
-	  Simple DirectMedia Layer - SDL is a library that allows
-	  programs portable low level access to a video framebuffer,
-	  audio output, mouse, and keyboard.
-
-	  http://www.libsdl.org/
-
-if BR2_PACKAGE_SDL
-
-config BR2_PACKAGE_SDL_FBCON
-	bool "SDL framebuffer console video driver"
-	default y
-
-config BR2_PACKAGE_SDL_DIRECTFB
-	bool "SDL DirectFB video driver"
-	depends on BR2_PACKAGE_DIRECTFB
-
-config BR2_PACKAGE_SDL_X11
-	bool "SDL X11 video driver"
-	depends on BR2_PACKAGE_XORG7
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXEXT
-
-endif

FunKey/package/sdl/sdl.mk

@@ -1,96 +0,0 @@
-################################################################################
-#
-# sdl
-#
-################################################################################
-
-SDL_VERSION = 4ae80e83c7c52f60282a4703588b7d52015dd1ea
-SDL_SITE_METHOD = git
-SDL_SITE = https://github.com/FunKey-Project/SDL-1.2.git
-SDL_LICENSE = LGPL-2.1+
-SDL_LICENSE_FILES = COPYING
-SDL_INSTALL_STAGING = YES
-
-# we're patching configure.in, but package cannot autoreconf with our version of
-# autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES
-define SDL_RUN_AUTOGEN
-	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
-endef
-
-SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
-HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
-
-SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
-HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
-
-SDL_CONF_OPTS += --enable-video-qtopia=no
-
-ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
-SDL_CONF_OPTS += --enable-video-fbcon=yes
-else
-SDL_CONF_OPTS += --enable-video-fbcon=no
-endif
-
-ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
-SDL_DEPENDENCIES += directfb
-SDL_CONF_OPTS += --enable-video-directfb=yes
-SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config
-else
-SDL_CONF_OPTS += --enable-video-directfb=no
-endif
-
-ifeq ($(BR2_PACKAGE_SDL_X11),y)
-SDL_CONF_OPTS += --enable-video-x11=yes
-SDL_DEPENDENCIES += \
-	xlib_libX11 xlib_libXext \
-	$(if $(BR2_PACKAGE_XLIB_LIBXRENDER), xlib_libXrender) \
-	$(if $(BR2_PACKAGE_XLIB_LIBXRANDR), xlib_libXrandr)
-else
-SDL_CONF_OPTS += --enable-video-x11=no
-endif
-
-ifneq ($(BR2_USE_MMU),y)
-SDL_CONF_OPTS += --enable-dga=no
-endif
-
-# overwrite autodection (prevents confusion with host libpth version)
-ifeq ($(BR2_PACKAGE_LIBPTHSEM_COMPAT),y)
-SDL_CONF_OPTS += --enable-pth
-SDL_CONF_ENV += ac_cv_path_PTH_CONFIG=$(STAGING_DIR)/usr/bin/pth-config
-SDL_DEPENDENCIES += libpthsem
-else
-SDL_CONF_OPTS += --disable-pth
-endif
-
-ifeq ($(BR2_PACKAGE_TSLIB),y)
-SDL_DEPENDENCIES += tslib
-endif
-
-ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-SDL_DEPENDENCIES += alsa-lib
-endif
-
-ifeq ($(BR2_PACKAGE_MESA3D),y)
-SDL_DEPENDENCIES += mesa3d
-endif
-
-SDL_CONF_OPTS += \
-	--disable-rpath \
-	--enable-pulseaudio=no \
-	--disable-arts \
-	--disable-esd \
-	--disable-nasm \
-	--disable-video-ps3
-
-HOST_SDL_CONF_OPTS += \
-	--enable-pulseaudio=no \
-	--enable-video-x11=no \
-	--disable-arts \
-	--disable-esd \
-	--disable-nasm \
-	--disable-video-ps3
-
-SDL_CONFIG_SCRIPTS = sdl-config
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))

Recovery/board/funkey/busybox.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.32.0
-# Mon Aug  1 19:17:50 2022
+# Wed Mar 15 23:15:01 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y