forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/dtbtool-sprd: fork and upgrade to 1.1.2 (MR 1864)

Browse source 
Fix error if -p arg or dtb dir do not end with /.

Currently, running

$ dtbTool-sprd -p "scripts/dtc" -o "arch/arm/boot/dt.img" "arch/arm/boot/dts/"

or

$ dtbTool-sprd -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/dts"

fails with something like
	DTB combiner:
	  Input directory: 'arch/arm/boot/dts/'
	  Output file: 'dt.img'
	Found file: sprd-scx20_sp7731ceb.dtb ... skip, failed to scan for 'sprd,sc-id =<' tag
	=> Found 0 unique DTB(s)

instead of succeeding with something like
	DTB combiner:
	  Input directory: 'arch/arm/boot/dts/'
	  Output file: 'dt.img'
	Found file: sprd-scx20_sp7731ceb.dtb ... chipset: 8830, platform: 1, rev: 131072
	=> Found 1 unique DTB(s)

	Generating master DTB... completed

The reason for the failure is that the tool tries to run external
commands and concatenates the path from the args, meaning that it
tries to run scripts/dtcdtc instead of scripts/dtc/dtc.
This commit is contained in:
Henrik Grimler 2021-01-08 22:23:29 +01:00 committed by Oliver Smith
parent 6db0e21df7
commit eed8631c02
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
main/dtbtool-sprd/APKBUILD
View file

@ -1,23 +1,25 @@
# Maintainer: Anri Dellal <anridellal@gmail.com> # Maintainer: Anri Dellal <anridellal@gmail.com>
pkgname=dtbtool-sprd pkgname=dtbtool-sprd
pkgver=1.0.0 pkgver=1.1.2
pkgrel=0 pkgrel=0
_commit="f0e4a4c5025b8f7a13e69db3af9446717702f4f2"
pkgdesc="Tool for compiling a dtb.img for Spreadtrum SoC" pkgdesc="Tool for compiling a dtb.img for Spreadtrum SoC"
url="https://github.com/yonglongliu/vendor/" url="https://gitlab.com/Grimler/dtbtool-sprd"
arch="all" arch="all"
license="MIT" license="MIT"
makedepends="dtc-dev" makedepends="dtc-dev"
options="!check" # There is no testsuite options="!check" # There is no testsuite
source="$pkgname-$_commit-dtbtool.c::https://raw.githubusercontent.com/yonglongliu/vendor/$_commit/sprd/external/tools-build/dtbtool/dtbtool.c" source="
https://gitlab.com/Grimler/dtbtool-sprd/-/archive/v$pkgver/dtbtool-sprd-v$pkgver.tar.gz
"
builddir="dtbtool-sprd-v$pkgver"
build() { build() {
gcc $pkgname-$_commit-dtbtool.c -o dtbTool-sprd.o -c gcc dtbtool.c -o dtbTool-sprd.o -c
gcc dtbTool-sprd.o -o dtbTool-sprd gcc dtbTool-sprd.o -o dtbTool-sprd
} }
package() { package() {
install -Dm755 "$srcdir"/dtbTool-sprd \ install -Dm755 "$srcdir"/dtbtool-sprd-v$pkgver/dtbTool-sprd \
"$pkgdir"/usr/bin/dtbTool-sprd "$pkgdir"/usr/bin/dtbTool-sprd
} }
sha512sums="2b79cbdaffb73dc99b673375f386218858f7a638433af1cf4da9310fea90485e42054b87bf1a4aa23e134595f1cf956f9bade07bc73076a8553e1363c3002b39 dtbtool-sprd-f0e4a4c5025b8f7a13e69db3af9446717702f4f2-dtbtool.c" sha512sums="3fe3398bf89a12f47b2dc409912dfac88413467e09af66244dcf359a30a220f5c44413458566f7d762bc4cfcbf1d3404dd74160617df8ef020fa383e53017c82 dtbtool-sprd-v1.1.2.tar.gz"