Switching SUNXI-DEV to 5.9.y (h3-h5-h6/megous)


Recommended Posts

Armbian is a community driven open source project. Do you like to contribute your code?

1 hour ago, dolphs said:

Noticed from the patching logs

 

Which patching logs?  Are you seeing errors w/-dev?

 

1 hour ago, dolphs said:

Are these patches still needed for 5.9 ?

1/ general-packaging-5.6.y.patch
2/ add-missing-H6-cpu-opp-in-5.7.y.patch

 

AFAICT I resolved everything that needed resolution in v5.9.  Again, are you seeing issues with something?

Link to post
Share on other sites
19 hours ago, Igor said:


I also noticed this today, but on a current build. Looking ...  https://armbian.atlassian.net/browse/AR-425

@Igor normally this message should go away when the file /var/run/resize2fs-reboot isnt there/deleted:
 

Spoiler

root@npi-duo-113(192.168.6.113):/etc/update-motd.d# more 98-armbian-autoreboot-warn
#!/bin/bash
#
# Copyright (c) Authors: http://www.armbian.com/authors
#
# This file is licensed under the terms of the GNU General Public
# License version 2. This program is licensed "as is" without any
# warranty of any kind, whether express or implied.

# DO NOT EDIT THIS FILE
# any changes will be lost on board support package update

if [[ -f /var/run/resize2fs-reboot ]]; then
        printf "\e[0;91mWarning: a reboot is needed to finish resizing the filesystem \x1B[0m \n"
        printf "\e[0;91mPlease reboot the system as soon as possible \x1B[0m \n"
fi

 

I tested to delete that file and rebooted, but its recreated at restart :( 
System diagnosis information will now be uploaded to http://ix.io/2xc4

 

Welcome to Armbian 20.11.0-trunk Buster with Linux 5.9.0-rc4-sunxi
package bsp-kernel[20.11.0-trunk] u-boot[20.11.0-trunk] dtb   [20.11.0-trunk]
firmware          [20.11.0-trunk] config[20.11.0-trunk] branch[dev]

root@npi-duo-113(192.168.6.113):~# rm /var/run/resize2fs-reboot
root@npi-duo-113(192.168.6.113):~# ls -l /var/run/resize2fs-reboot
ls: cannot access '/var/run/resize2fs-reboot': No such file or directory
root@npi-duo-113(192.168.6.113):~# reboot

root@npi-duo-113(192.168.6.113):~# ls -l /var/run/resize2fs-reboot
-rw-r--r-- 1 root root 0 Sep 11 16:28 /var/run/resize2fs-reboot

 

Link to post
Share on other sites
51 minutes ago, guidol said:

I tested to delete that file and rebooted, but its recreated at restart

 

That is expected.

 

Result of https://github.com/armbian/build/blob/master/packages/bsp/common/usr/lib/armbian/armbian-resize-filesystem#L120 is always error which means resize was not finished - even resize was done "successfully".

 

Type partprobe as root.
 

Error: Partition(s) 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64 on /dev/mmcblk0 have been written, but we have been unable to inform the kernel of the change, probably because it/they are in use. As a result, the old partition(s) will remain in use. You should reboot now before making further changes.

 

 

Link to post
Share on other sites
2 hours ago, Igor said:

That is expected.

 

Result of https://github.com/armbian/build/blob/master/packages/bsp/common/usr/lib/armbian/armbian-resize-filesystem#L120 is always error which means resize was not finished - even resize was done "successfully".

 

 

@Igordid see also this partprobe-error-message while transfer from MicroSD to emmc on the NPi Neo Core2 :(

Is this also the reason, why we got this wierd "mountpoint"  /var/log.hdd for root?:
 

root@npi-duo-113(192.168.6.113):~# mount
/dev/mmcblk0p1 on / type ext4 (rw,noatime,nodiratime,errors=remount-ro,commit=600)
/dev/mmcblk0p1 on /var/log.hdd type ext4 (rw,noatime,nodiratime,errors=remount-ro,commit=600)

root@npi-neo-core2-21(192.168.6.21):~# mount|grep mmc
/dev/mmcblk2p1 on / type ext4 (rw,noatime,nodiratime,errors=remount-ro,commit=600)
/dev/mmcblk2p1 on /var/log.hdd type ext4 (rw,noatime,nodiratime,errors=remount-ro,commit=600)

 

Link to post
Share on other sites
24 minutes ago, guidol said:

did see also this partprobe-error-message while transfer from MicroSD to emmc on the NPi Neo Core2 :(

Is this also the reason, why we got this wierd "mountpoint"  /var/log.hdd for root?


I haven't been able to find the source of the problems yet.

Link to post
Share on other sites
4 hours ago, guidol said:

Is this also the reason, why we got this wierd "mountpoint"  /var/log.hdd for root?

 

@guidol - no, while this may seem weird it's perfectly normal - this is a "bind mount", and this is how bind mounts appear in "mount".  You can create one of these yourself, for example:

root@nanopi:~# mkdir foo bar
root@nanopi:~# mount --bind foo bar
root@nanopi:~# mount | grep bar
/dev/mmcblk1p2 on /root/bar type f2fs (rw,relatime,lazytime,background_gc=on,discard,no_heap,user_xattr,inline_xattr,acl,inline_data,inline_dentry,flush_merge,extent_cache,mode=adaptive,active_logs=6,alloc_mode=default,fsync_mode=posix,compress_algorithm=lz4,compress_log_size=2)
root@nanopi:~#

(The "log.hdd" bind mount is created via "/usr/lib/armbian/armbian-ramlog".)  Hope this helps!

Link to post
Share on other sites
On 9/11/2020 at 6:43 PM, guidol said:

did see also this partprobe-error-message while transfer from MicroSD to emmc on the NPi Neo Core2


It seems kernel related. 5.8 -> ERROR

 

Just build Odroid N2 with legacy 4.9.y kernel. Works fine.

Link to post
Share on other sites

Hmm get atm U-boot compilation errors.

Will check back later building rc5

Displaying message: * [\e[32ml\e[0m][\e[32mc\e[0m] sun8i-set-machid.patch failed wrn
Displaying message: * [\e[32ml\e[0m][\e[32mc\e[0m] sunxi-boot-splash.patch failed wrn
Displaying message: * [\e[32ml\e[0m][\e[32mc\e[0m] xxx-disable-de2-to-improve-edid-detection.patch failed wrn
Displaying message: ERROR in function compile_uboot compilation.sh:220 err
Displaying message: U-boot compilation failed  err
Displaying message: Process terminated  info


EDIT: yup rc5 got build just now ( for: n2black )

Link to post
Share on other sites

Good "morning",

After rc6 it seems there is a small glitch

Either fix or remove 0001-bootslpash.patch :

 

Just compiled dev for orangepioneplus H6-board

 

 

- patching.log
---

Processing file /home/armbian/patch/misc/0001-bootsplash.patch
1 out of 5 hunks FAILED -- saving rejects to file drivers/video/fbdev/core/fbcon.c.rej

 

compilation.log
---

drivers/video/fbdev/core/dummyblit.c:81:14: error: assignment to ‘void (*)(struct vc_data *, struct fb_info *, int,  int,  int)’ from incompatible pointer type ‘void (*)(struct vc_data *, struct fb_info *, int,  int,  int,  int)’ [-Werror=incompatible-pointer-types]
   81 |  ops->cursor = dummy_cursor;
      |              ^
cc1: some warnings being treated as errors
make[4]: *** [scripts/Makefile.build:283: drivers/video/fbdev/core/dummyblit.o] Error 1
make[3]: *** [scripts/Makefile.build:500: drivers/video/fbdev/core] Error 2
make[2]: *** [scripts/Makefile.build:500: drivers/video/fbdev] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:500: drivers/video] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1786: drivers] Error 2


 

Link to post
Share on other sites
17 minutes ago, dolphs said:

Good "morning",

After rc6 it seems there is a small glitch

Either fix or remove 0001-bootslpash.patch :

 

Just compiled dev for orangepioneplus H6-board

 

Linus decided that this code is not needed so we have two choices:

- put the code back (last two commits)
- remove support for kernel boot splash


I already tried to fix it this morning, but it will need to wait until evening or tomorrow.

Link to post
Share on other sites
6 hours ago, Igor said:

We'll put it back - 5.8.y will be around for a while.

 

perhaps 5.8.y will be around just another month till it will reach EOL.

If I am allowed I'd choose @Werner's proposal as it potentially could re-appear in a future kernel as it seems people are committed to its return ( @phoronix ) and for now put it aside imho

 

Link to post
Share on other sites
5 minutes ago, dolphs said:

If I am allowed I'd choose @Werner's proposal as it potentially could re-appear in a future kernel as it seems people are committed to its return ( @phoronix ) and for now put it aside imho


Its already fixed :) And its also because supporting @lanefu Pinebook PRO support efforts. Nice to have this features there.

Link to post
Share on other sites

OK sounds good!

It seems that one has been eliminated, ( smooth patching.log )

however yet stuff related to dax: ( as well a lot of rtl8811cu warnings ) - from compilation.log Error captured:

drivers/dax/super.c:325:6: error: redefinition of ‘dax_supported’
  325 | bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev,
      |      ^~~~~~~~~~~~~
In file included from drivers/dax/super.c:16:
./include/linux/dax.h:162:20: note: previous definition of ‘dax_supported’ was here
  162 | static inline bool dax_supported(struct dax_device *dax_dev,
      |                    ^~~~~~~~~~~~~
make[2]: *** [scripts/Makefile.build:283: drivers/dax/super.o] Error 1
make[1]: *** [scripts/Makefile.build:500: drivers/dax] Error 2


 

Link to post
Share on other sites

Tried to build with EXTRAWIFI=no to see if it persists but this leads into failing patches:

[ warn ] * [l][c] wifi-4003-fix-sha256_state-clashes.patch [ failed ]
[ warn ] * [l][c] wifi-4004-fix-cfg80211-for-5.8.patch [ failed ]
Spoiler

Processing file /home/build/build/patch/kernel/sunxi-dev/wifi-4003-fix-sha256_state-clashes.patch
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8189es/include/rtw_security.h b/drivers/net/wireless/rtl8189es/include/rtw_security.h
|index 5820a55..3e8e428 100644
|--- a/drivers/net/wireless/rtl8189es/include/rtw_security.h
|+++ b/drivers/net/wireless/rtl8189es/include/rtw_security.h
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8189es/core/rtw_security.c b/drivers/net/wireless/rtl8189es/core/rtw_security.c
|index 8dac771..9b3a1f9 100644
|--- a/drivers/net/wireless/rtl8189es/core/rtw_security.c
|+++ b/drivers/net/wireless/rtl8189es/core/rtw_security.c
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
|index ac8432e..5f74fb7 100755
|--- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
|+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
|index b537a26..f8c42f4 100755
|--- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
|+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
|index 0adc700..2a9cf9d 100644
|--- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
|+++ b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
|index 5807521..0b3eed2 100644
|--- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
|+++ b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl88x2bu/include/rtw_security.h b/drivers/net/wireless/rtl88x2bu/include/rtw_security.h
|index ac8432e..5f74fb7 100644
|--- a/drivers/net/wireless/rtl88x2bu/include/rtw_security.h
|+++ b/drivers/net/wireless/rtl88x2bu/include/rtw_security.h
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl88x2bu/core/rtw_security.c b/drivers/net/wireless/rtl88x2bu/core/rtw_security.c
|index b537a26..f8c42f4 100644
|--- a/drivers/net/wireless/rtl88x2bu/core/rtw_security.c
|+++ b/drivers/net/wireless/rtl88x2bu/core/rtw_security.c
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored

Processing file /home/build/build/patch/kernel/sunxi-dev/wifi-4004-fix-cfg80211-for-5.8.patch
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c
|index d77cc17..32cc240 100644
|--- a/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c
|+++ b/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c
|index c0df148..9bff924 100755
|--- a/drivers/net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c
|+++ b/drivers/net/wireless/rtl8811cu/os_dep/linux/ioctl_cfg80211.c
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
|index 721723e..62fd530 100644
|--- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
|+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
The text leading up to this was:
--------------------------
|diff --git a/drivers/net/wireless/rtl88x2bu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl88x2bu/os_dep/linux/ioctl_cfg80211.c
|index 2fd4e28..b463e55 100755
|--- a/drivers/net/wireless/rtl88x2bu/os_dep/linux/ioctl_cfg80211.c
|+++ b/drivers/net/wireless/rtl88x2bu/os_dep/linux/ioctl_cfg80211.c
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored

 

Overall just a minor issue since it does no harm.

 

It spits out the same warnings so it seems not to be related to 3rd party WiFi.

 

For the DAX issue: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=pending-fixes&id=88b67edd7247466bc47f01e1dc539b0d0d4b931e

Probably fixed in next RC

Link to post
Share on other sites
28 minutes ago, Werner said:

Tried to build with EXTRAWIFI=no to see if it persists but this leads into failing patches:

 

 

That I addressed previously as well , suppose when we hit final 5.9 that will be worked on .

Yet "testing purposes" ( DEV ) I compile using following flags ( default is EXTRAWIFI=yes ) :

./compile.sh BRANCH=dev RELEASE=buster BUILD_MINIMAL=yes BUILD_DESKTOP=no KERNEL_ONLY=no KERNEL_CONFIGURE=no

 

Will check back when rc7 has been released ( rgd dax ), thanks for that info! 

Link to post
Share on other sites
5 hours ago, Werner said:

Tried to build with EXTRAWIFI=no to see if it persists but this leads into failing patches:

 

Overall just a minor issue since it does no harm.

 

Exactly - this is because these additional Wi-Fi drivers are conditionally added outside of each local target patchset.  If the drivers aren't included (e.g., via "EXTRAWIFI=no", then the patches will fail because there are no files to patch.  As @Werner notes, this is really just a cosmetic issue.

 

Link to post
Share on other sites
On 9/22/2020 at 10:36 AM, Werner said:

 

looks like this patch has been added for rc6/ is fixed meanwhile, thanks! ( as well u-boot bumped to 7 )

 

-rw-rw-r-- 1 root root 796917760 Sep 24 09:52 Armbian_20.11.0-trunk_Orangepioneplus_buster_dev_5.9.0-rc6_minimal.img
-rw-rw-r-- 1 root sudo       137 Sep 24 09:52 Armbian_20.11.0-trunk_Orangepioneplus_buster_dev_5.9.0-rc6_minimal.img.sha
-rw-rw-r-- 1 root sudo     19667 Sep 24 09:52 Armbian_20.11.0-trunk_Orangepioneplus_buster_dev_5.9.0-rc6_minimal.img.txt

 

Link to post
Share on other sites
8 hours ago, Werner said:

Processing file /home/build/build/patch/kernel/sunxi-dev/wifi-brcmfmac-fix-txctl-credits.patch
1 out of 1 hunk FAILED -- saving rejects to file drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c.rej

Something else got bricked in the meantime :lol:

 

Just fixed this in master; they rolled this patch into upstream with -rc6.   Thanks for noting this!

Link to post
Share on other sites

@5kft  - The image does build,  however the error @Werner mentioned earlier today is there compiling: 

./compile.sh BRANCH=dev RELEASE=buster BUILD_MINIMAL=yes BUILD_DESKTOP=no KERNEL_ONLY=no KERNEL_CONFIGURE=no

 

Please find attached patching.log, note the "wifi-brcmfmac-fix-txctl-credits.patch" that complains with:
1 out of 1 hunk FAILED -- saving rejects to file drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c.rej

 

 

patching.log

Link to post
Share on other sites
2 minutes ago, dolphs said:

@5kft  - The image does build,  however the error @Werner mentioned earlier today is there compiling: 


./compile.sh BRANCH=dev RELEASE=buster BUILD_MINIMAL=yes BUILD_DESKTOP=no KERNEL_ONLY=no KERNEL_CONFIGURE=no

 

Please find attached patching.log, note the "wifi-brcmfmac-fix-txctl-credits.patch" that complains with:
1 out of 1 hunk FAILED -- saving rejects to file drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c.rej

 

 

 

Yes, do a pull and try again - I just removed the offending patch as it was merged upstream in -rc6 :thumbup:

 

(See https://github.com/armbian/build/commit/9637d3d0f94203a8ea18495d61090dbe202aeeaf)

 

 

Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.

Guest
Reply to this topic...

×   Pasted as rich text.   Restore formatting

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...