diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-01-12 22:07:06 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-01-12 22:07:06 +0300 |
| commit | d4e975376d66bdf1e723103233a9721a04ee80f0 (patch) | |
| tree | b883390a7d21d1836fa529a26342a61efe4d45a0 | |
| parent | a594b6121bca637e893c66f512748c5f5788758a (diff) | |
| parent | c3ed1fef9e0b8ff04e1fddcaf19e1ee19801df51 (diff) | |
Automatically merging tracking-linaro-builddeb-tweaks into merge-linux-linaroll-20150112.1
Conflicting files:
scripts/package/builddeb
| -rw-r--r--[-rwxr-xr-x] | scripts/package/builddeb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 48a4037421d2..3dfd2baebf0c 100755..100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -332,10 +332,9 @@ EOF fi # Copy device tree files if generated -stat arch/$ARCH/boot/dts/*.dtb && { - mkdir -p "$tmpdir/lib/firmware/$version/device-tree" - cp arch/$ARCH/boot/dts/*.dtb "$tmpdir/lib/firmware/$version/device-tree" -} +for dtb in `find arch/$ARCH/boot/dts/ -type f -name '*.dtb'`; do + install -D -p -m0644 ${dtb} "$tmpdir/lib/firmware/$version/device-tree/`basename ${dtb}`" +done # Copy boot wrapper files if built if [ "$ARCH" = "arm64" ] ; then |