diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-15 01:23:51 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-15 01:23:51 +0400 |
| commit | 655cf950bf9b8a9d0495c5031f94dcbd38fb7ca4 (patch) | |
| tree | b4dd7f48dba1e0db0120c947cac9fafb58e2c9a3 /scripts | |
| parent | 6353f5d8f02e8b12c6306094e4338447f2fda604 (diff) | |
| parent | fd826cb0dba41cd496d5948409761f3cd8f981c4 (diff) | |
Merge branch 'tracking-linaro-builddeb-tweaks' into merge-linux-linaro-core-tracking
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/package/builddeb | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index f46e4dd0558..154a8d7a97e 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -42,6 +42,8 @@ create_package() { debarch=hppa ;; mips*) debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;; + arm64) + debarch=arm64 ;; arm*) debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;; *) @@ -99,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 @@ -155,11 +160,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 @@ -287,14 +292,18 @@ EOF fi -# Build header package +# Build kernel header package (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles") (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles") +if [ "$ARCH" = "arm" ]; then + (cd $srctree; find arch/arm/mach-*/include -type f >> "$objtree/debian/hdrsrcfiles") +fi (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" -(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -) -(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -) +excludes="--exclude-vcs --exclude=*.cmd --exclude=*.o --exclude=Documentation" +(cd $srctree; tar $excludes -cf - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -) +(cd $objtree; tar $excludes -cf - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -) (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build" rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" @@ -326,6 +335,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 |