diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9707b0a..8bbe60f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: with: submodules: true - name: Workaround for apt update failure - run: sudo rm /etc/apt/sources.list.d/github_git-lfs.* + run: sudo rm -f /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 @@ -95,7 +95,7 @@ jobs: with: submodules: true - name: Workaround for apt update failure - run: sudo rm /etc/apt/sources.list.d/github_git-lfs.* + run: sudo rm -f /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,6 +131,9 @@ 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 @@ -158,7 +161,7 @@ jobs: with: submodules: true - name: Workaround for apt update failure - run: sudo rm /etc/apt/sources.list.d/github_git-lfs.* + run: sudo rm -f /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 @@ -204,7 +207,7 @@ jobs: with: submodules: true - name: Workaround for apt update failure - run: sudo rm /etc/apt/sources.list.d/github_git-lfs.* + run: sudo rm -f /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 @@ -245,7 +248,7 @@ jobs: unzip -q cegcc.zip cp -r cegcc /opt/ - name: Workaround for apt update failure - run: sudo rm /etc/apt/sources.list.d/github_git-lfs.* + run: sudo rm -f /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 @@ -281,7 +284,7 @@ jobs: with: submodules: true - name: Workaround for apt update failure - run: sudo rm /etc/apt/sources.list.d/github_git-lfs.* + run: sudo rm -f /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 diff --git a/brainlilo b/brainlilo index 0ef73cd..2ec8f78 160000 --- a/brainlilo +++ b/brainlilo @@ -1 +1 @@ -Subproject commit 0ef73cdeb41b6d56538fa0739210f935eb9f2768 +Subproject commit 2ec8f7827e40ec8dfe6b7f5b0200e1effaf1b855 diff --git a/image/build_image.sh b/image/build_image.sh index 9cb4f33..d06f88c 100755 --- a/image/build_image.sh +++ b/image/build_image.sh @@ -14,7 +14,7 @@ export CROSS_COMPILE=arm-linux-gnueabi- mkdir -p ${WORK} mkdir -p ${WORK}/lilobin -for i in "a7200" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do +for i in "a7200" "a7400" "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,6 +25,8 @@ for i in "a7200" "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;; diff --git a/linux-brain b/linux-brain index 60e1cb9..afbb7e0 160000 --- a/linux-brain +++ b/linux-brain @@ -1 +1 @@ -Subproject commit 60e1cb92ee16b5ecf61baccdc19c4821d6b15aee +Subproject commit afbb7e017623f0963270cbad512f1d83b83a3d5b diff --git a/os-brainux/setup_brainux.sh b/os-brainux/setup_brainux.sh index 90d7590..720001a 100755 --- a/os-brainux/setup_brainux.sh +++ b/os-brainux/setup_brainux.sh @@ -80,9 +80,8 @@ 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 xinit \ + xserver-xorg xserver-xorg-video-fbdev xserver-xorg-dev xserver-xorg-input-evdev xinput-calibrator xorg-dev x11-apps x11-ico-dvd 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\ diff --git a/u-boot-brain b/u-boot-brain index 7837498..e8fc0d0 160000 --- a/u-boot-brain +++ b/u-boot-brain @@ -1 +1 @@ -Subproject commit 783749833dcc9fd1cd318af7750c2b17be182852 +Subproject commit e8fc0d0cf39d9cd06245ef1777d1cf54258e5cb6