From patchwork Wed Dec 20 22:58:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kacur X-Patchwork-Id: 757753 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CED34D5A4 for ; Wed, 20 Dec 2023 22:58:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KvyBOAst" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-425860bf009so856161cf.2 for ; Wed, 20 Dec 2023 14:58:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703113136; x=1703717936; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=Uu+qRp5dyZxY5G9MfTfwH7br7tNcS3khKSnkahlW47k=; b=KvyBOAsteSYKVhiWm9IZ/nQy1BJyNkYxLgMFPe+b/Lk8yk1dHUblPpsAVI8rlVdJna 9zX6RbDGHfSes1vlnBcrSmM3dXx9lE6f2nrfPcBmRpGTpZSjA6tPfbLpyZjfLTVZyTnX sVY09rGor5Q3wcxtNXnA+reJ0xjk0r1Ntl9U5sZiFu1S0ybIclaXj6cxT69UijX71n8Z gGu4lsYAOGYOFeQ/h/iaRfqsMVWBteB4ke/W3YJT4ExyHp54Lxy2ara3MrZpTpqZlyFU UqrhcK+IC52J50GzcFwdih/pgaDc+XwJE6V1vK0uGxPzstYhjItwdx533nZ16gPlrv73 DJTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703113136; x=1703717936; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Uu+qRp5dyZxY5G9MfTfwH7br7tNcS3khKSnkahlW47k=; b=Jh0ZRX7kWCBC/kaWi7C6rlRMmig9V3ZdQEqDzPpoG2aUtPTqMCfi05VXF13JZXDZhY 7DWIdizfT+8C8UpRDN8B69DKFLbEp4aA633BTbRNg3QJTIj0kk1KMR8h43VoiTqD/LeN L21hZlbrYMvERYs/zdoxH27w3KhVN3G97RDBgRoRvKwlB25MJJ6DUfTjATtLHsRiiwPP rjVZrtNAtx2u9mWO9uzilXyiixKDUtAbcV1sNIFyph9MTsPxTep9T1jiYpne0q55hczB e2L6TMalzuYSI35mZSF0SWZDAMK3eFc+NF1Vl8qB1qqTYqCD2581YaKe9W5UZP/0qZjo KSlA== X-Gm-Message-State: AOJu0YyUgNqidnNukHQCo/W4cjz4wnZjcfnMf/kOMAO9qkhw9+Cj9V/Z ezalUulZb9oqlVwDutaV4O6V09H0ZAU= X-Google-Smtp-Source: AGHT+IENeXmVgiq2/LnfRp9BmjK3A2obhKxHCXs/S/KdLpYZvwejCmcY4izvO2PDqaTQY1YRUeLTLw== X-Received: by 2002:a05:622a:509:b0:423:7dde:35b2 with SMTP id l9-20020a05622a050900b004237dde35b2mr25635370qtx.59.1703113136486; Wed, 20 Dec 2023 14:58:56 -0800 (PST) Received: from fionn.home ([174.88.88.134]) by smtp.gmail.com with ESMTPSA id eo12-20020a05622a544c00b00427692bc384sm277488qtb.66.2023.12.20.14.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:58:55 -0800 (PST) Sender: John Kacur From: John Kacur To: RT Cc: John Kacur Subject: [PATCH 1/2] rteval: Makefile: More rpm cleanups Date: Wed, 20 Dec 2023 17:58:24 -0500 Message-ID: <20231220225825.171222-1-jkacur@redhat.com> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: linux-rt-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Afer having removed the upstream specfile, there were still a few references to rpms in the Makefile. These are not necessary because any work with rpms can be done with modern rpm tools and are typically done by distributions Also test whether directory 'run' exists since it may have been removed by make realclean, and create it if it does not Signed-off-by: John Kacur --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ee4cca555b95..b8bed643f760 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ load: $(PYTHON) rteval-cmd --onlyload -D -L -v --workdir=./run --loaddir=$(HERE)/loadsource -f $(HERE)/rteval/rteval.conf -i $(HERE)/rteval sysreport: + [ -d $(HERE)/run ] || mkdir run $(PYTHON) rteval-cmd -D -v --workdir=$(HERE)/run --loaddir=$(HERE)/loadsource --duration=$(D) -i $(HERE)/rteval --sysreport clean: @@ -39,7 +40,7 @@ clean: realclean: clean [ -f $(XMLRPCDIR)/Makefile ] && make -C $(XMLRPCDIR) maintainer-clean || echo -n - rm -rf run rpm + rm -rf run install: install_loads install_rteval @@ -73,13 +74,6 @@ rteval-xmlrpc-$(XMLRPCVER).tar.gz : make distcheck cp $(XMLRPCDIR)/rteval-xmlrpc-$(XMLRPCVER).tar.gz $(HERE)/ -rpm_prep: - rm -rf rpm - mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} - -rpms rpm: rpm_prep rtevalrpm loadrpm - - help: @echo "" @echo "rteval Makefile targets:" @@ -88,6 +82,7 @@ help: @echo " tarfile: create the source tarball" @echo " install: install rteval locally" @echo " clean: cleanup generated files" + @echo " realclean: Same as clean plus directory run" @echo " sysreport: do a short testrun and generate sysreport data" @echo " tags: generate a ctags file" @echo " cleantags: remove the ctags file" From patchwork Wed Dec 20 22:58:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kacur X-Patchwork-Id: 756787 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8CDC4E1B3 for ; Wed, 20 Dec 2023 22:58:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V7hGOejt" Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-42788536cddso898131cf.2 for ; Wed, 20 Dec 2023 14:58:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703113138; x=1703717938; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=Y0gjTRcq3CQfpV4Cp74tfDacn2mItIie98i0d5rr0C8=; b=V7hGOejtgS6rn9SWJFUSmTe5I6/3IQ96pK4D+aZQ/vI6ARfFw6XinefypE9DlNLmqB MujjHIFUc7KbwouTGbqF7WQCKubrEuK5CmxAiPGuSZpdIeXZ5P3vMW5lTrVAER1j1E3t yc3ojPnwds2n5v838QimodySIKS7+qX1hML132yCCBIFbLF5ncR/DEWO9x/dmhAepnWD TiQiuM9xilJgEXvmAJR1dKT8DFaQ++0NQz/+0JBYhXQpwfOVScsuSHsu58TFl2JSvG4x 0LQXmIxgKDskIxsNKx2w5JBPtfDjivsVXgpvE01J8DdqJZrO2KIJv4Zc6YslhpHRMNYf FsvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703113138; x=1703717938; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Y0gjTRcq3CQfpV4Cp74tfDacn2mItIie98i0d5rr0C8=; b=DuGMJvGfnAih15TF3S9LyVBHzbEQsLt2dwOIVz/aQb5OY658Gc1VP072pSd0kSaTbG rtKOhaOgQlxmFg0kPQNf6hkh+2iBAy+XQUZBA4trngc7BDZGOYQ0tnRUl335LTSY9NoW 4VlhmfU9Bd63Yog0js0kMeSO9cLfTxdmXTP+8LfvyLFiiYcU5T2jnK3okvFRfRGHGXLl 7OO9mzI32nvscdNoyb3m+QkKrMZ+/MylC0JGBgY0R/1D2TIm0rMntagTFqKxfimYy01p uCtXSTVhpoMWK5e/YC44rXNS01+OM2Ys7G7NDx7kYTeKsFhuVe892rWXDCjvRPvKf4Wj yj+Q== X-Gm-Message-State: AOJu0YxNjbypIe9xUU2ECZ+OhdruZ22410P+ZaK3nZj1Dkpued38IhiH 3r5rKL8WEeimP7xa+Xk9b5D/Gy0+24c= X-Google-Smtp-Source: AGHT+IHQg/0q5rQty2vCl7mjCp4t8HS8WYgcoCu9ruW0M/mdu4cuCARHZAVqHdKbb+YXFj11jZwBSA== X-Received: by 2002:a05:622a:138b:b0:425:4043:18bf with SMTP id o11-20020a05622a138b00b00425404318bfmr27591210qtk.114.1703113137757; Wed, 20 Dec 2023 14:58:57 -0800 (PST) Received: from fionn.home ([174.88.88.134]) by smtp.gmail.com with ESMTPSA id eo12-20020a05622a544c00b00427692bc384sm277488qtb.66.2023.12.20.14.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:58:57 -0800 (PST) Sender: John Kacur From: John Kacur To: RT Cc: John Kacur Subject: [PATCH 2/2] rteval: Disable use of python-dmidecode Date: Wed, 20 Dec 2023 17:58:25 -0500 Message-ID: <20231220225825.171222-2-jkacur@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231220225825.171222-1-jkacur@redhat.com> References: <20231220225825.171222-1-jkacur@redhat.com> Precedence: bulk X-Mailing-List: linux-rt-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 python-dmidecode is not being maintained upstream. For now just disable it's use in rteval since it is useful but not essential information for running rteval In the future look at generating this info directly using dmidecode. Signed-off-by: John Kacur --- README | 6 ------ doc/installing.txt | 9 --------- rteval/sysinfo/dmi.py | 4 ++-- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/README b/README index a5cf98344a46..b352d7f66ad2 100644 --- a/README +++ b/README @@ -19,15 +19,9 @@ Rteval requires the following packages to run: Python >= 3.0 http://www.python.org/download/ -python-ethtool - git://git.kernel.org/pub/scm/linux/kernel/git/acme/python-ethtool.git - python-lxml http://lxml.de/ -python-dmidecode - http://www.ohloh.net/p/python-dmidecode - libxml2-python http://xmlsoft.org/ diff --git a/doc/installing.txt b/doc/installing.txt index ff2d43cb9481..227249bbc9ed 100644 --- a/doc/installing.txt +++ b/doc/installing.txt @@ -1,18 +1,10 @@ The rteval utility requires some external software libraries to run properly. These are: -python-ethtool - A python library to query network interfaces - git://git.kernel.org/pub/scm/linux/kernel/git/acme/python-ethtool.git - python-lxml A python library to parse XML files and XSLT stylesheets http://lxml.de/ -python-dmidecode - A python library used to access DMI table information - http://www.autonomy.net.au/display/pydmi/Home - libxml2-python A python library to parse XML files http://xmlsoft.org/ @@ -22,7 +14,6 @@ rt-tests git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git -$ sudo yum install python-{dmidecode,ethtool) $ git clone \ git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git $ cd rt-tests && sudo make prefix=/usr install diff --git a/rteval/sysinfo/dmi.py b/rteval/sysinfo/dmi.py index e8285d263fe6..c01a0eef1435 100644 --- a/rteval/sysinfo/dmi.py +++ b/rteval/sysinfo/dmi.py @@ -15,8 +15,8 @@ from rteval import xmlout from rteval import rtevalConfig try: - import dmidecode - dmidecode_avail = True + # import dmidecode + dmidecode_avail = False except ModuleNotFoundError: dmidecode_avail = False