From 3787533f65f7defa44a50686c37f87998bd1f81c Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Sat, 25 Apr 2020 20:09:24 +0200 Subject: community/linux-tools: move from testing --- testing/linux-tools/APKBUILD | 105 --------------------- testing/linux-tools/cpupower-libs.patch | 21 ----- testing/linux-tools/disable-Werror.patch | 13 --- ...rrectly-add-make-dependency-for-iio_utils.patch | 77 --------------- 4 files changed, 216 deletions(-) delete mode 100644 testing/linux-tools/APKBUILD delete mode 100644 testing/linux-tools/cpupower-libs.patch delete mode 100644 testing/linux-tools/disable-Werror.patch delete mode 100644 testing/linux-tools/tools-iio-Correctly-add-make-dependency-for-iio_utils.patch (limited to 'testing/linux-tools') diff --git a/testing/linux-tools/APKBUILD b/testing/linux-tools/APKBUILD deleted file mode 100644 index 9175a90fb7..0000000000 --- a/testing/linux-tools/APKBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# Contributor: Leo -# Contributor: Carlo Landmeter -# Maintainer: Natanael Copa -pkgname=linux-tools -pkgver=5.4.25 -_kernver=${pkgver%.*} -pkgrel=2 -pkgdesc="Linux kernel tools meta package" -url="https://www.kernel.org/" -arch="all" -license="GPL-2.0-only" -depends="perf cpupower $pkgname-gpio $pkgname-iio" -depends_dev="pciutils-dev readline-dev gettext-dev" -makedepends="$depends_dev elfutils-dev bash linux-headers flex bison diffutils - zlib-dev findutils" -subpackages="perf perf-bash-completion:bashcomp:noarch cpupower - $pkgname-gpio $pkgname-iio $pkgname-doc $pkgname-dev" -source="https://kernel.org/pub/linux/kernel/v5.x/linux-$_kernver.tar.xz - https://kernel.org/pub/linux/kernel/v5.x/patch-$pkgver.xz - cpupower-libs.patch - disable-Werror.patch - tools-iio-Correctly-add-make-dependency-for-iio_utils.patch - " - -builddir="$srcdir"/linux-$_kernver - -prepare() { - cd "$srcdir"/linux-$_kernver - if [ "${pkgver%.0}" = "$pkgver" ]; then - msg "Applying patch-$pkgver.xz" - unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N - fi - default_prepare -} - -_make_tools() { - make -C "$builddir"/tools \ - VERSION=$pkgver-$pkgrel NLS=false LIBINTL_LIBS=-lintl WERROR=0 \ - prefix=/usr libdir=/usr/lib lib=lib mandir=/usr/share/man \ - "$@" -} - -build() { - _make_tools perf cpupower gpio iio -} - -package() { - mkdir -p "$pkgdir" - _make_tools DESTDIR="$pkgdir" \ - perf_install cpupower_install gpio_install iio_install -} - -cpupower() { - pkgdesc="Linux kernel tool to set CPU power features" - depends="" - mkdir -p "$subpkgdir"/usr/sbin \ - "$subpkgdir"/usr/bin \ - "$subpkgdir"/usr/lib \ - "$subpkgdir"/etc - - mv "$pkgdir"/usr/bin/cpu* "$subpkgdir"/usr/bin/ - mv "$pkgdir"/usr/sbin/cpu* "$subpkgdir"/usr/sbin/ - mv "$pkgdir"/usr/lib/libcpu*.so.* "$subpkgdir"/usr/lib/ - mv "$pkgdir"/etc/cpu* "$subpkgdir"/etc/ -} - -perf() { - pkgdesc="Linux kernel performance auditing tool" - depends="" - mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/bin/perf \ - "$pkgdir"/usr/bin/trace \ - "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/lib/traceevent \ - "$subpkgdir"/usr/lib/ - mv "$pkgdir"/usr/libexec "$subpkgdir"/usr/ -} - -gpio() { - pkgdesc="Linux kernel GPIO tools" - depends="" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/*gpio* "$subpkgdir"/usr/bin -} - -iio() { - pkgdesc="Linux kernel IIO tools" - depends="" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/*iio* "$subpkgdir"/usr/bin -} - -bashcomp() { - replaces="$pkgname-bash-completion" # Backward compatibility - pkgdesc="Bash autocompletion for $pkgname" - install_if="perf=$pkgver-r$pkgrel bash-completion" - mkdir -p "$subpkgdir"/usr/share/bash-completion/completions - mv "$pkgdir"/etc/bash_completion.d "$subpkgdir"/usr/share/bash-completion/completions -} - -sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f linux-5.4.tar.xz -ba887634350a2fde67283241356c5f6fee1fd076b58051aa4df88da8bc60645e40b8b73dba3401415770a80f58d59546fc96b8b816b61da70177a3ef92c1bafa patch-5.4.25.xz -a46e3a84b00a39a356618831d0ddfb7f0d10f0a3799d1307ba2cc832e73c01f8d637a4e801a6dd25025f6f13155c6ad8b836422ff72d365e51063ac0bf907f52 cpupower-libs.patch -a0b90cead5f80a7e785b2fdd8ac9faed1234f4aa5eebf658af8d8b4d3b8593147ff43810d0b28a95b057bb7781113a48723b9cf9432ec8d9510451b51416e3de disable-Werror.patch -c47b3f9cad4ca427ab0dd59273cdb34c745db57b3afd596338012aefd477f1984071c6615e5a4cce7fdd5229ac4e008fb386d0fc4dcbf79382d4810c14588090 tools-iio-Correctly-add-make-dependency-for-iio_utils.patch" diff --git a/testing/linux-tools/cpupower-libs.patch b/testing/linux-tools/cpupower-libs.patch deleted file mode 100644 index d11fe2e9b9..0000000000 --- a/testing/linux-tools/cpupower-libs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile -index 8358863259c5..fe6d70f9c5fc 100644 ---- a/tools/power/cpupower/Makefile -+++ b/tools/power/cpupower/Makefile -@@ -54,6 +54,7 @@ export STATIC ?= false - - # Prefix to the directories we're installing to - DESTDIR ?= -+LIBINTL_LIBS ?= - - # --- CONFIGURATION END --- - -@@ -223,7 +224,7 @@ $(OUTPUT)cpupower: $(UTIL_OBJS) $(OUTPUT)libcpupower.so.$(LIB_MAJ) - ifeq ($(strip $(STATIC)),true) - $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lrt -lpci -L$(OUTPUT) -o $@ - else -- $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -lrt -lpci -L$(OUTPUT) -o $@ -+ $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) $(LIBINTL_LIBS) -lcpupower -lrt -lpci -L$(OUTPUT) -o $@ - endif - $(QUIET) $(STRIPCMD) $@ - diff --git a/testing/linux-tools/disable-Werror.patch b/testing/linux-tools/disable-Werror.patch deleted file mode 100644 index e543d958ca..0000000000 --- a/testing/linux-tools/disable-Werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile -index 5390e77..b9b4bb7 100644 ---- a/tools/lib/bpf/Makefile -+++ b/tools/lib/bpf/Makefile -@@ -122,7 +122,7 @@ endif - - # Append required CFLAGS - override CFLAGS += $(EXTRA_WARNINGS) --override CFLAGS += -Werror -Wall -+override CFLAGS += -Wall - override CFLAGS += -fPIC - override CFLAGS += $(INCLUDES) - diff --git a/testing/linux-tools/tools-iio-Correctly-add-make-dependency-for-iio_utils.patch b/testing/linux-tools/tools-iio-Correctly-add-make-dependency-for-iio_utils.patch deleted file mode 100644 index e09a27b2cc..0000000000 --- a/testing/linux-tools/tools-iio-Correctly-add-make-dependency-for-iio_utils.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Laura Abbott -Subject: [PATCH] tools: iio: Correctly add make dependency for iio_utils -Date: Fri, 18 Oct 2019 13:29:08 -0400 -Message-Id: <20191018172908.3761-1-labbott@redhat.com> -X-Mailer: git-send-email 2.21.0 -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit - -iio tools fail to build correctly with make parallelization: - -$ make -s -j24 -fixdep: error opening depfile: ./.iio_utils.o.d: No such file or directory -make[1]: *** [/home/labbott/linux_upstream/tools/build/Makefile.build:96: iio_utils.o] Error 2 -make: *** [Makefile:43: iio_event_monitor-in.o] Error 2 -make: *** Waiting for unfinished jobs.... - -This is because iio_utils.o is used across multiple targets. -Fix this by making iio_utils.o a proper dependency. - -Signed-off-by: Laura Abbott ---- -I realize that we don't really need the parallelization for tools -because it's so small but when building with the distro we want to use -the same make command and -j wherever possible. - -This same issue also appears in the gpio tools so if this looks like an -okay approach I'll fix it there as well. ---- - tools/iio/Build | 1 + - tools/iio/Makefile | 10 +++++++--- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/tools/iio/Build b/tools/iio/Build -index f74cbda64710..8d0f3af3723f 100644 ---- a/tools/iio/Build -+++ b/tools/iio/Build -@@ -1,3 +1,4 @@ -+iio_utils-y += iio_utils.o - lsiio-y += lsiio.o iio_utils.o - iio_event_monitor-y += iio_event_monitor.o iio_utils.o - iio_generic_buffer-y += iio_generic_buffer.o iio_utils.o -diff --git a/tools/iio/Makefile b/tools/iio/Makefile -index e22378dba244..3de763d9ab70 100644 ---- a/tools/iio/Makefile -+++ b/tools/iio/Makefile -@@ -32,20 +32,24 @@ $(OUTPUT)include/linux/iio: ../../include/uapi/linux/iio - - prepare: $(OUTPUT)include/linux/iio - -+IIO_UTILS_IN := $(OUTPUT)iio_utils-in.o -+$(IIO_UTILS_IN): prepare FORCE -+ $(Q)$(MAKE) $(build)=iio_utils -+ - LSIIO_IN := $(OUTPUT)lsiio-in.o --$(LSIIO_IN): prepare FORCE -+$(LSIIO_IN): prepare FORCE $(OUTPUT)iio_utils-in.o - $(Q)$(MAKE) $(build)=lsiio - $(OUTPUT)lsiio: $(LSIIO_IN) - $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ - - IIO_EVENT_MONITOR_IN := $(OUTPUT)iio_event_monitor-in.o --$(IIO_EVENT_MONITOR_IN): prepare FORCE -+$(IIO_EVENT_MONITOR_IN): prepare FORCE $(OUTPUT)iio_utils-in.o - $(Q)$(MAKE) $(build)=iio_event_monitor - $(OUTPUT)iio_event_monitor: $(IIO_EVENT_MONITOR_IN) - $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ - - IIO_GENERIC_BUFFER_IN := $(OUTPUT)iio_generic_buffer-in.o --$(IIO_GENERIC_BUFFER_IN): prepare FORCE -+$(IIO_GENERIC_BUFFER_IN): prepare FORCE $(OUTPUT)iio_utils-in.o - $(Q)$(MAKE) $(build)=iio_generic_buffer - $(OUTPUT)iio_generic_buffer: $(IIO_GENERIC_BUFFER_IN) - $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ --- -2.21.0 - - -- cgit v1.2.3