From eed8631c0269da9ba4e2591ce0bf12c5172f33cb Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 8 Jan 2021 22:23:29 +0100 Subject: [PATCH] main/dtbtool-sprd: fork and upgrade to 1.1.2 (MR 1864) 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. --- main/dtbtool-sprd/APKBUILD | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/main/dtbtool-sprd/APKBUILD b/main/dtbtool-sprd/APKBUILD index 745a5c585..3fe3d5a6d 100644 --- a/main/dtbtool-sprd/APKBUILD +++ b/main/dtbtool-sprd/APKBUILD @@ -1,23 +1,25 @@ # Maintainer: Anri Dellal pkgname=dtbtool-sprd -pkgver=1.0.0 +pkgver=1.1.2 pkgrel=0 -_commit="f0e4a4c5025b8f7a13e69db3af9446717702f4f2" 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" license="MIT" makedepends="dtc-dev" 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() { - 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 } package() { - install -Dm755 "$srcdir"/dtbTool-sprd \ + install -Dm755 "$srcdir"/dtbtool-sprd-v$pkgver/dtbTool-sprd \ "$pkgdir"/usr/bin/dtbTool-sprd } -sha512sums="2b79cbdaffb73dc99b673375f386218858f7a638433af1cf4da9310fea90485e42054b87bf1a4aa23e134595f1cf956f9bade07bc73076a8553e1363c3002b39 dtbtool-sprd-f0e4a4c5025b8f7a13e69db3af9446717702f4f2-dtbtool.c" +sha512sums="3fe3398bf89a12f47b2dc409912dfac88413467e09af66244dcf359a30a220f5c44413458566f7d762bc4cfcbf1d3404dd74160617df8ef020fa383e53017c82 dtbtool-sprd-v1.1.2.tar.gz"