diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-28 16:39:37 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-28 16:39:37 +0400 |
| commit | a961118d28416160e8559519a4ae54d7d426431d (patch) | |
| tree | 24a4b1d06d42f940230ff6bdb813df09612758f8 | |
| parent | 5cd042c7a8fa522e85f8b8555928572caa642594 (diff) | |
| parent | 879f901700a85e6e6e9c95a237f80df14996f9e0 (diff) | |
Merge branch 'tracking-linaro-builddeb-tweaks' into merge-linux-linaro-core-tracking
| -rw-r--r-- | scripts/package/builddeb | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index f46e4dd0558d..c87b26ec55c0 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -43,7 +43,11 @@ create_package() { mips*) debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;; arm*) - debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;; + if grep -q '^CONFIG_ARM64=y' $KCONFIG_CONFIG ; then + debarch=arm64 + else + debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) + fi ;; *) echo "" >&2 echo "** ** ** WARNING ** ** **" >&2 @@ -99,6 +103,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 @@ -155,11 +162,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then for module in $(find lib/modules/ -name *.ko); do mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module) # only keep debug symbols in the debug file - objcopy --only-keep-debug $module $dbg_dir/usr/lib/debug/$module + $OBJCOPY --only-keep-debug $module $dbg_dir/usr/lib/debug/$module # strip original module from debug symbols - objcopy --strip-debug $module + $OBJCOPY --strip-debug $module # then add a link to those - objcopy --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module + $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module done ) fi @@ -326,6 +333,17 @@ EOF create_package "$fwpackagename" "$fwdir" 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" +} + +# Copy boot wrapper files if built +if [ "$ARCH" = "arm64" ] ; then + stat arch/arm64/boot/*.axf && cp arch/arm64/boot/*.axf "$tmpdir/boot" +fi + cat <<EOF >> debian/control Package: $libc_headers_packagename |