Skip to content

Commit

Permalink
Revert "builddeb: Add linux-tools package with perf"
Browse files Browse the repository at this point in the history
This reverts commit aaf08d2.
  • Loading branch information
xanmod committed Nov 10, 2020
1 parent 518a3b8 commit b2d96e8
Showing 1 changed file with 1 addition and 32 deletions.
33 changes: 1 addition & 32 deletions scripts/package/builddeb
Expand Up @@ -101,10 +101,8 @@ deploy_libc_headers () {

version=$KERNELRELEASE
tmpdir=debian/linux-image
tools_dir=debian/linux-tools
dbg_dir=debian/linux-image-dbg
packagename=linux-image-$version
tools_packagename=linux-tools-$version
dbg_packagename=$packagename-dbg

if [ "$ARCH" = "um" ] ; then
Expand All @@ -128,7 +126,7 @@ esac
BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes)

# Setup the directory structure
rm -rf "$tmpdir" "$dbg_dir" "$tools_dir" debian/files
rm -rf "$tmpdir" "$dbg_dir" debian/files
mkdir -m 755 -p "$tmpdir/DEBIAN"
mkdir -p "$tmpdir/lib" "$tmpdir/boot"

Expand Down Expand Up @@ -215,35 +213,6 @@ fi

create_package "$packagename" "$tmpdir"

if [ -n "$BUILD_TOOLS" ] ; then
# HACK - change output dir from relative to absolute
mkdir -p $tools_dir
tools_dest=`readlink -f $tools_dir`
if [ -n "$O" ] ; then
output=`readlink -f $objtree`
mkdir -p $output/tools/perf
output="O=$output/tools/perf"
fi
$MAKE -C $srctree/tools/perf $output LDFLAGS=-static srctree=$KBUILD_SRC prefix=$tools_dest/usr install
cat <<EOF >> debian/control
Package: $tools_packagename
Architecture: any
Replaces: linux-base, linux-tools-common
Depends: \${shlibs:Depends}
Description: Performance analysis tools for Linux $version
This package contains the 'perf' performance analysis tools for Linux
kernel version $version .
EOF

if [ -d "$tools_dest/usr/lib64" ] ; then
mv $tools_dest/usr/lib64/* $tools_dest/usr/lib && rm -rf $tools_dest/usr/lib64
fi

dpkg-shlibdeps $tools_dest/usr/bin/* $tools_dest/usr/lib/traceevent/plugins/*
create_package "$tools_packagename" "$tools_dir"
fi

if [ -n "$BUILD_DEBUG" ] ; then
# Build debug package
# Different tools want the image in different locations
Expand Down

0 comments on commit b2d96e8

Please sign in to comment.