Override logind.conf to enable suspend with the power key

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
           submodules: false
@@ -41,11 +41,11 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [create_release]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabi qemu-user-static debootstrap python3-pip
       - name: Upgrade pip and setuptools
@@ -91,11 +91,11 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [create_release]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabihf libssl-dev lzop qemu-user-static debootstrap
       - name: Configure for Linux
@@ -131,9 +131,6 @@ jobs:
           - model: a7200
             nk: edna3exe.bin
             lilo: gen2.bin
-          - model: a7400
-            nk: edna3exe.bin
-            lilo: gen2_7400.bin
           - model: sh1
             nk: edsa1exe.bin
             lilo: gen3_1.bin
@@ -157,11 +154,11 @@ jobs:
             lilo: gen3_7.bin
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabi qemu-user-static debootstrap
       - name: Build nkbin-maker
@@ -203,11 +200,11 @@ jobs:
           - model: h1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabihf libssl-dev lzop qemu-user-static debootstrap
       - name: Configure for U-Boot
@@ -237,7 +234,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [create_release]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Make /opt writable
@@ -248,7 +245,7 @@ jobs:
           unzip -q cegcc.zip
           cp -r cegcc /opt/
       - name: Workaround for apt update failure
-        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install kpartx build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabi qemu-user-static debootstrap
       - name: Configure for Linux
@@ -280,11 +277,11 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [create_release]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install kpartx build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabihf libssl-dev lzop qemu-user-static debootstrap
       - name: Upgrade pip and setuptools

.gitmodules

@@ -13,6 +13,3 @@
 [submodule "brainlilo"]
 	path = brainlilo
 	url = https://github.com/brain-hackers/brainlilo.git
-[submodule "buildroot"]
-	path = buildroot
-	url = https://github.com/brain-hackers/buildroot.git

Makefile

@@ -135,6 +135,7 @@ lilobuild:
 liloclean:
 	make -C ./brainlilo clean
 
+
 brainux:
 	@if [ "$(shell uname)" != "Linux" ]; then \
 		echo "Debootstrap is only available in Linux!"; \
@@ -149,26 +150,15 @@ brainux:
 	fi
 	sudo cp /usr/bin/qemu-arm-static brainux/usr/bin/
 	sudo cp ./os-brainux/setup_brainux.sh brainux/
-	sudo ./os-brainux/override-pre.sh ./os-brainux/override ./brainux
 	sudo -E chroot brainux /setup_brainux.sh
 	sudo rm brainux/setup_brainux.sh
 	sudo ./os-brainux/override.sh ./os-brainux/override ./brainux
 
-buildroot_rootfs:
-	make -C buildroot brain_imx28_defconfig
-	make -C buildroot -j 12
-	sudo mkdir -p buildroot_rootfs
-	sudo tar -C ./buildroot_rootfs -xf buildroot/output/images/rootfs.tar
-
 image/sd.img: clean_work
-	./image/build_image.sh brainux sd.img 3072
+	./image/build_image.sh
 
 image/sd_x1.img: clean_work
-	./image/build_image_x1.sh brainux sd_x1.img 3072
-
-image/sd_buildroot.img: clean_work
-	./image/build_image.sh buildroot_rootfs sd_buildroot.img 128
-
+	./image/build_image_x1.sh
 
 .PHONY:
 clean_work:

README.md

@@ -94,8 +94,8 @@ Build Linux
 1. Confirm that `linux-brain/arch/arm/boot/zImage` exists.
 
 
-Build a Debian rootfs
----------------------
+Bootstrap Debian 11 (bullseye)
+------------------------------
 
 1. Run `make ldefconfig lbuild`.
 
@@ -107,23 +107,9 @@ Build a Debian rootfs
 
 1. Confirm that `image/sd.img` is built and burn it to an SD card.
 
-
-Build a Buildroot rootfs
-------------------------
-
-Buildroot rootfs aims to be the most lightweight rootfs for experimental use. `make buildroot_rootfs` runs the defconfig target for rootfs-only build and then builds the rootfs tarball and a CPIO archive for initramfs. `make image/sd_buildroot.img` makes a bootable SD image in `image` directory like the typical Brainux SD image.
-
-If you want to customize the build of Buildroot, `cd` into `buildroot` and use the following targets:
-
- - `make menuconfig` to change the configuration
- - `make` to build the rootfs (`-j` option might give you extra speed)
-
-`image/sd_buildroot.img` target expects presence of the tarball at `buildroot/output/images/rootfs.tar`. You'll have to `clean` and rebuild every time you change the Buildroot's config before making the SD image.
-
-
 Known issues
 ----------------------------------------
-If you use GCC 10 for the host compiler, `make ubuild` may fail.
+If you using gcc 10 for host compiler, `make ubuild` may fail.  
 To complete build, open `/u-boot-brain/scripts/dtc/dtc-lexer.lex.c` or `/u-boot-brain/scripts/dtc/dtc-parser.tab.c` then comment out `YYLTYPE yylloc;`
 
 Watch changes in submodules & auto-build

image/build_image.sh

@@ -5,16 +5,13 @@ JOBS=$(nproc)
 REPO=$(git rev-parse --show-toplevel)
 WORK=${REPO}/image/work
 LINUX=${REPO}/linux-brain
-ROOTFS=$1
-IMG_NAME=$2
-IMG=${REPO}/image/${IMG_NAME}
-SIZE_M=$3
+IMG=${REPO}/image/sd.img
 export CROSS_COMPILE=arm-linux-gnueabi-
 
 mkdir -p ${WORK}
 mkdir -p ${WORK}/lilobin
 
-for i in "a7200" "a7400" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
+for i in "a7200" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
     NUM=$(echo $i | sed -E 's/sh//g')
 
     make -C ${REPO}/u-boot-brain distclean pw${i}_defconfig
@@ -25,8 +22,6 @@ for i in "a7200" "a7400" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
         "a7200")
             mv ${REPO}/nk.bin ${WORK}/edna3exe.bin
             mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen2.bin;;
-        "a7400")
-            mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen2_7400.bin;;
         "sh1" | "sh2" | "sh3")
             mv ${REPO}/nk.bin ${WORK}/edsa${NUM}exe.bin
             mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen3_${NUM}.bin;;
@@ -39,7 +34,7 @@ for i in "a7200" "a7400" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
     esac
 done
 
-dd if=/dev/zero of=${IMG} bs=1M count=${SIZE_M}
+dd if=/dev/zero of=${IMG} bs=1M count=3072
 
 START1=2048
 SECTORS1=$((1024 * 1024 * 64 / 512))
@@ -54,7 +49,7 @@ sfdisk ${IMG} < ${WORK}/part.sfdisk
 
 sudo kpartx -av ${IMG}
 
-LOOPDEV=$(losetup -l | grep ${IMG_NAME} | grep -o 'loop.' | tail -n 1)
+LOOPDEV=$(losetup -l | grep sd.img | grep -o 'loop.' | tail -n 1)
 
 sudo mkfs.fat -n boot -F32 -v -I /dev/mapper/${LOOPDEV}p1
 sudo mkfs.ext4 -L rootfs /dev/mapper/${LOOPDEV}p2
@@ -76,13 +71,13 @@ sudo touch "${LILO}/index.din"
 sudo touch "${LILO}/AppMain.cfg"
 sudo cp ${REPO}/brainlilo/*.dll "${LILO}/"
 sudo cp ${REPO}/brainlilo/BrainLILO.exe "${LILO}/AppMain_.exe"
-gzip -cd ${REPO}/image/exeopener.exe.gz > ${REPO}/image/exeopener.exe
+gzip -d ${REPO}/image/exeopener.exe.gz
 sudo cp ${REPO}/image/exeopener.exe "${LILO}/AppMain.exe"
 
 sudo mkdir -p ${WORK}/p1/loader
 sudo cp ${WORK}/lilobin/*.bin ${WORK}/p1/loader/
 
-sudo cp -ra ${REPO}/${ROOTFS}/* ${WORK}/p2/
+sudo cp -ra ${REPO}/brainux/* ${WORK}/p2/
 
 sudo umount ${WORK}/p1 ${WORK}/p2
 sudo kpartx -d ${IMG}

os-brainux/override-pre.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -uex -o pipefail
-
-SRC=$1
-DST=$2
-
-install -g root -o root -m 0644 $SRC/lib/systemd/system/boot.mount $DST/lib/systemd/system/boot.mount
-install -g root -o root -m 0644 $SRC/lib/systemd/system/rndis_gadget.service $DST/lib/systemd/system/rndis_gadget.service
-install -g root -o root -m 0755 $SRC/usr/bin/enable_rndis_gadget $DST/usr/bin/enable_rndis_gadget

os-brainux/override.sh

@@ -11,6 +11,8 @@ install -g root -o root -m 0440 $SRC/etc/sudoers $DST/etc/sudoers
 install -g root -o root -m 0644 $SRC/etc/X11/xorg.conf $DST/etc/X11/xorg.conf
 install -g root -o root -m 0644 $SRC/etc/X11/Xsession.d/96calibrate $DST/etc/X11/Xsession.d/96calibrate
 
+install -g root -o root -m 0644 $SRC/etc/systemd/logind.conf $DST/etc/systemd/logind.conf
+
 install -g root -o root -m 0644 -D $SRC/etc/xdg/weston/weston.ini $DST/etc/xdg/weston/weston.ini
 
 install -g 1000 -o 1000 -m 0644 $SRC/home/user/.xprofile $DST/home/user/.xprofile

os-brainux/override/etc/systemd/logind.conf

@@ -0,0 +1,41 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See logind.conf(5) for details.
+
+[Login]
+#NAutoVTs=6
+#ReserveVT=6
+#KillUserProcesses=no
+#KillOnlyUsers=
+#KillExcludeUsers=root
+#InhibitDelayMaxSec=5
+#UserStopDelaySec=10
+HandlePowerKey=suspend
+#HandleSuspendKey=suspend
+#HandleHibernateKey=hibernate
+#HandleLidSwitch=suspend
+#HandleLidSwitchExternalPower=suspend
+#HandleLidSwitchDocked=ignore
+#HandleRebootKey=reboot
+#PowerKeyIgnoreInhibited=no
+#SuspendKeyIgnoreInhibited=no
+#HibernateKeyIgnoreInhibited=no
+#LidSwitchIgnoreInhibited=yes
+#RebootKeyIgnoreInhibited=no
+#HoldoffTimeoutSec=30s
+#IdleAction=ignore
+#IdleActionSec=30min
+#RuntimeDirectorySize=10%
+#RuntimeDirectoryInodes=400k
+#RemoveIPC=yes
+#InhibitorsMax=8192
+#SessionsMax=8192

os-brainux/override/lib/systemd/system/boot.mount

@@ -1,10 +0,0 @@
-[Unit]
-Description=Mount boot partition
-
-[Mount]
-What=/dev/mmcblk1p1
-Where=/boot
-Options=ro
-
-[Install]
-WantedBy=multi-user.target

os-brainux/override/lib/systemd/system/rndis_gadget.service

@@ -1,9 +0,0 @@
-[Unit]
-Description=Enable RNDIS USB Gadget
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/enable_rndis_gadget
-
-[Install]
-WantedBy=multi-user.target

os-brainux/override/usr/bin/enable_rndis_gadget

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-g=/sys/kernel/config/usb_gadget/eth
-
-mkdir ${g}
-
-echo "0x3066" > ${g}/bcdDevice
-echo "1" > ${g}/os_desc/use
-echo "0xcd" > ${g}/os_desc/b_vendor_code
-echo "MSFT100" > ${g}/os_desc/qw_sign
-
-mkdir ${g}/functions/rndis.rn0
-echo "RNDIS" > ${g}/functions/rndis.rn0/os_desc/interface.rndis/compatible_id
-echo "5162001" > ${g}/functions/rndis.rn0/os_desc/interface.rndis/sub_compatible_id
-echo "8a:15:8b:44:3a:02" > ${g}/functions/rndis.rn0/dev_addr
-echo "8a:15:8b:44:3a:01" > ${g}/functions/rndis.rn0/host_addr
-
-mkdir ${g}/configs/c.1
-ln -s ${g}/functions/rndis.rn0 ${g}/configs/c.1/
-
-echo "ci_hdrc.0" > ${g}/UDC
-
-sleep 1
-ifconfig usb0 up
-dhclient

os-brainux/setup_brainux.sh

@@ -80,8 +80,9 @@ apt update -y
 DEBIAN_FRONTEND=noninteractive \
     apt install -y dialog sudo \
                    libjpeg-dev libfreetype6 libfreetype6-dev zlib1g-dev \
-                   xserver-xorg xserver-xorg-video-fbdev xserver-xorg-dev xserver-xorg-input-evdev xinput-calibrator xorg-dev x11-apps x11-ico-dvd xinit \
+                   xserver-xorg xserver-xorg-video-fbdev xserver-xorg-dev xserver-xorg-input-evdev xinput-calibrator xorg-dev x11-apps xinit \
                    jwm \
+                   weston xwayland \
                    bash tmux vim htop \
                    midori pcmanfm lxterminal xterm gnome-terminal fbterm uim-fep uim-anthy fonts-noto-cjk \
                    dbus udev alsa-utils usbutils iw fake-hwclock systemd-timesyncd\
@@ -135,12 +136,6 @@ ttymxc0
 ttyLP0
 EOF
 
-# Enable /boot mount
-systemctl enable boot.mount
-
-# Enable RNDIS gadget
-systemctl enable rndis_gadget
-
 # Get wild
 cat <<EOF > /etc/apt/sources.list
 deb http://deb.debian.org/debian bullseye main contrib non-free

os-buildroot/override/root/blink.sh

@@ -1,112 +0,0 @@
-#!/bin/sh
-set -u
-
-VERBOSE=0
-PIN=""
-SLEEP=1
-GPIOS=""
-
-while getopts "hvr:p:s:" OPT; do
-    case "$OPT" in
-    h)
-        echo "Usage:   blink.sh [-hv] [-r PIN_RANGE_FROM-PIN_RANGE_TO] [-p PIN] [-s SLEEP_SEC]"
-        echo "Example: blink.sh -r 0-10 -p 12"
-        echo "         (blink from GPIO 0 to 10 and 12)"
-        exit 0
-        ;;
-    v)
-        VERBOSE=1
-        ;;
-    r)
-        RE='^([0-9]+)-([0-9]+)$'
-        if echo $OPTARG | grep -qvE $RE; then
-            echo "Error: invalid range: $OPTARG"
-            exit 1
-        fi
-        FROM=$(echo $OPTARG | sed -E "s/$RE/\\1/")
-        TO=$(echo $OPTARG | sed -E "s/$RE/\\2/")
-        GPIOS="$GPIOS$(seq -s " " $FROM $TO) "
-        ;;
-    p)
-        if echo $OPTARG | grep -qvE "^[0-9]+$"; then
-            echo "Error: invalid pin number: $OPTARG"
-            exit 1
-        fi
-        GPIOS="$GPIOS$OPTARG "
-        ;;
-    s)
-        if echo $OPTARG | grep -qvE "^[0-9]+$"; then
-            echo "Error: invalid sleep duration: $OPTARG"
-            exit 1
-        fi
-        SLEEP=$OPTARG
-        ;;
-    esac
-done
-
-if [ $VERBOSE -eq 1 ]; then
-    echo "Pins to iterate over: $GPIOS"
-fi
-
-if [ "$(id -u)" -ne "0" ]; then
-    echo "Error: please run as root"
-    exit 1
-fi
-
-AVAILABLE_GPIOS=""
-
-export_gpio() {
-    echo $1 > /sys/class/gpio/export
-}
-
-set_direction() {
-    echo out > /sys/class/gpio/gpio$1/direction
-}
-
-set_value() {
-    echo $2 > /sys/class/gpio/gpio$1/value
-}
-
-for i in $GPIOS; do
-    if [ ! -e "/sys/class/gpio/gpio$i" ]; then
-        export_gpio $i 2>/dev/null
-        if [ $? -ne 0 ]; then
-            echo "Error: failed to export the pin $i"
-            continue
-        fi
-    fi
-
-    set_direction $i 2>/dev/null
-    if [ $? -ne 0 ]; then
-        # Ignore the failure if the actual direction is out
-        if grep -vq "out" /dsys/class/gpio/gpio$i/direction; then
-            echo "Error: failed to set the direction of the pin $i to out"
-            continue
-        fi
-    fi
-
-    AVAILABLE_GPIOS="$AVAILABLE_GPIOS$i "
-done
-
-echo "Available GPIOs: $AVAILABLE_GPIOS"
-
-while [ 1 ]; do
-    for i in $AVAILABLE_GPIOS; do
-        set_value $i 1 2>/dev/null
-        if [ $? -ne 0 ]; then
-            echo "Warning: failed to set the value of the pin $i to high"
-        fi
-    done
-
-    sleep $SLEEP
-
-    for i in $AVAILABLE_GPIOS; do
-        set_value $i 0 2>/dev/null
-        if [ $? -ne 0 ]; then
-            echo "Warning: failed to set the value of the pin $i to low"
-        fi
-    done
-
-    sleep $SLEEP
-done
-