From a645176989fcfbd2ccd472a3f35216eeae4c574d Mon Sep 17 00:00:00 2001 From: Bryce Kahle Date: Wed, 28 Feb 2024 11:26:51 -0800 Subject: [PATCH] remove debian.dwarves --- .../actions/build-dependencies/action.yaml | 5 +- 3rdparty/.gitignore | 9 -- 3rdparty/debian.dwarves/changelog | 5 - 3rdparty/debian.dwarves/control | 45 ------ 3rdparty/debian.dwarves/copyright | 148 ------------------ 3rdparty/debian.dwarves/pahole.install | 23 --- 3rdparty/debian.dwarves/patches/series | 0 3rdparty/debian.dwarves/rules | 23 --- 3rdparty/debian.dwarves/source/format | 1 - .../debian.dwarves/source/lintian-overrides | 2 - 3rdparty/pahole.sh | 15 -- 11 files changed, 1 insertion(+), 275 deletions(-) delete mode 100644 3rdparty/.gitignore delete mode 100644 3rdparty/debian.dwarves/changelog delete mode 100644 3rdparty/debian.dwarves/control delete mode 100644 3rdparty/debian.dwarves/copyright delete mode 100644 3rdparty/debian.dwarves/pahole.install delete mode 100644 3rdparty/debian.dwarves/patches/series delete mode 100755 3rdparty/debian.dwarves/rules delete mode 100644 3rdparty/debian.dwarves/source/format delete mode 100644 3rdparty/debian.dwarves/source/lintian-overrides delete mode 100755 3rdparty/pahole.sh diff --git a/.github/actions/build-dependencies/action.yaml b/.github/actions/build-dependencies/action.yaml index 37c9f3a6..389715f4 100644 --- a/.github/actions/build-dependencies/action.yaml +++ b/.github/actions/build-dependencies/action.yaml @@ -72,10 +72,7 @@ runs: --slave /usr/bin/opt opt /usr/bin/opt-14 \ --slave /usr/bin/cc cc /usr/bin/clang-14 shell: bash - - name: Install pahole - run: | - ./3rdparty/pahole.sh - shell: bash + - name: Install staticchecker run: | GOROOT=/usr/local/go GOPATH=$HOME/go go install honnef.co/go/tools/cmd/staticcheck@latest diff --git a/3rdparty/.gitignore b/3rdparty/.gitignore deleted file mode 100644 index 6dad47a8..00000000 --- a/3rdparty/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# build dirs -*/debian/*/build -*/debian/*/tmp -debian*/build -debian*/tmp -# leftovers -*.deb -*.changes -*.buildinfo diff --git a/3rdparty/debian.dwarves/changelog b/3rdparty/debian.dwarves/changelog deleted file mode 100644 index 873de7b7..00000000 --- a/3rdparty/debian.dwarves/changelog +++ /dev/null @@ -1,5 +0,0 @@ -dwarves (1.25-0ubuntu99~202307241125) jammy; urgency=medium - - * Backport from upstream: v1.24-68-g0a1944b4 - - -- Rafael David Tinoco Wed, 01 Jul 2023 00:00:00 +0000 diff --git a/3rdparty/debian.dwarves/control b/3rdparty/debian.dwarves/control deleted file mode 100644 index ef8527e2..00000000 --- a/3rdparty/debian.dwarves/control +++ /dev/null @@ -1,45 +0,0 @@ -Source: dwarves -Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Thomas Girard -Uploaders: Domenico Andreoli -Build-Depends: debhelper-compat (= 13), cmake (>= 2.4.8), pkg-config, zlib1g-dev, libelf-dev, libdw-dev (>= 0.141), linux-libc-dev [linux-any] -Standards-Version: 4.6.1 -Rules-Requires-Root: no -Section: utils -Vcs-Browser: https://salsa.debian.org/debian/dwarves -Vcs-Git: https://salsa.debian.org/debian/dwarves.git -Homepage: https://git.kernel.org/pub/scm/devel/pahole/pahole.git - -Package: pahole -Architecture: any -Multi-Arch: foreign -Replaces: dwarves (<< 1.22) -Breaks: dwarves (<< 1.22) -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: set of advanced DWARF utilities - This package contains tools that use the DWARF debugging information - inserted in ELF binaries by the compiler. This information is used by - debuggers (e.g. GDB), and other tools such as systemtap. - . - Utilities in the dwarves suite include: - . - - pahole: finds alignment holes in structs and classes in languages - such as C/C++, CPU cacheline alignment. Helps repack those structures - to achieve more cache hits. - - codiff: a diff like tool to compare the effects changes in source - code generate on the resulting binaries - - pfunct: displays all sorts of information about functions, inlines, etc. - - pdwtags: pretty-prints DWARF information - - pglobal: lists global symbols - - prefcnt: counts DWARF tags usage - - syscse: system call sign extender - - dtagnames: lists tag names - -Package: dwarves -Architecture: all -Multi-Arch: foreign -Section: oldlibs -Depends: pahole (>= 1.22), ${misc:Depends} -Description: set of advanced DWARF utilities - transitional package - This is a "dummy" package that depends on the newly named pahole. diff --git a/3rdparty/debian.dwarves/copyright b/3rdparty/debian.dwarves/copyright deleted file mode 100644 index f30fa91a..00000000 --- a/3rdparty/debian.dwarves/copyright +++ /dev/null @@ -1,148 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Contact: Arnaldo Carvalho de Melo -Source: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/ - -Files: * -Copyright: 2006-2019 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: debian/* -Copyright: 2007-2019 Domenico Andreoli -Comment: package debianized by Domenico Andreoli on Wed, 08 Aug 2007 04:02:11 +0200. -License: GPL-2.0-only - -Files: ostra/ostra-cg ostra/python/ostra.py -Copyright: 2005, 2006, 2007 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: dwarves.c dwarves_emit.c dwarves_reorganize.c -Copyright: 2006 Arnaldo Carvalho de Melo - 2006 Mandriva Conectiva S.A. - 2007 Arnaldo Carvalho de Melo - 2007 Red Hat Inc. -License: GPL-2.0-only - -Files: codiff.c ctracer.c dtagnames.c prefcnt.c -Copyright: 2006 Arnaldo Carvalho de Melo - 2006 Mandriva Conectiva S.A. -License: GPL-2.0-only - -Files: pfunct.c -Copyright: 2006 Arnaldo Carvalho de Melo - 2006 Mandriva Conectiva S.A. - 2007 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: dwarves.h -Copyright: 2006..2009 Arnaldo Carvalho de Melo - 2006 Mandriva Conectiva S.A. -License: GPL-2.0-only - -Files: dutil.c config.h.cmake lib/ctracer_relay.c lib/ctracer_relay.h -Copyright: 2007 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: dwarves_emit.h dwarves_reorganize.h -Copyright: 2006 Arnaldo Carvalho de Melo - 2006 Mandriva Conectiva S.A. - 2007 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: pglobal.c -Copyright: 2007 Davi E. M. Arnaut -License: GPL-2.0-only - -Files: pahole.c -Copyright: 2006 Arnaldo Carvalho de Melo - 2006 Mandriva Conectiva S.A. - 2007-2008 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: dwarves_fprintf.c -Copyright: 2006 Arnaldo Carvalho de Melo - 2006 Mandriva Conectiva S.A. - 2007..2009 Arnaldo Carvalho de Melo - 2007..2009 Red Hat Inc. -License: GPL-2.0-only - -Files: dutil.h -Copyright: 2007..2009 Arnaldo Carvalho de Melo - Cast of dozens, comes from the Linux kernel -License: GPL-2.0-only - -Files: pdwtags.c syscse.c -Copyright: 2007-2016 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: gobuffer.c gobuffer.h -Copyright: 2008 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: ctf_loader.c -Copyright: 2008 David S. Miller -License: GPL-2.0-only - -Files: ctf_encoder.c ctf_encoder.h dwarf_loader.c elf_symtab.c elf_symtab.h -Copyright: 2009 Arnaldo Carvalho de Melo - 2009 Red Hat Inc. -License: GPL-2.0-only - -Files: scncopy.c elfcreator.c elfcreator.h -Copyright: 2009 Red Hat Inc. -License: GPL-2.0-only - -Files: regtest -Copyright: 2009 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: list.h -Copyright: Cast of dozens, comes from the Linux kernel -License: GPL-2.0-only - -Files: btf_encoder.c btf_encoder.h -Copyright: 2019 Facebook -License: GPL-2.0-only - -Files: ctf.h libctf.c libctf.h -Copyright: 2019 Arnaldo Carvalho de Melo -License: GPL-2.0-only - -Files: rbtree.c rbtree.h -Copyright: 1999 Andrea Arcangeli - 2002 David Woodhouse -License: GPL-2.0-or-later - -License: GPL-2.0-only - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - . - On Debian systems, the full text of the GNU General Public License - version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. - -License: GPL-2.0-or-later - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - . - On Debian systems, the full text of the GNU General Public License - version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. diff --git a/3rdparty/debian.dwarves/pahole.install b/3rdparty/debian.dwarves/pahole.install deleted file mode 100644 index 03454963..00000000 --- a/3rdparty/debian.dwarves/pahole.install +++ /dev/null @@ -1,23 +0,0 @@ -usr/lib/libdwarves.so.1 -usr/lib/libdwarves_emit.so.1.0.0 -usr/lib/libdwarves.so -usr/lib/libdwarves_reorganize.so.1.0.0 -usr/lib/libdwarves_emit.so -usr/lib/libdwarves.so.1.0.0 -usr/lib/libdwarves_emit.so.1 -usr/lib/libdwarves_reorganize.so -usr/lib/libdwarves_reorganize.so.1 -usr/bin/prefcnt -usr/bin/pahole -usr/bin/btfdiff -usr/bin/pglobal -usr/bin/pdwtags -usr/bin/fullcircle -usr/bin/scncopy -usr/bin/syscse -usr/bin/dtagnames -usr/bin/codiff -usr/bin/ctracer -usr/bin/pfunct -usr/share/dwarves/runtime -usr/share/man/man1/pahole.1 diff --git a/3rdparty/debian.dwarves/patches/series b/3rdparty/debian.dwarves/patches/series deleted file mode 100644 index e69de29b..00000000 diff --git a/3rdparty/debian.dwarves/rules b/3rdparty/debian.dwarves/rules deleted file mode 100755 index cea2a015..00000000 --- a/3rdparty/debian.dwarves/rules +++ /dev/null @@ -1,23 +0,0 @@ -#! /usr/bin/make -f - -include /usr/share/dpkg/default.mk - -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DH_VERBOSE=1 -export CC = clang -export CFLAGS = -gdwarf-4 - -%: - @true - -override_dh_auto_configure: - mkdir -p $(CURDIR)/debian/build && \ - cd $(CURDIR)/debian/build && \ - cmake -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=on -D__LIB=lib -DCMAKE_INSTALL_PREFIX=/usr ../../ && \ - make all - -override_dh_auto_install: - cd $(CURDIR)/debian/build && \ - $(MAKE) install DESTDIR=../tmp && \ - cd ../tmp && \ - rm -rf ./usr/include ./usr/bin/ostra-cg diff --git a/3rdparty/debian.dwarves/source/format b/3rdparty/debian.dwarves/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/3rdparty/debian.dwarves/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/3rdparty/debian.dwarves/source/lintian-overrides b/3rdparty/debian.dwarves/source/lintian-overrides deleted file mode 100644 index 0db1f741..00000000 --- a/3rdparty/debian.dwarves/source/lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -orig-tarball-missing-upstream-signature -upstream-metadata-missing-bug-tracking diff --git a/3rdparty/pahole.sh b/3rdparty/pahole.sh deleted file mode 100755 index 0d711272..00000000 --- a/3rdparty/pahole.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e - -git submodule update --init --recursive 3rdparty/dwarves -export DEBIAN_FRONTEND=noninteractive -rm -f *.deb -cd ./3rdparty/dwarves -rm -rf ./debian/ -cp -rfp ../debian.dwarves/ ./debian/ -sudo apt-get -y install devscripts ubuntu-dev-tools -sudo apt-get -y build-dep . -fakeroot dh binary -rm -rf ./debian/ -cd .. -sudo dpkg -i ./pahole*.deb -rm -f *.deb