From d8686661d8661c5eb2cce1676880f71b5f5cbe48 Mon Sep 17 00:00:00 2001 From: Yushan Zhou Date: Sun, 18 Sep 2022 00:41:31 +0800 Subject: [PATCH] perf spec: remove perf obj default The bash script mkmakefile generates Makefile which includes itself. It leads to dead cycle when build rpm packages. Signed-off-by: Yushan Zhou --- package/arm/perf-tlinux.spec | 14 -------------- package/default/perf-tools-tlinux.spec | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/package/arm/perf-tlinux.spec b/package/arm/perf-tlinux.spec index ecdd4e512..088548b28 100644 --- a/package/arm/perf-tlinux.spec +++ b/package/arm/perf-tlinux.spec @@ -78,20 +78,6 @@ if [ $num_processor -gt 8 ]; then num_processor=8 fi -type_name=default - -objdir=../%{name}-%{version}-obj-${type_name} -[ -d ${objdir} ] || mkdir ${objdir} -bash scripts/mkmakefile $PWD ${objdir} 2 6 -if [ "$no_sign" != "yes" ]; then -cp ./package/default/config.${type_name} ${objdir}/.config -else -cp ./package/default/config.${type_name}_nosign ${objdir}/.config -fi -localversion='"'-`echo %{tagged_name}|cut -d- -f3-`%{?dist}'"' -sed -i -e 's/CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION='$localversion'/' ${objdir}/.config - - %global perf_make make %{?_smp_mflags} -C tools/perf -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 prefix=%{_prefix} # perf %{perf_make} all diff --git a/package/default/perf-tools-tlinux.spec b/package/default/perf-tools-tlinux.spec index 70f7c5ff8..362361bc3 100644 --- a/package/default/perf-tools-tlinux.spec +++ b/package/default/perf-tools-tlinux.spec @@ -115,20 +115,6 @@ if [ $num_processor -gt 8 ]; then num_processor=8 fi -type_name=default - -objdir=../%{name}-%{version}-obj-${type_name} -[ -d ${objdir} ] || mkdir ${objdir} -bash scripts/mkmakefile $PWD ${objdir} 2 6 -if [ "$no_sign" != "yes" ]; then -cp ./package/default/config.${type_name} ${objdir}/.config -else -cp ./package/default/config.${type_name}_nosign ${objdir}/.config -fi -localversion='"'-`echo %{tagged_name}|cut -d- -f3-`%{?dist}'"' -sed -i -e 's/CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION='$localversion'/' ${objdir}/.config - - %global perf_make make %{?_smp_mflags} -C tools/perf -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 prefix=%{_prefix} # perf %{perf_make} all