From d30ec39b6bb3b59cb152c81130d7e1d23f86552f Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sat, 19 Feb 2022 01:05:54 +0900 Subject: [PATCH 1/8] Fix defconfig target --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d1a71d..92bd63e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -267,7 +267,7 @@ jobs: - 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: Configure for U-Boot - run: make udefconfig-x1 + run: make udefconfig-h1 - name: Build U-Boot run: make ubuild - name: Configure for Linux From c3a5dbfe2271dc44b0872cb624dee259b6775b0c Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sat, 19 Feb 2022 01:30:48 +0900 Subject: [PATCH 2/8] Update u-boot-brain --- u-boot-brain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/u-boot-brain b/u-boot-brain index b70f81f..0449ff1 160000 --- a/u-boot-brain +++ b/u-boot-brain @@ -1 +1 @@ -Subproject commit b70f81f47b904dca56677cd6cf0b215d3dcd06ff +Subproject commit 0449ff1430e6d3eb3d0086aaab1e7a74078f8085 From b9b99be34a748fa0f8e9929d5d4bf0d47d6452f6 Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sat, 19 Feb 2022 02:20:01 +0900 Subject: [PATCH 3/8] Specify CROSS_COMPILE --- image/build_image.sh | 1 + image/build_image_x1.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/image/build_image.sh b/image/build_image.sh index 73aaf85..6de8584 100755 --- a/image/build_image.sh +++ b/image/build_image.sh @@ -6,6 +6,7 @@ REPO=$(git rev-parse --show-toplevel) WORK=${REPO}/image/work LINUX=${REPO}/linux-brain IMG=${REPO}/image/sd.img +export CROSS_COMPILE=arm-linux-gnueabi- mkdir -p ${WORK} diff --git a/image/build_image_x1.sh b/image/build_image_x1.sh index 8afadb2..a6f8e85 100755 --- a/image/build_image_x1.sh +++ b/image/build_image_x1.sh @@ -6,6 +6,7 @@ REPO=$(git rev-parse --show-toplevel) WORK=${REPO}/image/work LINUX=${REPO}/linux-brain IMG=${REPO}/image/sd.img +export CROSS_COMPILE=arm-linux-gnueabihf- mkdir -p ${WORK} From 45990eac88bf113a6adfea2b9409cb9ee3f0d434 Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sat, 19 Feb 2022 02:20:38 +0900 Subject: [PATCH 4/8] Make directory with su privilage --- image/build_image_x1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/build_image_x1.sh b/image/build_image_x1.sh index a6f8e85..26aa965 100755 --- a/image/build_image_x1.sh +++ b/image/build_image_x1.sh @@ -39,7 +39,7 @@ sudo cp ${LINUX}/arch/arm/boot/dts/imx7ulp-pwh*.dtb ${WORK}/p1/ sudo cp ${REPO}/u-boot-brain/u-boot.bin ${WORK}/p1/ -mkdir -p ${WORK}/p1/App/boot4u +sudo mkdir -p ${WORK}/p1/App/boot4u sudo cp ${REPO}/boot4u/AppMain.bin ${WORK}/p1/App/boot4u/ sudo touch ${WORK}/p1/App/boot4u/index.din From ffb35900602a615dbfcdf70900c434f4b649af26 Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sat, 19 Feb 2022 03:26:55 +0900 Subject: [PATCH 5/8] Build boot4u --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92bd63e..3eafca3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -266,6 +266,12 @@ jobs: 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 + run: pip3 install -U pip setuptools + - name: Install pyelftools + run: pip3 install pyelftools + - name: Build Boot4u + run: make boot4ubuild - name: Configure for U-Boot run: make udefconfig-h1 - name: Build U-Boot From 8bc1c15958b6bfb4e6a3f27cb19b8e4fc2189dec Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sat, 19 Feb 2022 04:05:33 +0900 Subject: [PATCH 6/8] Fix image name --- image/build_image_x1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image/build_image_x1.sh b/image/build_image_x1.sh index 26aa965..2238d73 100755 --- a/image/build_image_x1.sh +++ b/image/build_image_x1.sh @@ -5,7 +5,7 @@ JOBS=$(nproc) REPO=$(git rev-parse --show-toplevel) WORK=${REPO}/image/work LINUX=${REPO}/linux-brain -IMG=${REPO}/image/sd.img +IMG=${REPO}/image/sd_x1.img export CROSS_COMPILE=arm-linux-gnueabihf- mkdir -p ${WORK} @@ -25,7 +25,7 @@ sfdisk ${IMG} < ${WORK}/part.sfdisk sudo kpartx -av ${IMG} -LOOPDEV=$(losetup -l | grep sd.img | grep -o 'loop.') +LOOPDEV=$(losetup -l | grep sd_x1.img | grep -o 'loop.') sudo mkfs.fat -F32 -v -I /dev/mapper/${LOOPDEV}p1 sudo mkfs.ext4 /dev/mapper/${LOOPDEV}p2 From 6bc1d4401634cd0db17e55ce0f6cfb645cd3cc5f Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sun, 27 Feb 2022 22:49:06 +0900 Subject: [PATCH 7/8] Create parent directories with the correct permission --- os-brainux/override.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/os-brainux/override.sh b/os-brainux/override.sh index 966e62d..89cd76b 100755 --- a/os-brainux/override.sh +++ b/os-brainux/override.sh @@ -15,7 +15,9 @@ install -g root -o root -m 0644 $SRC/etc/X11/Xsession.d/96calibrate $DST/etc/X11 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 -D $SRC/home/user/.xprofile $DST/home/user/.xprofile -install -g 1000 -o 1000 -m 0644 -D $SRC/home/user/.config/fcitx/profile $DST/home/user/.config/fcitx/profile -install -g 1000 -o 1000 -m 0644 -D $SRC/home/user/lxterminal/lxterminal.conf $DST/home/user/lxterminal/lxterminal.conf +install -g 1000 -o 1000 -m 0644 $SRC/home/user/.xprofile $DST/home/user/.xprofile +sudo -u#1000 -g#1000 mkdir -p $DST/home/user/.config/fcitx +install -g 1000 -o 1000 -m 0644 $SRC/home/user/.config/fcitx/profile $DST/home/user/.config/fcitx/profile +sudo -u#1000 -g#1000 mkdir -p $DST/home/user/lxterminal +install -g 1000 -o 1000 -m 0644 $SRC/home/user/lxterminal/lxterminal.conf $DST/home/user/lxterminal/lxterminal.conf install -g root -o root -m 0644 -D $SRC/etc/jwm/system.jwmrc $DST/etc/jwm/system.jwmrc From f7e1dbeadf30a1ba92e37e9f6261418796895de3 Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Sun, 27 Feb 2022 22:49:35 +0900 Subject: [PATCH 8/8] Specify DEBIAN_FRONTEND to suppress interactive installation --- os-brainux/setup_brainux.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/os-brainux/setup_brainux.sh b/os-brainux/setup_brainux.sh index 019415b..f55d663 100755 --- a/os-brainux/setup_brainux.sh +++ b/os-brainux/setup_brainux.sh @@ -34,7 +34,8 @@ APT::Install-Suggests "0"; EOF apt update -y -apt install -y locales +DEBIAN_FRONTEND=noninteractive \ + apt install -y locales echo "$TIMEZONE" > /etc/timezone && \ dpkg-reconfigure -f noninteractive tzdata && \ @@ -68,7 +69,8 @@ DEBIAN_FRONTEND=noninteractive \ systemctl enable fake-hwclock # Ly -apt install -y libpam0g-dev libxcb-xkb-dev +DEBIAN_FRONTEND=noninteractive \ + apt install -y libpam0g-dev libxcb-xkb-dev cd / git clone --recurse-submodules https://github.com/nullgemm/ly.git cd ly