From 2e5eb53a6c979691aef30906c42e171c7c73fd02 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 35d5a5877d04..d0f34f8d376f 100644 --- 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 78f22e26d22c857218de7f1bad6b5130e193b080 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 d0f34f8d376f..2ca6bc1aafbd 100644 --- 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 @@ -335,6 +330,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 63b533bab5571b3214be7096d77e2c5ac5c9ba1c 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 2ca6bc1aafbd..0a6a5e7cfeee 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -331,9 +331,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 9838272845eb223a56f9d7c74c956eb74d7533c3 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 0a6a5e7cfeee..0d64196f5b10 100644 --- 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 @@ -336,6 +339,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