Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qclib for openSUSE:Factory checked in at 2023-06-01 17:18:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qclib (Old) and /work/SRC/openSUSE:Factory/.qclib.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qclib" Thu Jun 1 17:18:53 2023 rev:14 rq:1089695 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qclib/qclib.changes 2022-09-22 14:49:15.570348740 +0200 +++ /work/SRC/openSUSE:Factory/.qclib.new.2531/qclib.changes 2023-06-01 17:18:54.345941777 +0200 @@ -1,0 +2,11 @@ +Tue May 30 06:23:30 UTC 2023 - Nikolay Gueorguiev <[email protected]> + +- Upgrade to version 2.4.0 (jsc#PED-3284, jsc#PED-3285) + * Changes: + - Recognize single frame models and rackable models + - zname: Add support for option --json + - qc_dump: Add trace and JSON dump to .tgz +- Amended the .spec file for the error "static-library-without-debuginfo" + * Removed the line: gzip -9 %{buildroot}/%{_mandir}/man8/* + +------------------------------------------------------------------- Old: ---- qclib-2.3.2.tar.gz New: ---- qclib-2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qclib.spec ++++++ --- /var/tmp/diff_new_pack.tocVVy/_old 2023-06-01 17:18:54.797944457 +0200 +++ /var/tmp/diff_new_pack.tocVVy/_new 2023-06-01 17:18:54.801944480 +0200 @@ -1,7 +1,7 @@ # # spec file for package qclib # -# Copyright (c) 2017-2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,10 @@ # +%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects + Name: qclib -Version: 2.3.2 +Version: 2.4.0 Release: 0 Summary: Query Capacity library License: BSD-3-Clause @@ -28,7 +30,7 @@ BuildRequires: doxygen BuildRequires: gcc-c++ ExclusiveArch: s390 s390x -%if 0%{?suse_version} > 1300 +%if 0%{?suse_version} > 1500 BuildRequires: glibc-devel-static %else BuildRequires: glibc-devel @@ -107,7 +109,6 @@ %install %make_install V=1 -gzip -9 %{buildroot}/%{_mandir}/man8/* make installdoc DESTDIR=%{buildroot} V=1 %post -n libqc2 -p /sbin/ldconfig ++++++ qclib-2.3.2.tar.gz -> qclib-2.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/Makefile new/qclib-2.4.0/Makefile --- old/qclib-2.3.2/Makefile 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/Makefile 2023-04-08 23:49:23.000000000 +0200 @@ -4,7 +4,7 @@ # major : Backwards compatible changes to the API # minor : Additions leaving the API unmodified # bugfix: Bugfixes only -VERSION = 2.3.2 +VERSION = 2.4.0 VERM = $(shell echo $(VERSION) | cut -d '.' -f 1) CFLAGS ?= -g -Wall -O2 LDFLAGS ?= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/README.md new/qclib-2.4.0/README.md --- old/qclib-2.3.2/README.md 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/README.md 2023-04-08 23:49:23.000000000 +0200 @@ -87,6 +87,13 @@ Release History --------------- +* __v2.4.0 (2023-04-08)__ + + _Changes_: + - Recognize single frame models and rackable models + - `zname`: Add support for option `--json` + - `qc_dump`: Add trace and JSON dump to `.tgz` + * __v2.3.2 (2022-09-19)__ _Changes_: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/qc_dump new/qclib-2.4.0/qc_dump --- old/qclib-2.3.2/qc_dump 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/qc_dump 2023-04-08 23:49:23.000000000 +0200 @@ -5,16 +5,21 @@ qcbin="zname"; if [ $# -eq 1 ]; then qcbin="$1"; -fi - -if [ ! -x $qcbin ]; then - echo "Error: $qcbin not found or not executable"; - echo "Note: You can specify an arbitrary executable as an argument to qc_dump"; - exit 2; + if [ ! -x $qcbin ]; then + echo "Error: $qcbin not found or not executable"; + exit 1; + fi +else + which $qcbin > /dev/null; + if [ $? -ne 0 ]; then + echo "Error: $qcbin not found or not executable"; + echo "Note: You can specify an arbitrary executable as an argument to qc_dump"; + exit 2; + fi fi echo "Executing $qcbin..."; -QC_DEBUG=2 $qcbin >/tmp/ref_result.txt; +QC_DEBUG=2 $qcbin --json >/tmp/ref_result.txt; if [ $? -ne 0 ]; then echo "$qcbin failed - good thing we're creating a dump"; @@ -31,12 +36,13 @@ mv ref_result.txt $dump; lscpu -e > $dump/lscpu.output; hostname > $dump/hostname.output; +cp `ls -rtd qclib-?????? | tail -1` $dump; tgt=${dump%.*}.tgz; if [ -e /dev/vmcp ]; then vmcp QUERY MULTITHREAD > $dump/QUERY_MULTITHREAD.output; fi echo "Creating package..."; -tar cvfz $tgt $dump| sed -e 's/^/ /g'; +tar cvfz $tgt $dump | sed -e 's/^/ /g'; echo "Dump written to $PWD/$tgt"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/query_capacity.c new/qclib-2.4.0/query_capacity.c --- old/qclib-2.3.2/query_capacity.c 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/query_capacity.c 2023-04-08 23:49:23.000000000 +0200 @@ -523,39 +523,44 @@ struct qc_mtype { int type; - char *zname; // IBM Z - char *lname; // LinuxONE + char *zname; // IBM Z + char *lname; // LinuxONE + char *zrack_type; // IBM Z rack mount model type + char *zrack_name; + char *lrack_type; // LinuxONE rack mount model type + char *lrack_name; }; static struct qc_mtype mtypes[] = { // IBM Z LinuxONE - {4381, "IBM 4381", NULL}, - {3090, "IBM 3090", NULL}, - {9221, "IBM S/390 9221", NULL}, - {9021, "IBM ES/9000 9021", NULL}, - {2003, "IBM S/390 Multiprise 2000", NULL}, - {3000, "IBM S/390 StarterPak 3000", NULL}, - {9672, "IBM S/390 9672", NULL}, - {2066, "IBM zSeries 800", NULL}, - {2064, "IBM zSeries 900", NULL}, - {2086, "IBM zSeries 890", NULL}, - {2084, "IBM zSeries 990", NULL}, - {2096, "IBM System z9 BC", NULL}, - {2094, "IBM System z9 EC", NULL}, - {2098, "IBM System z10 BC", NULL}, - {2097, "IBM System z10 EC", NULL}, - {2818, "IBM zEnterprise 114", NULL}, - {2817, "IBM zEnterprise 196", NULL}, - {2827, "IBM zEnterprise EC12", NULL}, - {2828, "IBM zEnterprise BC12", NULL}, - {2965, "IBM z13s", "IBM LinuxONE Rockhopper"}, - {2964, "IBM z13", "IBM LinuxONE Emperor"}, - {3907, "IBM z14 ZR1", "IBM LinuxONE Rockhopper II"}, - {3906, "IBM z14", "IBM LinuxONE Emperor II"}, - {8561, "IBM z15", "IBM LinuxONE III"}, - {8562, "IBM z15 Model T02", "IBM LinuxONE III Model LT2"}, - {3931, "IBM z16", "IBM LinuxONE Emperor 4"}, - {0, NULL, NULL} + {4381, "IBM 4381", NULL, NULL, NULL, NULL, NULL}, + {3090, "IBM 3090", NULL, NULL, NULL, NULL, NULL}, + {9221, "IBM S/390 9221", NULL, NULL, NULL, NULL, NULL}, + {9021, "IBM ES/9000 9021", NULL, NULL, NULL, NULL, NULL}, + {2003, "IBM S/390 Multiprise 2000", NULL, NULL, NULL, NULL, NULL}, + {3000, "IBM S/390 StarterPak 3000", NULL, NULL, NULL, NULL, NULL}, + {9672, "IBM S/390 9672", NULL, NULL, NULL, NULL, NULL}, + {2066, "IBM zSeries 800", NULL, NULL, NULL, NULL, NULL}, + {2064, "IBM zSeries 900", NULL, NULL, NULL, NULL, NULL}, + {2086, "IBM zSeries 890", NULL, NULL, NULL, NULL, NULL}, + {2084, "IBM zSeries 990", NULL, NULL, NULL, NULL, NULL}, + {2096, "IBM System z9 BC", NULL, NULL, NULL, NULL, NULL}, + {2094, "IBM System z9 EC", NULL, NULL, NULL, NULL, NULL}, + {2098, "IBM System z10 BC", NULL, NULL, NULL, NULL, NULL}, + {2097, "IBM System z10 EC", NULL, NULL, NULL, NULL, NULL}, + {2818, "IBM zEnterprise 114", NULL, NULL, NULL, NULL, NULL}, + {2817, "IBM zEnterprise 196", NULL, NULL, NULL, NULL, NULL}, + {2827, "IBM zEnterprise EC12", NULL, NULL, NULL, NULL, NULL}, + {2828, "IBM zEnterprise BC12", NULL, NULL, NULL, NULL, NULL}, + {2965, "IBM z13s", "IBM LinuxONE Rockhopper", NULL, NULL, NULL, NULL}, + {2964, "IBM z13", "IBM LinuxONE Emperor", NULL, NULL, NULL, NULL}, + {3907, "IBM z14 ZR1", "IBM LinuxONE Rockhopper II", NULL, NULL, NULL, NULL}, + {3906, "IBM z14", "IBM LinuxONE Emperor II", NULL, NULL, NULL, NULL}, + {8561, "IBM z15", "IBM LinuxONE III", NULL, NULL, NULL, NULL}, + {8562, "IBM z15 Model T02", "IBM LinuxONE III Model LT2", NULL, NULL, NULL, NULL}, + {3931, "IBM z16", "IBM LinuxONE Emperor 4", NULL, NULL, NULL, NULL}, + {3932, "IBM z16 A02", "IBM LinuxONE Rockhopper 4", "AGZ", "IBM z16 AGZ", "AGL", "IBM LinuxONE Rockhopper 4"}, + {0, NULL, NULL, NULL, NULL, NULL, NULL} }; static int qc_post_process_ziip_thrds(struct qc_handle *hdl) { @@ -582,12 +587,17 @@ cpuid = atoi(str); for (type = mtypes; type->type; ++type) { if (cpuid == type->type) { - if (type->lname && - (str = qc_get_attr_value_string(hdl, qc_model)) != NULL && - *str == 'L') { + if ((str = qc_get_attr_value_string(hdl, qc_model)) == NULL) + goto out; + if (type->lname && *str == 'L') { str = type->lname; - family = QC_TYPE_FAMILY_LINUXONE; - } else + family = QC_TYPE_FAMILY_LINUXONE; + } else if (type->lrack_type && strncmp(str, type->lrack_type, 3) == 0) { + str = type->lrack_name; + family = QC_TYPE_FAMILY_LINUXONE; + } else if (type->zrack_type && strncmp(str, type->zrack_type, 3) == 0) + str = type->zrack_name; + else str = type->zname; if (qc_set_attr_string(hdl, qc_type_name, str, ATTR_SRC_POSTPROC) || qc_set_attr_int(hdl, qc_type_family, family, ATTR_SRC_POSTPROC)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/query_capacity.h new/qclib-2.4.0/query_capacity.h --- old/qclib-2.3.2/query_capacity.h 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/query_capacity.h 2023-04-08 23:49:23.000000000 +0200 @@ -5,7 +5,7 @@ #ifndef QUERY_CAPACITY #define QUERY_CAPACITY -#define QC_VERSION "2.3.2" +#define QC_VERSION "2.4.0" /* Build Customization */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/zhypinfo.8 new/qclib-2.4.0/zhypinfo.8 --- old/qclib-2.3.2/zhypinfo.8 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/zhypinfo.8 2023-04-08 23:49:23.000000000 +0200 @@ -52,8 +52,9 @@ Print usage information and exit. .TP .BR "\-j, \-\-json" -Dump all available data in JSON format. Known limitation: No character set -conversion or proper escaping is performed. +Dump all available data in JSON format. +.br +Known limitation: No character set conversion or proper escaping is performed. .TP .BR "\-l, \-\-layers" Print number of layers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/zname.8 new/qclib-2.4.0/zname.8 --- old/qclib-2.3.2/zname.8 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/zname.8 2023-04-08 23:49:23.000000000 +0200 @@ -25,11 +25,16 @@ .BR "\-c, \-\-capacity" Print capacity information. .TP +.BR "\-h, \-\-help" +Print usage information and exit. +.TP .BR "\-i, \-\-cpuid" Print the CPU identifier. .TP -.BR "\-h, \-\-help" -Print usage information and exit. +.BR "\-j, \-\-json" +Dump all available data in JSON format. +.br +Known limitation: No character set conversion or proper escaping is performed. .TP .BR "\-m, \-\-model" Print model information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/zname.c new/qclib-2.4.0/zname.c --- old/qclib-2.3.2/zname.c 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/zname.c 2023-04-08 23:49:23.000000000 +0200 @@ -53,6 +53,7 @@ printf(" -c, --capacity Print capacity information\n"); printf(" -h, --help Print usage information and exit\n"); printf(" -i, --cpuid Print the CPU identifier\n"); + printf(" -j, --json Dump all available data in JSON format\n"); printf(" -m, --model Print model information\n"); printf(" -n, --name Print the model name (default)\n"); printf(" -u, --manufacturer Print the manufacturer\n"); @@ -70,6 +71,7 @@ { "capacity", no_argument, NULL, 'c'}, { "cpuid", no_argument, NULL, 'i'}, { "help", no_argument, NULL, 'h'}, + { "json", no_argument, NULL, 'j'}, { "manufacturer", no_argument, NULL, 'u'}, { "model", no_argument, NULL, 'm'}, { "name", no_argument, NULL, 'n'}, @@ -78,9 +80,9 @@ }; int layers, i, type, opts = 0, rc = 0; void *hdl = NULL; - int c; + int c, json = 0; - while ((c = getopt_long(argc, argv, "achimnuv", long_options, NULL)) != EOF) { + while ((c = getopt_long(argc, argv, "achijmnuv", long_options, NULL)) != EOF) { switch (c) { case 'a': opts |= OPTS_ALL; break; @@ -90,6 +92,8 @@ return 0; case 'i': opts |= OPTS_CPUID; break; + case 'j': json = 1; + break; case 'm': opts |= OPTS_MODEL; break; case 'n': opts |= OPTS_NAME; @@ -102,12 +106,24 @@ return 1; } } - if (!opts) - opts = OPTS_NAME; + if (json && opts) { + fprintf(stderr, "Error: Specifiy either one of the options to print info, or --json\n"); + rc = 2; + goto out; + } if ((rc = get_handle(&hdl, &layers)) != 0) goto out; + if (json) { + qc_export_json(hdl); + rc = 0; + goto out; + } + + if (!opts) + opts = OPTS_NAME; + for (i = 0; i < layers; i++) { if (qc_get_attribute_int(hdl, qc_layer_type_num, i, &type) <= 0) { fprintf(stderr, "Error: Failed to retrieve layer type information\n");
