There is an instruction how to do this?
any git tutorial 
git checkout https://...
git checkout 5.3-rc
git merge 5.3-poweroff
git merge 5.3-hdmi
...
./build.sh importconfig
./build.sh
1 Like
I tried to do this:
git checkout 5.3-rc thatās OK
then
git merge origin/5.3-hdmi also OK
then
git merge origin/5.3-lima
Auto-merging arch/arm/configs/mt7623n_evb_fwu_defconfig CONFLICT (content): Merge conflict in arch/arm/configs/mt7623n_evb_fwu_defconfig Automatic merge failed; fix conflicts and then commit the result.
iāve touched defconfig in hdmi-branch for fbconā¦just use the defconfig from hdmi-branch
git checkout 5.3-hdmi -- arch/arm/configs/mt7623n_evb_fwu_defconfig
git add arch/arm/configs/mt7623n_evb_fwu_defconfig
git merge --continue
if itās not so easy youāll find conflict-markers ā<<<<<,=====,>>>>>ā in the file surrounding the conflicting contentā¦just delete them and the lines you donāt want and make "git add " and āgit merge --continueā
Hi Frank,
I tried to merge all 5.3 branches and build the deb image but it seems after I ran build.sh it only generates the arm64 deb package and not armhf deb package (which is required for BPI-R2 I think). These are the last lines from the build process:
cp: cannot stat 'utils/wmt/config/*': No such file or directory
cp: cannot stat 'utils/wmt/src/wmt_loader': No such file or directory
cp: cannot stat 'utils/wmt/src/wmt_loopback': No such file or directory
cp: cannot stat 'utils/wmt/src/stp_uart_launcher': No such file or directory
cp: cannot stat 'utils/wmt/firmware/*': No such file or directory
rm: cannot remove 'debian/bananapi-r2-image/boot/bananapi/bpi-r2/linux/dtb': Is a directory
dpkg-deb: building package 'bananapi-r2-image-5.3-rc' in '../debian/bananapi-r2-image-5.3-rc_5.3.0-rc2-1_arm64.deb'.
-rw-r--r-- 1 sysadmin sysadmin 34M Aug 22 08:38 debian/bananapi-r2-image-5.3-rc_5.3.0-rc2-1_arm64.deb
dpkg-deb: error: failed to read archive 'debian/bananapi-r2-image-5.3-rc_5.3.0-rc2-1_armhf.deb': No such file or directory
dpkg-deb: error: failed to read archive 'debian/bananapi-r2-image-5.3-rc_5.3.0-rc2-1_armhf.deb': No such file or directory
Do you know why is this happening ?
Thank you for reporting it,i try to make a combined build.sh for both devices so that i nees to maintain only one,seems i forgot something in deb-function.
Wmt-tools are only included in lts-branches of r2 (need to deactivate on r64) and cryptodev imho is only on 4.14
Ok thanks. Is is possible to integrate cryptodev in the 5.3 branch ? What are the required steps ? I want to test it also.
Just look how i have done it on 4.14ā¦maybe i have it also in 4.19ā¦but i donāt do it on every new kernel due too less time
@cioby23 have fixed the deb-function in 5.3-rc-branch, make sure you use this version and not the one in the feature-branches
Ok thanks,
Iāll try later today to merge the feature branches in the 5.3-rc and run the build script again.
It seems the armhf deb package is still not generated yet. I did use the latest build.sh script (no errors now - everything went fine) but still only an arm64 deb package.
WMT-Tools not available
dpkg-deb: building package 'bananapi-r2-image-' in '../debian/bananapi-r2-image-_5.3.0-rc1-1_arm64.deb'.
-rw-r--r-- 1 sysadmin sysadmin 34M Aug 23 11:43 debian/bananapi-r2-image-_5.3.0-rc1-1_arm64.deb
drwxr-xr-x root/root 0 2019-08-23 11:43 ./
drwxr-xr-x root/root 0 2019-08-23 11:43 ./boot/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./boot/bananapi/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./boot/bananapi/bpi-r2/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./boot/bananapi/bpi-r2/linux/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./boot/bananapi/bpi-r2/linux/dtb/
-rw-r--r-- root/root 38323 2019-08-23 11:43 ./boot/bananapi/bpi-r2/linux/dtb/bpi-r2-5.3.0-rc1.dtb
-rw-r--r-- root/root 8132441 2019-08-23 11:43 ./boot/bananapi/bpi-r2/linux/uImage_5.3.0-rc1
-rw-r--r-- root/root 8102576 2019-08-23 11:43 ./boot/bananapi/bpi-r2/linux/uImage_5.3.0-rc1_nodt
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/
-rw-r--r-- root/root 184916 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/aes-arm-bs.ko
-rw-r--r-- root/root 178820 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/aes-arm-ce.ko
-rw-r--r-- root/root 106476 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/aes-arm.ko
-rw-r--r-- root/root 168420 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/chacha-neon.ko
-rw-r--r-- root/root 169048 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/crc32-arm-ce.ko
-rw-r--r-- root/root 180704 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/ghash-arm-ce.ko
-rw-r--r-- root/root 166836 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/sha1-arm-ce.ko
-rw-r--r-- root/root 169632 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/sha1-arm-neon.ko
-rw-r--r-- root/root 165948 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/sha1-arm.ko
-rw-r--r-- root/root 168660 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/sha2-arm-ce.ko
-rw-r--r-- root/root 298224 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/sha256-arm.ko
-rw-r--r-- root/root 299992 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/arch/arm/crypto/sha512-arm.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/
-rw-r--r-- root/root 159260 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/arc4.ko
-rw-r--r-- root/root 272640 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/authenc.ko
-rw-r--r-- root/root 276148 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/authencesn.ko
-rw-r--r-- root/root 170316 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/chacha_generic.ko
-rw-r--r-- root/root 161820 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/crc32_generic.ko
-rw-r--r-- root/root 232756 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/cryptd.ko
-rw-r--r-- root/root 184848 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/crypto_simd.ko
-rw-r--r-- root/root 130888 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/des_generic.ko
-rw-r--r-- root/root 166408 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/echainiv.ko
-rw-r--r-- root/root 170804 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/md4.ko
-rw-r--r-- root/root 164408 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/crypto/md5.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/ata/
-rw-r--r-- root/root 235700 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/ata/ahci_mtk.ko
-rw-r--r-- root/root 259272 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/ata/libahci_platform.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/dma/
-rw-r--r-- root/root 250592 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/dma/dmatest.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/i2c/
-rw-r--r-- root/root 179232 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/i2c/i2c-dev.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/iio/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/iio/adc/
-rw-r--r-- root/root 139804 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/iio/adc/mt6577_auxadc.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/input/
-rw-r--r-- root/root 141880 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/input/evbug.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/input/keyboard/
-rw-r--r-- root/root 158672 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/input/keyboard/mtk-pmic-keys.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/md/
-rw-r--r-- root/root 401204 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/md/dm-bio-prison.ko
-rw-r--r-- root/root 621556 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/md/dm-thin-pool.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/md/persistent-data/
-rw-r--r-- root/root 1410068 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/md/persistent-data/dm-persistent-data.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/
-rw-r--r-- root/root 258344 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/dummy.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/ipvlan/
-rw-r--r-- root/root 1024372 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/ipvlan/ipvlan.ko
-rw-r--r-- root/root 446832 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/macvlan.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/ppp/
-rw-r--r-- root/root 96644 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/ppp/ppp_deflate.ko
-rw-r--r-- root/root 462248 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/ppp/ppp_generic.ko
-rw-r--r-- root/root 155768 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/ppp/ppp_mppe.ko
-rw-r--r-- root/root 368904 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/ppp/pppoe.ko
-rw-r--r-- root/root 302808 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/ppp/pppox.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/slip/
-rw-r--r-- root/root 324804 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/slip/slhc.ko
-rw-r--r-- root/root 580420 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/tun.ko
-rw-r--r-- root/root 419256 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/net/veth.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/nvmem/
-rw-r--r-- root/root 115964 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/nvmem/nvmem_mtk-efuse.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/pwm/
-rw-r--r-- root/root 132848 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/pwm/pwm-mediatek.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/rtc/
-rw-r--r-- root/root 222020 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/rtc/rtc-ds1307.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/spi/
-rw-r--r-- root/root 197876 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/spi/spi-mt65xx.ko
-rw-r--r-- root/root 206328 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/spi/spidev.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/thermal/
-rw-r--r-- root/root 145816 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/thermal/mtk_thermal.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/video/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/video/backlight/
-rw-r--r-- root/root 198072 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/video/backlight/backlight.ko
-rw-r--r-- root/root 165448 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/video/backlight/generic_bl.ko
-rw-r--r-- root/root 177940 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/drivers/video/backlight/lcd.ko
-rw-r--r-- root/root 1242424 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/extra
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/extras/
-rw-r--r-- root/root 1242424 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/extras/cryptodev.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/btrfs/
-rw-r--r-- root/root 15454752 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/btrfs/btrfs.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/cifs/
-rw-r--r-- root/root 11222508 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/cifs/cifs.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/configfs/
-rw-r--r-- root/root 747604 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/configfs/configfs.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/f2fs/
-rw-r--r-- root/root 6104700 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/f2fs/f2fs.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/fat/
-rw-r--r-- root/root 166940 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/fat/msdos.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/fuse/
-rw-r--r-- root/root 1877676 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/fuse/fuse.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/nfs/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/nfs/flexfilelayout/
-rw-r--r-- root/root 877672 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/nfs/flexfilelayout/nfs_layout_flexfiles.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/nfsd/
-rw-r--r-- root/root 7808368 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/nfsd/nfsd.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/ntfs/
-rw-r--r-- root/root 2320088 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/ntfs/ntfs.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/xfs/
-rw-r--r-- root/root 23153100 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/fs/xfs/xfs.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/kernel/
-rw-r--r-- root/root 158500 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/kernel/configs.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/lib/
-rw-r--r-- root/root 80596 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/lib/crc-ccitt.ko
-rw-r--r-- root/root 78940 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/lib/crc-itu-t.ko
-rw-r--r-- root/root 102888 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/lib/xxhash.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/lib/zstd/
-rw-r--r-- root/root 1059096 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/lib/zstd/zstd_compress.ko
-rw-r--r-- root/root 378936 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/lib/zstd/zstd_decompress.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bluetooth/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bluetooth/bnep/
-rw-r--r-- root/root 897536 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bluetooth/bnep/bnep.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bluetooth/hidp/
-rw-r--r-- root/root 688348 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bluetooth/hidp/hidp.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bluetooth/rfcomm/
-rw-r--r-- root/root 1146444 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bluetooth/rfcomm/rfcomm.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bridge/
-rw-r--r-- root/root 727344 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/bridge/br_netfilter.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/
-rw-r--r-- root/root 360852 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/ipip.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/
-rw-r--r-- root/root 386272 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/ip_tables.ko
-rw-r--r-- root/root 314324 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/ipt_REJECT.ko
-rw-r--r-- root/root 333464 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/ipt_SYNPROXY.ko
-rw-r--r-- root/root 314928 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/iptable_filter.ko
-rw-r--r-- root/root 314024 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/iptable_mangle.ko
-rw-r--r-- root/root 327536 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/iptable_nat.ko
-rw-r--r-- root/root 332064 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko
-rw-r--r-- root/root 326404 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/nf_log_ipv4.ko
-rw-r--r-- root/root 324884 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/netfilter/nf_reject_ipv4.ko
-rw-r--r-- root/root 324700 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv4/udp_diag.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/
-rw-r--r-- root/root 364880 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/ah6.ko
-rw-r--r-- root/root 386028 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/esp6.ko
-rw-r--r-- root/root 490408 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/ip6_tunnel.ko
-rw-r--r-- root/root 328676 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/ipcomp6.ko
-rw-r--r-- root/root 343160 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/mip6.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/
-rw-r--r-- root/root 390888 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/ip6_tables.ko
-rw-r--r-- root/root 317756 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
-rw-r--r-- root/root 333780 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/ip6t_SYNPROXY.ko
-rw-r--r-- root/root 330204 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/ip6t_rt.ko
-rw-r--r-- root/root 318656 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/ip6table_filter.ko
-rw-r--r-- root/root 317748 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/ip6table_mangle.ko
-rw-r--r-- root/root 331000 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/ip6table_nat.ko
-rw-r--r-- root/root 638540 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/nf_defrag_ipv6.ko
-rw-r--r-- root/root 333072 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/nf_log_ipv6.ko
-rw-r--r-- root/root 335224 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/netfilter/nf_reject_ipv6.ko
-rw-r--r-- root/root 327216 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/tunnel6.ko
-rw-r--r-- root/root 341300 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/ipv6/xfrm6_tunnel.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/ipvs/
-rw-r--r-- root/root 3536176 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/ipvs/ip_vs.ko
-rw-r--r-- root/root 367196 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nf_conncount.ko
-rw-r--r-- root/root 4757308 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nf_conntrack.ko
-rw-r--r-- root/root 362648 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nf_conntrack_ftp.ko
-rw-r--r-- root/root 487664 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nf_conntrack_netlink.ko
-rw-r--r-- root/root 325984 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nf_log_common.ko
-rw-r--r-- root/root 1347308 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nf_nat.ko
-rw-r--r-- root/root 331504 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nf_nat_ftp.ko
-rw-r--r-- root/root 407064 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nf_synproxy_core.ko
-rw-r--r-- root/root 331788 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/nfnetlink.ko
-rw-r--r-- root/root 407168 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/x_tables.ko
-rw-r--r-- root/root 317372 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_CHECKSUM.ko
-rw-r--r-- root/root 317756 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_LOG.ko
-rw-r--r-- root/root 329288 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_MASQUERADE.ko
-rw-r--r-- root/root 319316 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_TCPOPTSTRIP.ko
-rw-r--r-- root/root 329000 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_addrtype.ko
-rw-r--r-- root/root 326060 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_connlimit.ko
-rw-r--r-- root/root 327560 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_connmark.ko
-rw-r--r-- root/root 332668 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_conntrack.ko
-rw-r--r-- root/root 308872 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_iprange.ko
-rw-r--r-- root/root 338352 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_ipvs.ko
-rw-r--r-- root/root 249036 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_limit.ko
-rw-r--r-- root/root 317516 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_mac.ko
-rw-r--r-- root/root 244756 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_mark.ko
-rw-r--r-- root/root 333588 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_nat.ko
-rw-r--r-- root/root 354168 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_recent.ko
-rw-r--r-- root/root 322024 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_state.ko
-rw-r--r-- root/root 323724 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/netfilter/xt_tcpudp.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/packet/
-rw-r--r-- root/root 311508 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/packet/af_packet_diag.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/
-rw-r--r-- root/root 276548 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/act_vlan.ko
-rw-r--r-- root/root 281280 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/cls_fw.ko
-rw-r--r-- root/root 348932 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/cls_route.ko
-rw-r--r-- root/root 350320 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/cls_rsvp.ko
-rw-r--r-- root/root 344048 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/cls_rsvp6.ko
-rw-r--r-- root/root 295696 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/cls_tcindex.ko
-rw-r--r-- root/root 326028 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/cls_u32.ko
-rw-r--r-- root/root 330420 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_cbq.ko
-rw-r--r-- root/root 350560 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_dsmark.ko
-rw-r--r-- root/root 371508 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_gred.ko
-rw-r--r-- root/root 343036 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_htb.ko
-rw-r--r-- root/root 256824 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_ingress.ko
-rw-r--r-- root/root 365324 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_netem.ko
-rw-r--r-- root/root 281064 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_prio.ko
-rw-r--r-- root/root 352900 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_red.ko
-rw-r--r-- root/root 362684 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_sfq.ko
-rw-r--r-- root/root 291872 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_tbf.ko
-rw-r--r-- root/root 284724 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/sched/sch_teql.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/unix/
-rw-r--r-- root/root 314884 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/unix/unix_diag.ko
drwxr-xr-x root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/xfrm/
-rw-r--r-- root/root 329592 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/xfrm/xfrm_algo.ko
-rw-r--r-- root/root 346548 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/kernel/net/xfrm/xfrm_ipcomp.ko
-rw-r--r-- root/root 11152 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.alias
-rw-r--r-- root/root 14726 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.alias.bin
-rw-r--r-- root/root 8140 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.builtin
-rw-r--r-- root/root 9967 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.builtin.bin
-rw-r--r-- root/root 57948 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.builtin.modinfo
-rw-r--r-- root/root 10569 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.dep
-rw-r--r-- root/root 17506 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.dep.bin
-rw-r--r-- root/root 141 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.devname
-rw-r--r-- root/root 5050 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.order
-rw-r--r-- root/root 377 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.softdep
-rw-r--r-- root/root 25909 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.symbols
-rw-r--r-- root/root 31339 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/modules.symbols.bin
lrwxrwxrwx root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/build -> /home/sysadmin/bpi-r2
lrwxrwxrwx root/root 0 2019-08-23 11:43 ./lib/modules/5.3.0-rc1-bpi-r2/source -> /home/sysadmin/bpi-r2
new debian package, version 2.0.
size 35384116 bytes: control archive=979 bytes.
205 bytes, 9 lines control
674 bytes, 22 lines * postinst #!/bin/bash
465 bytes, 15 lines * postrm #!/bin/bash
522 bytes, 18 lines * preinst #!/bin/bash
Package: bananapi-r2-image-
Version: 5.3.0-rc1-1
Section: custom
Priority: optional
Architecture: arm64
Multi-Arch: no
Essential: no
Maintainer: Frank Wunderlich
Description: linux image 5.3.0-rc1-bpi-r2
sysadmin@banana-pi-r2:~/bpi-r2$ cd debian/
sysadmin@banana-pi-r2:~/bpi-r2/debian$ ls
bananapi-r2-image bananapi-r2-image-_5.3.0-rc1-1_arm64.debseems i missed spaces around == in the check for board
added them, now a armhf is created on my machine
amended last commit
I have build the kernel fron 5.3-rc branch and it completes successfully but I see one message about dtb file missing. Is it safe to install the generated deb file ?
Below is the output from the build process:
Build Kernel needed: make u-boot-tools bc gcc libc6-dev libncurses5-dev ccache generate branch vars... kernbranch:5.3-rc,gitbranch: Cleanup Kernel Build CALL scripts/atomic/check-atomics.sh CALL scripts/checksyscalls.sh CHK include/generated/compile.h Kernel: arch/arm/boot/Image is ready Building modules, stage 2. OBJCOPY arch/arm/boot/zImage Kernel: arch/arm/boot/zImage is ready MODPOST 2904 modules **cat: arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dtb: No such file or directory** Image Name: Linux Kernel 5.3.0-rc2 Created: Sat Aug 24 11:26:57 2019 Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 3445248 Bytes = 3364.50 kB = 3.29 MB Load Address: 80008000 Entry Point: 80008000 build uImage without appended DTB... **cp: cannot stat 'arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dtb': No such file or directory** Image Name: Linux Kernel 5.3.0-rc2 Created: Sat Aug 24 11:27:18 2019 Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 3445248 Bytes = 3364.50 kB = 3.29 MB Load Address: 80008000 Entry Point: 80008000
Mhmā¦strange,have you a buil.conf with content āboard=bpi-r2ā (without # before)?
Else i need to look why dtb is not generatedā¦board will not boot without it
Have you any message from dtc?
I have tried to run manually this command:
dtc -O dtb -o mt7623n-bananapi-bpi-r2.dtb arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
and it fails with error
Error: arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts:8.1-9 syntax error FATAL ERROR: Unable to parse input tree
Have you used original 5.3-rc or have you merged anything? i geuss there is a merge problem
Yes I have merge some of the feature branches into 5.3-rc :
5.3-poweroff, 5.3-phylink, 5.3-wifi and 5.3-lima.
Take a look in the dts reported by dtcā¦something is wrong in line 8
build.sh dts
Opens nano with the dts and you can look for conflict-markers (<<<<,====,>>>>) or something invalidā¦if you donāt find anything just post your file here
Line 8 should be one includeā¦look if the file exists in dt-bindings strange that make returns with 0ā¦mkimage is only called if make succeeds
I have opened the dts file with nano and I cannot see any conflict markers. I have uploaded the filebpi-r2.dts (12.2 KB)
Mhmā¦line 8 does not look strangeā¦ist is same as on 5.3-rc
#include <dt-bindings/input/input.h>
Does this file exists?
https://github.com/frank-w/BPI-R2-4.14/tree/5.3-rc/include/dt-bindings/input
i can build 5.3-rc without dtc-errors (also with make clean before)ā¦have you run ./build.sh importconfig without errors?
i add your bpi.dts and it does not fail at line 8 but on some missing nodes that are added to mt7623.dtsi by wifi/hdmi-branchā¦and also my build.sh stops and does not try to create uImage with missing dtbā¦maybe the dtsi is broken?
./build.sh dtsi
you can also try to compile 5.3-rc to make sure, your build-environment is correctly configured. if that works try comparing things with your merged branch
OK Iāll start from scratch and build only 5.3-rc without merging to see if everything goes well.