enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix upgrades of armbian-bsp-cli-aml-s9xx-box-current (#6287)

Browse Source 
- dpkg fails upgrading files on a fat filesystem as it tries to create a link
- Move to using standard extlinux.conf instead of installing a custom one

 Changes to be committed:
	modified:   config/boards/aml-s9xx-box.tvb
	deleted:    packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf
	new file:   packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template
This commit is contained in:
SteeManMI 2024-02-20 16:50:08 -05:00 committed by GitHub
parent 0cba1d16bf
commit 14ce06c5da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config/boards/aml-s9xx-box.tvb
View File

@ -10,8 +10,27 @@ SERIALCON="ttyAML0"
FULL_DESKTOP="yes"
ASOUND_STATE="asound.state.mesongx"
BOOT_LOGO="desktop"
SRC_EXTLINUX="yes"
SRC_CMDLINE='rootflags=data=writeback console=ttyAML0,115200n8 console=tty0'
function aml-s9xx-box-bsp-cli-preinst() {
#update of the board bsp-cli package fails because the filesystem type is
#fat and dpkg tries to create a hard link for the existing files as backup
#so rm the files instead in a preinst step
[ -f /boot/aml_autoscript ] && rm /boot/aml_autoscript
[ -f /boot/emmc_autoscript ] && rm /boot/emmc_autoscript
[ -f /boot/s905_autoscript ] && rm /boot/s905_autoscript
[ -f /boot/u-boot-s905 ] && rm /boot/u-boot-s905
[ -f /boot/u-boot-s905x-s912 ] && rm /boot/u-boot-s905x-s912
[ -f /boot/u-boot-s905x2-s922 ] && rm /boot/u-boot-s905x2-s922
[ -f /boot/u-boot-s905x3 ] && rm /boot/u-boot-s905x3
[ -f /boot/extlinux/extlinux.conf.template ] && rm /boot/extlinux/extlinux.conf.template
[ -f /boot/build-u-boot/readme.txt ] && rm /boot/build-u-boot/readme.txt
[ -f /boot/build-u-boot/u-boot-s905x-s912.patch ] && rm /boot/build-u-boot/u-boot-s905x-s912.patch
[ -f /boot/build-u-boot/u-boot-s905x2-s922.patch ] && rm /boot/build-u-boot/u-boot-s905x2-s922.patch
[ -f /boot/build-u-boot/u-boot-s905x3.patch ] && rm /boot/build-u-boot/u-boot-s905x3.patch
}
function post_family_tweaks_bsp__config_aml-s9xx-box_bsp() {
@ -25,4 +44,7 @@ function post_family_tweaks_bsp__config_aml-s9xx-box_bsp() {
rm "${destination}"/usr/sbin/armbian-install
display_alert "${BOARD}" "Adding bsp-cli preinst logic" "info"
preinst_functions+=('aml-s9xx-box-bsp-cli-preinst')
}

11
packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf
View File

@ -1,11 +0,0 @@
LABEL Armbian
LINUX /Image
INITRD /uInitrd
#FDT /dtb/amlogic/meson-gxbb-p200.dtb
#FDT /dtb/amlogic/meson-gxl-s905x-p212.dtb
FDT /dtb/amlogic/meson-gxl-s905w-tx3-mini.dtb
#FDT /dtb/amlogic/meson-gxm-q200.dtb
#FDT /dtb/amlogic/meson-g12a-x96-max.dtb
#FDT /dtb/amlogic/meson-g12b-odroid-n2.dtb

14
packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template Normal file
View File

@ -0,0 +1,14 @@
label Armbian-unofficial
kernel /Image
initrd /uInitrd
fdtdir /dtb/
#Insert the correct FDT line for your box's dtb in the extlinux.conf file
#The dtbs for Amlogic s9xx boxes are located in /boot/dtb/amlogic
#For example for a TX3 mini box the FDT line to insert would look like this:
FDT /dtb/amlogic/meson-gxl-s905w-tx3-mini.dtb
append root=UUID=<root partition uuid> rootflags=data=writeback console=ttyAML0,115200n8 console=tty0 rw no_console_suspend consoleblank=0 fsck.fix=yes fsck.repair=yes net.ifnames=0 splash plymouth.ignore-serial-consoles