diff options
| author | Jack Chen | 2021-04-24 11:45:47 +0800 |
|---|---|---|
| committer | Jack Chen | 2021-04-24 11:45:47 +0800 |
| commit | 1f6fc1d74dc1ababc27f0e4a94d9b14657ef5631 (patch) | |
| tree | 2682e3237e1455e24f37f7ba97f8dcedef0499da | |
| parent | 13d996e2efb9f9a6b621a18a5d352110f0ac2cce (diff) | |
| download | aur-1f6fc1d74dc1ababc27f0e4a94d9b14657ef5631.tar.gz | |
update PKGBUILD
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | boot.txt | 4 | ||||
| -rw-r--r-- | uboot-tinkerboard.install | 3 |
4 files changed, 8 insertions, 11 deletions
@@ -11,12 +11,11 @@ pkgbase = uboot-tinkerboard noextract = boot.txt noextract = linux-u-boot-current-tinkerboard_21.02.3_armhf.deb backup = boot/boot.txt - backup = boot/boot.scr source = mkscr source = boot.txt source = https://apt.armbian.com/pool/main/l/linux-u-boot-tinkerboard-current/linux-u-boot-current-tinkerboard_21.02.3_armhf.deb sha512sums = 7046ab4d88efbba636be049be2f660e18c05e48d161d39437c1580b12795ba4d9197ad57ac4572398f80a38d4777507b57228abf4cc41f0081d196ece27ea9d0 - sha512sums = 7e1f67c9e2fbbb5de2c32e83b0f8ed71fb9d2601a8e9312398db986fd8c2662487e2d9d30d03ace85694446fbfacc297a76b0e1dffe542d8e5a4afaa19c9f234 + sha512sums = 8019f7196ff3a40408ea577daa6fb6249f4eaddafaeb89ffee32c6e49aaf44d8881c69ab66421fda3fbfe5a9c8749925394685b46f0cf52f44cc8c249f2d223a sha512sums = SKIP pkgname = uboot-tinkerboard @@ -7,7 +7,7 @@ pkgdesc="U-Boot for Tinker Board / S" arch=('armv7h') url="https://github.com/armbian/build" license=('GPL2') -backup=('boot/boot.txt' 'boot/boot.scr') +backup=('boot/boot.txt') makedepends=('uboot-tools') install="$pkgname.install" source=( @@ -17,7 +17,7 @@ source=( ) sha512sums=( '7046ab4d88efbba636be049be2f660e18c05e48d161d39437c1580b12795ba4d9197ad57ac4572398f80a38d4777507b57228abf4cc41f0081d196ece27ea9d0' - '7e1f67c9e2fbbb5de2c32e83b0f8ed71fb9d2601a8e9312398db986fd8c2662487e2d9d30d03ace85694446fbfacc297a76b0e1dffe542d8e5a4afaa19c9f234' + '8019f7196ff3a40408ea577daa6fb6249f4eaddafaeb89ffee32c6e49aaf44d8881c69ab66421fda3fbfe5a9c8749925394685b46f0cf52f44cc8c249f2d223a' 'SKIP' ) noextract=("${source[@]##*/}") @@ -40,8 +40,5 @@ package() { major="$(mountpoint -d / | cut -f 1 -d ':')" minor="$(mountpoint -d / | cut -f 2 -d ':')" device="$(cat /proc/partitions | awk {'if ($1 == "'$major'" && $2 == "'$minor'") print $4 '})" - sed "s|%ROOTDEV%|$device|g" boot.txt | - install -Dm644 /dev/stdin "$pkgdir/boot/boot.txt" - - mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d "$pkgdir/boot/boot.txt" "$pkgdir/boot/boot.scr" + sed "s|%ROOTDEV%|$device|g" boot.txt | install -Dm644 /dev/stdin "$pkgdir/boot/boot.txt" } @@ -6,8 +6,8 @@ setenv bootargs earlyprintk root=/dev/%ROOTDEV% rw rootwait console=ttyS2,115200 if test "${board}" = "tinkerboard"; then setenv fdtfile "rk3288-tinker.dtb"; fi if test "${board}" = "tinkerboard-s"; then setenv fdtfile "rk3288-tinker-s.dtb"; fi -if load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtbs/${fdtfile}; then - if load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}zImage; then +if load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}zImage; then + if load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtbs/${fdtfile}; then if load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}Initrd; then bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r} else diff --git a/uboot-tinkerboard.install b/uboot-tinkerboard.install index e1461f74d250..a87118f9f033 100644 --- a/uboot-tinkerboard.install +++ b/uboot-tinkerboard.install @@ -39,11 +39,12 @@ flash_uboot() { ## arg 1: the new package version post_install() { + mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d "/boot/boot.txt" "/boot/boot.scr" flash_uboot } ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { - flash_uboot + post_install } |