mirror of
https://github.com/brain-hackers/buildbrain
synced 2024-12-22 12:10:12 +09:00
Merge pull request #32 from brain-hackers/ci-build20220125
Fix CI build
This commit is contained in:
commit
b90386fbd2
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@ -266,8 +266,14 @@ 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-x1
|
||||
run: make udefconfig-h1
|
||||
- name: Build U-Boot
|
||||
run: make ubuild
|
||||
- name: Configure for Linux
|
||||
|
@ -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}
|
||||
|
||||
|
@ -5,7 +5,8 @@ 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}
|
||||
|
||||
@ -24,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
|
||||
@ -38,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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit b70f81f47b904dca56677cd6cf0b215d3dcd06ff
|
||||
Subproject commit 0449ff1430e6d3eb3d0086aaab1e7a74078f8085
|
Loading…
Reference in New Issue
Block a user