Merge pull request #50 from brain-hackers/ci-bullseye

Change the base rootfs to bullseye

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.release_name.outputs.name }}
+          tag_name: ${{ steps.release_name.outputs.name }}-tag
           release_name: ${{ steps.release_name.outputs.name }}
           body_path: CHANGES.md
           draft: false
@@ -128,7 +128,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - model: g5300
+          - model: a7200
             nk: edna3exe.bin
             lilo: gen2.bin
           - model: sh1

.gitmodules

@@ -3,13 +3,13 @@
 	url = https://github.com/brain-hackers/u-boot-brain.git
 [submodule "linux-brain"]
 	path = linux-brain
-	url = https://github.com/brain-hackers/linux-brain
+	url = https://github.com/brain-hackers/linux-brain.git
 [submodule "nkbin_maker"]
 	path = nkbin_maker
 	url = https://github.com/brain-hackers/nkbin_maker.git
 [submodule "boot4u"]
 	path = boot4u
-	url = https://github.com/brain-hackers/boot4u
+	url = https://github.com/brain-hackers/boot4u.git
 [submodule "brainlilo"]
 	path = brainlilo
-	url = git@github.com:brain-hackers/brainlilo.git
+	url = https://github.com/brain-hackers/brainlilo.git

Makefile

@@ -144,9 +144,9 @@ brainux:
 	sudo mkdir -p brainux
 	@if [ "$(CI)" = "true" ]; then \
 		echo "I'm in CI and debootstrap without cache."; \
-		sudo debootstrap --arch=$(ROOTFS_CROSS) --foreign buster brainux/; \
+		sudo debootstrap --arch=$(ROOTFS_CROSS) --foreign bullseye brainux/; \
 	else \
-		sudo debootstrap --arch=$(ROOTFS_CROSS) --foreign buster brainux/ http://localhost:65432/debian/; \
+		sudo debootstrap --arch=$(ROOTFS_CROSS) --foreign bullseye brainux/ http://localhost:65432/debian/; \
 	fi
 	sudo cp /usr/bin/qemu-arm-static brainux/usr/bin/
 	sudo cp ./os-brainux/setup_brainux.sh brainux/

image/LICENSE

@@ -0,0 +1,23 @@
+*** exeopener ***
+
+MIT License
+
+Copyright (c) 2022 Chiharu Shirasaka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

image/build_image.sh

@@ -11,7 +11,7 @@ export CROSS_COMPILE=arm-linux-gnueabi-
 mkdir -p ${WORK}
 mkdir -p ${WORK}/lilobin
 
-for i in "g5300" "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
@@ -19,7 +19,7 @@ for i in "g5300" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
     ${REPO}/nkbin_maker/bsd-ce ${REPO}/u-boot-brain/u-boot.bin
 
     case $i in
-        "g5300")
+        "a7200")
             mv ${REPO}/nk.bin ${WORK}/edna3exe.bin
             mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen2.bin;;
         "sh1" | "sh2" | "sh3")
@@ -51,8 +51,8 @@ sudo kpartx -av ${IMG}
 
 LOOPDEV=$(losetup -l | grep sd.img | grep -o 'loop.' | tail -n 1)
 
-sudo mkfs.fat -F32 -v -I /dev/mapper/${LOOPDEV}p1
+sudo mkfs.fat -n boot -F32 -v -I /dev/mapper/${LOOPDEV}p1
-sudo mkfs.ext4 /dev/mapper/${LOOPDEV}p2
+sudo mkfs.ext4 -L rootfs /dev/mapper/${LOOPDEV}p2
 
 mkdir -p ${WORK}/p1 ${WORK}/p2
 sudo mount -o utf8=true /dev/mapper/${LOOPDEV}p1 ${WORK}/p1
@@ -60,7 +60,8 @@ sudo mount /dev/mapper/${LOOPDEV}p2 ${WORK}/p2
 
 sudo cp ${LINUX}/arch/arm/boot/zImage ${WORK}/p1/
 sudo cp ${LINUX}/arch/arm/boot/dts/imx28-pw*.dtb ${WORK}/p1/
-sudo cp ${WORK}/*.bin ${WORK}/p1/
+sudo mkdir -p ${WORK}/p1/nk
+sudo cp ${WORK}/*.bin ${WORK}/p1/nk/
 
 make -C ${REPO}/brainlilo
 
@@ -69,7 +70,9 @@ sudo mkdir -p "${LILO}"
 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"
+sudo cp ${REPO}/brainlilo/BrainLILO.exe "${LILO}/AppMain_.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/

os-brainux/override.sh

@@ -5,10 +5,8 @@ set -uex -o pipefail
 SRC=$1
 DST=$2
 
-install -g root -o root -m 0644 $SRC/usr/lib/os-release $DST/usr/lib/os-release
-install -g root -o root -m 0644 $SRC/etc/issue $DST/etc/issue
-install -g root -o root -m 0644 $SRC/etc/issue.net $DST/etc/issue.net
 install -g root -o root -m 0644 $SRC/etc/motd $DST/etc/motd
+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

os-brainux/override/etc/issue

@@ -1,2 +0,0 @@
-Brainux GNU/Linux 10 \n \l
-

os-brainux/override/etc/issue.net

@@ -1 +0,0 @@
-Brainux GNU/Linux 10

os-brainux/override/etc/sudoers

@@ -0,0 +1,27 @@
+#
+# This file MUST be edited with the 'visudo' command as root.
+#
+# Please consider adding local content in /etc/sudoers.d/ instead of
+# directly modifying this file.
+#
+# See the man page for details on how to write a sudoers file.
+#
+Defaults	env_reset,pwfeedback
+Defaults	mail_badpass
+Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+# Host alias specification
+
+# User alias specification
+
+# Cmnd alias specification
+
+# User privilege specification
+root	ALL=(ALL:ALL) ALL
+
+# Allow members of group sudo to execute any command
+%sudo	ALL=(ALL:ALL) ALL
+
+# See sudoers(5) for more information on "@include" directives:
+
+@includedir /etc/sudoers.d

os-brainux/override/usr/lib/os-release

@@ -1,9 +0,0 @@
-PRETTY_NAME="Brainux GNU/Linux 11 (bullseye)"
-NAME="Brainux GNU/Linux"
-VERSION_ID="11"
-VERSION="11 (bullseye)"
-VERSION_CODENAME=bullseye
-ID=debian
-HOME_URL="https://github.com/brain-hackers/README"
-SUPPORT_URL="https://github.com/brain-hackers/buildbrain"
-BUG_REPORT_URL="https://github.com/brain-hackers/buildbrain"

os-brainux/setup_brainux.sh

@@ -33,6 +33,7 @@ APT::Install-Recommends "0";
 APT::Install-Suggests "0";
 EOF
 
+# locales: locale has to be set before going any further
 apt update -y
 DEBIAN_FRONTEND=noninteractive \
     apt install -y locales
@@ -50,6 +51,32 @@ rm /etc/localtime
 ln -s /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
 echo "brain" > /etc/hostname
+
+# Install packagecloud repository
+# Reference: https://packagecloud.io/brainhackers/brainux/install
+
+# curl, ca-certificates: downloads the GPG key from packagecloud
+# gnupg, debian-archive-keyring: packagecloud verification dependency
+DEBIAN_FRONTEND=noninteractive \
+    apt install -y curl ca-certificates gnupg debian-archive-keyring
+
+# apt-transport-https can be installed after debian-archive-keyring being installed
+DEBIAN_FRONTEND=noninteractive \
+    apt install -y apt-transport-https
+
+# Install GPG key and packagecloud repository config
+mkdir -p /etc/apt/keyrings
+curl -fsSL "https://packagecloud.io/brainhackers/brainux/gpgkey" \
+    | gpg --dearmor > /etc/apt/keyrings/brainhackers_brainux-archive-keyring.gpg
+
+cat <<EOF > /etc/apt/sources.list.d/packagecloud.list
+deb [signed-by=/etc/apt/keyrings/brainhackers_brainux-archive-keyring.gpg] https://packagecloud.io/brainhackers/brainux/any/ any main
+deb-src [signed-by=/etc/apt/keyrings/brainhackers_brainux-archive-keyring.gpg] https://packagecloud.io/brainhackers/brainux/any/ any main
+EOF
+
+# Fetch packagecloud repository
+apt update -y
+
 DEBIAN_FRONTEND=noninteractive \
     apt install -y dialog sudo \
                    libjpeg-dev libfreetype6 libfreetype6-dev zlib1g-dev \
@@ -58,13 +85,15 @@ DEBIAN_FRONTEND=noninteractive \
                    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\
+                   dbus udev alsa-utils usbutils iw fake-hwclock systemd-timesyncd\
                    build-essential flex bison pkg-config autotools-dev libtool autoconf automake device-tree-compiler \
                    python3 python3-dev python3-setuptools python3-wheel python3-pip python3-smbus \
-                   resolvconf net-tools ssh openssh-client avahi-daemon curl wget git
+                   resolvconf net-tools ssh openssh-client avahi-daemon wget git \
+                   network-manager zip neofetch sl python3-numpy ipython3 netsurf-gtk fcitx-anthy
 
+# Packages from packagecloud
 DEBIAN_FRONTEND=noninteractive \
-    apt install -y --install-recommends fcitx-anthy
+    apt install -y --install-recommends brain-config
 
 systemctl enable fake-hwclock
 
@@ -76,6 +105,7 @@ git clone --recurse-submodules https://github.com/nullgemm/ly.git
 cd ly
 make
 make install
+make installsystemd
 cd /
 rm -r ly
 systemctl enable ly