From 7f5db138e58fd2e03b0b0c5c42872114a1e11b55 Mon Sep 17 00:00:00 2001 From: Avik Sil Date: Tue, 24 Apr 2012 14:05:55 +0530 Subject: Add device tree files to deb package Signed-off-by: Avik Sil --- scripts/package/builddeb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 59726243c2eb..40fd73921a2f 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -135,6 +135,11 @@ if [ "$ARCH" = "um" ] ; then else cp System.map "$tmpdir/boot/System.map-$version" cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" + # Copy device tree files if generated + stat arch/$ARCH/boot/*.dtb && { + mkdir -p "$tmpdir/boot/dt-$version" + cp arch/$ARCH/boot/*.dtb "$tmpdir/boot/dt-$version" + } fi # Not all arches include the boot path in KBUILD_IMAGE if [ -e $KBUILD_IMAGE ]; then -- cgit v1.2.3 From 663b8279932209644255050ff6b548c909f20835 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 8 Oct 2012 23:15:49 +0400 Subject: Leave the DT blob in the kernel image package, but move to /lib/firmware Signed-off-by: Andrey Konovalov --- scripts/package/builddeb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 40fd73921a2f..d2232ce78e15 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -135,11 +135,6 @@ if [ "$ARCH" = "um" ] ; then else cp System.map "$tmpdir/boot/System.map-$version" cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" - # Copy device tree files if generated - stat arch/$ARCH/boot/*.dtb && { - mkdir -p "$tmpdir/boot/dt-$version" - cp arch/$ARCH/boot/*.dtb "$tmpdir/boot/dt-$version" - } fi # Not all arches include the boot path in KBUILD_IMAGE if [ -e $KBUILD_IMAGE ]; then @@ -333,6 +328,12 @@ EOF create_package "$fwpackagename" "$fwdir" fi +# Copy device tree files if generated +stat arch/$ARCH/boot/*.dtb && { + mkdir -p "$tmpdir/lib/firmware/$version/device-tree" + cp arch/$ARCH/boot/*.dtb "$tmpdir/lib/firmware/$version/device-tree" +} + cat <> debian/control Package: $libc_headers_packagename -- cgit v1.2.3 From cf570d56340be66e8ef87d514af656d9ac0f25a1 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 14 Jan 2013 00:09:30 +0400 Subject: deb-pkg: update builddeb to account for the dtb location change Commit 499cd82 "ARM: dt: change .dtb build rules to build in dts directory" changed the location of the generated dtb file. Modify the builddeb script accordingly. Signed-off-by: Andrey Konovalov --- scripts/package/builddeb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index d2232ce78e15..ec5e8da1b329 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -329,9 +329,9 @@ EOF fi # Copy device tree files if generated -stat arch/$ARCH/boot/*.dtb && { +stat arch/$ARCH/boot/dts/*.dtb && { mkdir -p "$tmpdir/lib/firmware/$version/device-tree" - cp arch/$ARCH/boot/*.dtb "$tmpdir/lib/firmware/$version/device-tree" + cp arch/$ARCH/boot/dts/*.dtb "$tmpdir/lib/firmware/$version/device-tree" } cat <> debian/control -- cgit v1.2.3 From a2d18efbe35d08212bcc09d4cf8f61ec472acd9e Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Sat, 5 Oct 2013 20:08:04 +0300 Subject: builddeb: install Image file and boot wrapper files on arm64 Signed-off-by: Fathi Boudra --- scripts/package/builddeb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index ec5e8da1b329..48a4037421d2 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -101,6 +101,9 @@ um) parisc|mips|powerpc) installed_image_path="boot/vmlinux-$version" ;; +arm64) + installed_image_path="boot/Image-$version" + ;; *) installed_image_path="boot/vmlinuz-$version" esac @@ -334,6 +337,11 @@ stat arch/$ARCH/boot/dts/*.dtb && { cp arch/$ARCH/boot/dts/*.dtb "$tmpdir/lib/firmware/$version/device-tree" } +# Copy boot wrapper files if built +if [ "$ARCH" = "arm64" ] ; then + stat arch/arm64/boot/*.axf && cp arch/arm64/boot/*.axf "$tmpdir/boot" +fi + cat <> debian/control Package: $libc_headers_packagename -- cgit v1.2.3 From c3ed1fef9e0b8ff04e1fddcaf19e1ee19801df51 Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Sun, 11 Jan 2015 04:03:28 +0200 Subject: builddeb: fix device tree copy logic since 3.19 kernel, dtb location has changed and contains a vendor subdir. fix the logic to copy device tree files. Signed-off-by: Fathi Boudra --- scripts/package/builddeb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) mode change 100755 => 100644 scripts/package/builddeb diff --git a/scripts/package/builddeb b/scripts/package/builddeb old mode 100755 new mode 100644 index 48a4037421d2..3dfd2baebf0c --- 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 -- cgit v1.2.3