imx8mq: tweak userland installs

reform2-imx8mq/mkimage.sh

@@ -22,8 +22,6 @@ export SOURCE_DATE_EPOCH
 
 # build the debian userland and configure it
 sudo ./mkuserland.sh
-# chroot into the userland and build custom packages (mesa, xserver...)
-# sudo ./mkuserland2.sh
 
 # Rescue System ---------------------------------------------------------
 

reform2-imx8mq/mkuserland.sh

@@ -8,8 +8,6 @@ SKEL=./template-skel
 
 mmdebstrap --architectures=arm64 --components=main --variant="minbase" --include="apt apt-utils gnupg ca-certificates cpio bsdmainutils init-system-helpers procps gpgv debian-archive-keyring readline-common cron netbase iproute2 ifupdown isc-dhcp-client iptables iputils-ping locales less net-tools curl wget nano micro vim coreutils parted file git sudo console-setup console-data unicode-data kbd gpm systemd libpam-systemd systemd-sysv bash-completion ncurses-term alsa-utils brightnessctl brightness-udev usbutils pciutils fbset netcat-traditional nfacct traceroute wpasupplicant htop ncdu ntpdate ntp screen tmux telnet lm-sensors rfkill dosfstools e2fsprogs dialog rsync busybox pulseaudio  sway waybar grim slurp xwayland xterm xfce4-terminal rofi arc-theme thunar policykit-1 libblockdev-dm2 libblockdev-crypto2 gnome-disk-utility cryptsetup openjdk-11-jre-headless  gnome-system-monitor eog evince mpv gedit engrampa connman-gtk gnome-icon-theme breeze-icon-theme fonts-noto-color-emoji lxpolkit mesa-utils w3m man-db pavucontrol python3-psutil ircii elinks dbus-bin gnome-settings-daemon  patch expat bison flex meson gcc g++ autoconf make libtool intltool wayland-protocols"  sid target-userland http://ftp.de.debian.org/debian
 
-# "python3-setuptools python3-mako xfonts-utils zlib1g-dev libunwind-dev libwayland-dev libwayland-egl-backend-dev libx11-dev libx11-xcb-dev libxdamage-dev libxfixes-dev libxcb-dri3-dev libxcb-xfixes0-dev libxcb-sync-dev libxrandr-dev libxext-dev libxcb-glx0-dev libxcb-present-dev libxcb-dri2-0-dev gettext autopoint libpixman-1-dev libbsd-dev libxkbfile-dev libxcb-composite0-dev libxcb-xinput-dev libxcb-icccm4-dev libxfont-dev nettle-dev libdbus-1-dev libsystemd-dev libpciaccess-dev llvm-dev libudev-dev libmtdev-dev libevdev-dev libxshmfence-dev xutils-dev libdrm-dev libxxf86vm-dev  libepoxy-dev libjson-c-dev libpcre3-dev libpango1.0-dev libxkbcommon-dev libinput-dev libxml2-dev libxfce4ui-2-dev libgarcon-1-dev xfce4-dev-tools libdbusmenu-gtk3-dev libfmt-dev libgirepository1.0-dev libgtkmm-3.0-dev libjsoncpp-dev libmpdclient-dev libnl-3-dev libnl-genl-3-dev libpulse-dev  libsigc++-2.0-dev libspdlog-dev  libsdl2-gfx-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev libsdl2-dev libsdl2-image-dev libflac-dev libmpg123-dev libpng-dev libmpeg2-4-dev"
-
 # install kernel
 cp linux/arch/arm64/boot/Image target-userland/
 # install DTBs
@@ -79,7 +77,8 @@ echo "deb [trusted=yes] https://mntre.com/reform-debian-repo reform main" >>/etc
 apt update
 
 # install essential MNT Reform system management scripts and docs
-apt install -y reform-tools reform-handbook
+apt install -y reform-tools
+# FIXME: reform-handbook is missing
 
 # move pulse config in place
 # FIXME: this is brittle and should go into a .deb

reform2-imx8mq/mkuserland3.sh

@@ -23,17 +23,20 @@ set -e
 
 # install applications
 
-apt install -y libreoffice libreoffice-gtk3 inkscape chromium emacs gimp wmaker x11-utils
-apt install -y evolution freecad ardour sxiv neverball scummvm dosbox wf-recorder wev linphone-desktop
+apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr chromium emacs gimp wmaker x11-utils
+apt install -y evolution freecad ardour sxiv neverball scummvm dosbox wf-recorder wev linphone-desktop kicad
 
 # install patched software from mntre
-apt install -y kicad blender blender-data cage wayvnc
+# (ffmpeg supports hardware h.264 decoding)
 
-# install a minimal gnome3
+apt install -y blender blender-data cage wayvnc ffmpeg
+
+# install a minimal gnome desktop
 
 apt install -y --no-install-recommends gnome-control-center gnome-session
 
 # remove apparmor (slows down boot)
+
 apt remove -y apparmor
 
 EOF