From 9d65cf08ddb89655010aaa5a7b01675d7b7f0aed Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sun, 4 Feb 2024 10:45:15 +0900 Subject: [PATCH 1/4] Update linux-brain, u-boot-brain, and brainlilo --- brainlilo | 2 +- linux-brain | 2 +- u-boot-brain | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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/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 From 086c5b08f57b654b351b377182ecde055f38c150 Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sun, 4 Feb 2024 10:52:45 +0900 Subject: [PATCH 2/4] Add x11-ico-dvd, remove weston and xwayland --- os-brainux/setup_brainux.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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\ From 24e5428c62d485cf003932c8668ec2e8dfaf76e9 Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sun, 4 Feb 2024 11:18:54 +0900 Subject: [PATCH 3/4] Build U-Boot specially made for PW-A7400 --- .github/workflows/build.yml | 3 +++ image/build_image.sh | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9707b0a..470486e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 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;; From 4257f2465a89eb17fdbafdfadcdb0168ca3167bd Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sun, 4 Feb 2024 11:33:27 +0900 Subject: [PATCH 4/4] Workaround workaround --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 470486e..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 @@ -161,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 @@ -207,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 @@ -248,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 @@ -284,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