Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

travis-ci: build with arm64 #489

Merged
merged 8 commits into from
Nov 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
os: linux
dist: bionic
dist: focal
arch: arm64-graviton2
virt: lxd
group: edge
language: c
compiler:
- gcc
branches:
only:
- master
- "/^v.*$/"
addons:
apt:
packages:
Expand All @@ -17,11 +16,15 @@ addons:
- texinfo
- python-docutils
- autopoint
- shellcheck
- cpio
- libltdl-dev
- gettext
before_script:
- "./trunk/tools/shellcheck.sh"
- mkdir -p /opt/rt-n56u/toolchain-mipsel/toolchain-3.4.x && mkdir -p /opt/images/
- rm -rf toolchain-mipsel/ && mv -f * .[^.]* /opt/rt-n56u
- curl -LO $toolchain_url && tar -xf mipsel-linux-uclibc.tar.xz -C /opt/rt-n56u/toolchain-mipsel/toolchain-3.4.x
- curl -LO $toolchain_url && tar -xf $toolchain_pkg -C /opt/rt-n56u/toolchain-mipsel/toolchain-3.4.x
- ls -Alh /opt/rt-n56u && cd /opt/rt-n56u/trunk/
script:
- for m in $targets; do fakeroot ./build_firmware_ci $m;
Expand All @@ -39,7 +42,8 @@ env:
- build_variant=mt7620 targets="PSG1208 PSG1218 NEWIFI-MINI MI-MINI MI-3 OYE-001"
- build_variant=mt7621-usb targets="JCG-836PRO-5.0 JCG-AC860M-5.0 DIR-882-5.0 A3004NS MSG1500 WR1200JS MI-R3G NEWIFI3 B70"
global:
- toolchain_url="https://github.com/hanwckf/padavan-toolchain/releases/download/v1.1/mipsel-linux-uclibc.tar.xz"
- toolchain_pkg="aarch64_mipsel-linux-uclibc.tar.xz"
- toolchain_url="https://github.com/hanwckf/padavan-toolchain/releases/download/v1.1/$toolchain_pkg"
git:
depth: 3
deploy:
Expand Down
2 changes: 1 addition & 1 deletion trunk/tools/mksquashfs_xz/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ configure_xz:
)

build_xz:
make -j$(HOST_NCPU) -C $(SRC_NAME2)
make -C $(SRC_NAME2)

build_squashfs:
make -j$(HOST_NCPU) -C $(SRC_NAME1) XZUTILSDIR=$(shell pwd)/$(SRC_NAME2) ; \
Expand Down
6 changes: 3 additions & 3 deletions trunk/user/e2fsprogs/e2fsprogs-orig.patch
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ diff -urw e2fsprogs-1.44.4-ref/misc/mke2fs.conf.in e2fsprogs-1.44.4/misc/mke2fs.
inode_size = 256
}
small = {
--- a/Makefile.in.orig 2019-09-22 21:21:24.804332199 +0800
--- a/Makefile.in 2019-09-22 21:21:24.804332199 +0800
+++ b/Makefile.in 2019-09-22 21:21:30.724232438 +0800
@@ -19,7 +19,7 @@ INSTALL = @INSTALL@
@ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs
Expand All @@ -136,7 +136,7 @@ diff -urw e2fsprogs-1.44.4-ref/misc/mke2fs.conf.in e2fsprogs-1.44.4/misc/mke2fs.

PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
$(E2SCRUB_DIR)
--- e2fsprogs-1.45.3/configure.ac.orig 2019-09-22 21:24:14.103710000 +0800
--- e2fsprogs-1.45.3-ref/configure.ac 2019-09-22 21:24:14.103710000 +0800
+++ e2fsprogs-1.45.3/configure.ac 2019-09-22 21:24:42.528758384 +0800
@@ -873,7 +873,7 @@ AC_SUBST(GETTEXT_PACKAGE)
AC_SUBST(PACKAGE)
Expand All @@ -147,4 +147,4 @@ diff -urw e2fsprogs-1.44.4-ref/misc/mke2fs.conf.in e2fsprogs-1.44.4/misc/mke2fs.
dnl
dnl End of configuration options
dnl


Loading