Hello community, here is the log from the commit of package libvpd2 for openSUSE:Factory checked in at 2020-11-24 22:10:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvpd2 (Old) and /work/SRC/openSUSE:Factory/.libvpd2.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvpd2" Tue Nov 24 22:10:12 2020 rev:33 rq:850239 version:2.2.8 Changes: -------- --- /work/SRC/openSUSE:Factory/libvpd2/libvpd2.changes 2020-02-20 14:56:24.334408761 +0100 +++ /work/SRC/openSUSE:Factory/.libvpd2.new.5913/libvpd2.changes 2020-11-24 22:10:29.619385127 +0100 @@ -1,0 +2,13 @@ +Mon Nov 16 10:39:12 UTC 2020 - Michal Suchanek <msucha...@suse.com> + +- Update to version 2.2.8 (jsc#SLE-12939). + - Reduce system load from vpdupdate udev rule + - VpdDbEnv: Make the sqlite operations asynchronous + This will improve `vpdupdate` performance quite a bit. + - Remove upstreamed patches + - udev-rules-don-t-touch-run.vpdupdate-for-ignored-dev.patch + - udev-rules-more-software-devices-to-ignore.patch + - udev-rules-don-t-generate-multiple-vpdupdate-events-.patch + - Update project and source URL + +------------------------------------------------------------------- Old: ---- libvpd-2.2.6.tar.gz udev-rules-don-t-generate-multiple-vpdupdate-events-.patch udev-rules-don-t-touch-run.vpdupdate-for-ignored-dev.patch udev-rules-more-software-devices-to-ignore.patch New: ---- libvpd2-2.2.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvpd2.spec ++++++ --- /var/tmp/diff_new_pack.SIGDhG/_old 2020-11-24 22:10:30.791386213 +0100 +++ /var/tmp/diff_new_pack.SIGDhG/_new 2020-11-24 22:10:30.791386213 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvpd2 # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,15 @@ Name: libvpd2 -Version: 2.2.6 +Version: 2.2.8 Release: 0 Summary: VPD Database access library for lsvpd License: LGPL-2.1-or-later Group: Development/Libraries/Other -URL: https://github.com/open-power-host-os/libvpd -Source: http://downloads.sourceforge.net/project/linux-diag/libvpd/%{version}/libvpd-%{version}.tar.gz -Source2: baselibs.conf +URL: https://github.com/power-ras/libvpd +Source: https://github.com/power-ras/libvpd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: baselibs.conf Patch1: libvpd2.makefile.patch -Patch2: udev-rules-don-t-touch-run.vpdupdate-for-ignored-dev.patch -Patch3: udev-rules-more-software-devices-to-ignore.patch -Patch4: udev-rules-don-t-generate-multiple-vpdupdate-events-.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ ++++++ libvpd-2.2.6.tar.gz -> libvpd2-2.2.8.tar.gz ++++++ ++++ 46180 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/.gitignore new/libvpd-2.2.8/.gitignore --- old/libvpd-2.2.6/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libvpd-2.2.8/.gitignore 2020-11-06 12:02:06.000000000 +0100 @@ -0,0 +1,82 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Normal rules +# +.* +*.o +*.o.* +*.a +*.s +*.mod.c +*.i +*.order +*.gz +*.bz2 +*.lzma +*.zip +*.lzo +*.patch +*.gcno + +# +# Build files +# +/aclocal.m4 +/autom4te.cache/ +/config/ +/config.log +/config.status +/configure +/Makefile +/Makefile.in +/servicelog.spec +.deps +.libs + +# +# git files that we don't want to ignore even it they are dot-files +# +!.gitignore +!.travis.yml + +# stgit generated dirs +patches-* + +# quilt's files +patches +series + +# cscope files +cscope.* +ncscope.* + +# ctags +tags +TAGS + +# gnu global files +GPATH +GRTAGS +GSYMS +GTAGS + +# Libraries +*.lib +*.lo +*.la + +# Shared objects (inc. Windows DLLs) +*.so +*.so.* +*.dylib + +*.orig +*~ +\#*# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/.travis.yml new/libvpd-2.2.8/.travis.yml --- old/libvpd-2.2.6/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libvpd-2.2.8/.travis.yml 2020-11-06 12:02:06.000000000 +0100 @@ -0,0 +1,25 @@ +language: cpp + +os: linux-ppc64le + +sudo: required + +services: docker + +env: + matrix: + - RUN_ON_CONTAINER=fedora-rawhide + - RUN_ON_CONTAINER=ubuntu-20.04 + +install: + - docker build --pull -t ${RUN_ON_CONTAINER} -f libvpd-ci/Dockerfile-${RUN_ON_CONTAINER} . + +script: + - > + docker run + --security-opt seccomp=unconfined + --volume $HOME/.ccache:/root/.ccache + --volume `pwd`:/build + --tmpfs /tmp/ + --rm -t $RUN_ON_CONTAINER + bash -c "./libvpd-ci/build-${RUN_ON_CONTAINER}.sh"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/90-vpdupdate.rules new/libvpd-2.2.8/90-vpdupdate.rules --- old/libvpd-2.2.6/90-vpdupdate.rules 2018-06-12 12:35:22.000000000 +0200 +++ new/libvpd-2.2.8/90-vpdupdate.rules 2020-11-06 12:02:06.000000000 +0100 @@ -1 +1,36 @@ -KERNELS=="*", ACTION=="*", DEVPATH=="/devices/*", RUN+="/bin/touch /run/run.vpdupdate" +DEVPATH!="/devices/*", GOTO="vpd_end" +# See SysFSTreeCollector::filterDevicePath() +DEVPATH=="/devices/virtual/*", GOTO="vpd_end" +DEVPATH=="/devices/system/*", GOTO="vpd_end" +DEVPATH=="/devices/cpu/*", GOTO="vpd_end" +DEVPATH=="/devices/breakpoint/*", GOTO="vpd_end" +DEVPATH=="/devices/tracepoint/*", GOTO="vpd_end" +DEVPATH=="/devices/software/*", GOTO="vpd_end" + +# See SysFSTreeCollector::filterDevice() +ENV{DEVTYPE}=="scsi_target", GOTO="vpd_end" +SUBSYSTEM=="enclosure", GOTO="vpd_end" + +# See SysFSTreeCollector::isDevice() +ENV{DEVTYPE}=="partition", GOTO="vpd_end" + +# More devices that aren't covered by VPD +DEVPATH=="/devices/uprobe/*", GOTO="vpd_end" +DEVPATH=="/devices/kprobe/*", GOTO="vpd_end" +DEVPATH=="/devices/rbd/*", GOTO="vpd_end" + +SUBSYSTEM=="scsi_device", GOTO="vpd_update" +SUBSYSTEM=="scsi_host", GOTO="vpd_update" +# Don't generate extra events, we have one for the scsi_device already +# This rule also skips SCSI block device uevents +# (but the corresponding scsi_device will have triggered vpdupdate). +SUBSYSTEMS=="scsi*", GOTO="vpd_end" + +# virtual NVMe devices (NVMeoF) are skipped because of the rule above +SUBSYSTEM=="nvme", GOTO="vpd_update" +SUBSYSTEM=="nvme-subsystem", GOTO="vpd_update" +SUBSYSTEMS=="nvme*", GOTO="vpd_end" + +LABEL="vpd_update" +RUN+="/bin/touch /run/run.vpdupdate" +LABEL="vpd_end" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/ChangeLog new/libvpd-2.2.8/ChangeLog --- old/libvpd-2.2.6/ChangeLog 2018-06-12 12:35:22.000000000 +0200 +++ new/libvpd-2.2.8/ChangeLog 2020-11-06 12:02:06.000000000 +0100 @@ -1,3 +1,10 @@ +2.2.8 +- VpdDbEnv: Make the sqlite operations asynchronous + +2.2.7 +- Add Travis build support +- Reduce system load from vpdupdate udev rule + 2.2.6 - Changes run.vpdupdate creation path from /var/lib/lsvpd to /run - Improved error handling diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/README new/libvpd-2.2.8/README --- old/libvpd-2.2.6/README 2018-06-12 12:35:22.000000000 +0200 +++ new/libvpd-2.2.8/README 2020-11-06 12:02:06.000000000 +0100 @@ -5,12 +5,7 @@ Source: ------- -http://linux-diag.sf.net/lsvpd.html - -Mailing list: -------------- -linux-diag-de...@lists.sourceforge.net -Info/subscribe : https://lists.sourceforge.net/lists/listinfo/linux-diag-devel +https://github.com/power-ras/libvpd License: -------- @@ -24,7 +19,7 @@ - zlib-devel Binary dependencies: -------------- +-------------------- - sqlite3 - zlib @@ -59,24 +54,32 @@ $ rpmbuild -ba [--target=ppc/ppc64] <path-to-spec-file> +Reporting issues: +----------------- +Create a GitHub issue if you have any request for change, assuming one does +not already exist. Clearly describe the issue including steps to reproduce +if it is a bug. + +How to contribute: +------------------ +If you plan to submit the changes, submit a pull request based on top of +master. Include a descriptive commit message. Changes contributed should +focus on a single issue at a time to the extent possible. + Hacking: -------- -All patches should be sent to the mailing list with linux-kernel style -'Signed-Off-By'. The following git commands are your friends: -- git commit -s -- git format-patch +The following workflow should work for you: +- Fork the repository on GitHub into your account. +- Create a topic branch from where you want to base your work. + This is usually the master branch. +- Make sure you have added the necessary tests for your changes and make sure + all tests pass. +- Push your changes to the topic branch in your fork of the repository. +- Include a descriptive commit message, and each commit should have + linux-kernel style 'Signed-Off-By'. +- Submit a pull request to this repository. You probably want to read the linux Documentation/SubmittingPatches as much of it applies to libvpd. -Submitting patch: ------------------ -We use same mailing list for all Power Linux VPD and diagnostics projects -(ppc64-diag, libvpd, lsvpd, [lib]servicelog). It is common convention to -prefix your subject line with project name. This lets maintainer and other -developers more easily identify patches from patches targeted to other -projects. For example, - - Subject: [libvpd PATCH 01/10] Summary phrase - -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/config/ar-lib new/libvpd-2.2.8/config/ar-lib --- old/libvpd-2.2.6/config/ar-lib 2018-06-12 12:35:37.000000000 +0200 +++ new/libvpd-2.2.8/config/ar-lib 1970-01-01 01:00:00.000000000 +0100 @@ -1,270 +0,0 @@ -#! /bin/sh -# Wrapper for Microsoft lib.exe - -me=ar-lib -scriptversion=2012-03-01.08; # UTC - -# Copyright (C) 2010-2013 Free Software Foundation, Inc. -# Written by Peter Rosin <p...@lysator.liu.se>. -# -# 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, 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, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-autom...@gnu.org> or send patches to -# <automake-patc...@gnu.org>. - - -# func_error message -func_error () -{ - echo "$me: $1" 1>&2 - exit 1 -} - -file_conv= - -# func_file_conv build_file -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv in - mingw) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_at_file at_file operation archive -# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE -# for each of them. -# When interpreting the content of the @FILE, do NOT use func_file_conv, -# since the user would need to supply preconverted file names to -# binutils ar, at least for MinGW. -func_at_file () -{ - operation=$2 - archive=$3 - at_file_contents=`cat "$1"` - eval set x "$at_file_contents" - shift - - for member - do - $AR -NOLOGO $operation:"$member" "$archive" || exit $? - done -} - -case $1 in - '') - func_error "no command. Try '$0 --help' for more information." - ;; - -h | --h*) - cat <<EOF -Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...] - -Members may be specified in a file named with @FILE. -EOF - exit $? - ;; - -v | --v*) - echo "$me, version $scriptversion" - exit $? - ;; -esac - -if test $# -lt 3; then - func_error "you must specify a program, an action and an archive" -fi - -AR=$1 -shift -while : -do - if test $# -lt 2; then - func_error "you must specify a program, an action and an archive" - fi - case $1 in - -lib | -LIB \ - | -ltcg | -LTCG \ - | -machine* | -MACHINE* \ - | -subsystem* | -SUBSYSTEM* \ - | -verbose | -VERBOSE \ - | -wx* | -WX* ) - AR="$AR $1" - shift - ;; - *) - action=$1 - shift - break - ;; - esac -done -orig_archive=$1 -shift -func_file_conv "$orig_archive" -archive=$file - -# strip leading dash in $action -action=${action#-} - -delete= -extract= -list= -quick= -replace= -index= -create= - -while test -n "$action" -do - case $action in - d*) delete=yes ;; - x*) extract=yes ;; - t*) list=yes ;; - q*) quick=yes ;; - r*) replace=yes ;; - s*) index=yes ;; - S*) ;; # the index is always updated implicitly - c*) create=yes ;; - u*) ;; # TODO: don't ignore the update modifier - v*) ;; # TODO: don't ignore the verbose modifier - *) - func_error "unknown action specified" - ;; - esac - action=${action#?} -done - -case $delete$extract$list$quick$replace,$index in - yes,* | ,yes) - ;; - yesyes*) - func_error "more than one action specified" - ;; - *) - func_error "no action specified" - ;; -esac - -if test -n "$delete"; then - if test ! -f "$orig_archive"; then - func_error "archive not found" - fi - for member - do - case $1 in - @*) - func_at_file "${1#@}" -REMOVE "$archive" - ;; - *) - func_file_conv "$1" - $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $? - ;; - esac - done - -elif test -n "$extract"; then - if test ! -f "$orig_archive"; then - func_error "archive not found" - fi - if test $# -gt 0; then - for member - do - case $1 in - @*) - func_at_file "${1#@}" -EXTRACT "$archive" - ;; - *) - func_file_conv "$1" - $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $? - ;; - esac - done - else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done - fi - -elif test -n "$quick$replace"; then - if test ! -f "$orig_archive"; then - if test -z "$create"; then - echo "$me: creating $orig_archive" - fi - orig_archive= - else - orig_archive=$archive - fi - - for member - do - case $1 in - @*) - func_file_conv "${1#@}" - set x "$@" "@$file" - ;; - *) - func_file_conv "$1" - set x "$@" "$file" - ;; - esac - shift - shift - done - - if test -n "$orig_archive"; then - $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $? - else - $AR -NOLOGO -OUT:"$archive" "$@" || exit $? - fi - -elif test -n "$list"; then - if test ! -f "$orig_archive"; then - func_error "archive not found" - fi - $AR -NOLOGO -LIST "$archive" || exit $? -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/config/config.h.in new/libvpd-2.2.8/config/config.h.in --- old/libvpd-2.2.6/config/config.h.in 2018-06-12 12:35:36.000000000 +0200 +++ new/libvpd-2.2.8/config/config.h.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,179 +0,0 @@ -/* config/config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if the `closedir' function returns void instead of `int'. */ -#undef CLOSEDIR_VOID - -/* Define to 1 if you have the <arpa/inet.h> header file. */ -#undef HAVE_ARPA_INET_H - -/* Define to 1 if you have the <ctype.h> header file. */ -#undef HAVE_CTYPE_H - -/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. - */ -#undef HAVE_DIRENT_H - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the <fcntl.h> header file. */ -#undef HAVE_FCNTL_H - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `sqlite3' library (-lsqlite3). */ -#undef HAVE_LIBSQLITE3 - -/* Define to 1 if `lstat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_LSTAT_EMPTY_STRING_BUG - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if you have the `mkdir' function. */ -#undef HAVE_MKDIR - -/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - -/* Define to 1 if you have the <netinet/in.h> header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if you have the `socket' function. */ -#undef HAVE_SOCKET - -/* Define to 1 if you have the <sqlite3.h> header file. */ -#undef HAVE_SQLITE3_H - -/* Define to 1 if you have the `sqlite3_prepare_v2' function. */ -#undef HAVE_SQLITE3_PREPARE_V2 - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_STAT_EMPTY_STRING_BUG - -/* Define to 1 if stdbool.h conforms to C99. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - -/* Define to 1 if you have the <syslog.h> header file. */ -#undef HAVE_SYSLOG_H - -/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - -/* Define to 1 if you have the <sys/ioctl.h> header file. */ -#undef HAVE_SYS_IOCTL_H - -/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - -/* Define to 1 if you have the <sys/param.h> header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the `uname' function. */ -#undef HAVE_UNAME - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if the system has the type `_Bool'. */ -#undef HAVE__BOOL - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -#undef LSTAT_FOLLOWS_SLASHED_SYMLINK - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. - */ -#undef MAJOR_IN_MKDEV - -/* Define to 1 if `major', `minor', and `makedev' are declared in - <sysmacros.h>. */ -#undef MAJOR_IN_SYSMACROS - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc - -/* Define to `unsigned int' if <sys/types.h> does not define. */ -#undef size_t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/config/missing new/libvpd-2.2.8/config/missing --- old/libvpd-2.2.6/config/missing 2018-06-12 12:35:37.000000000 +0200 +++ new/libvpd-2.2.8/config/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2012-06-26.16; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. - -# 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, 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, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to <bug-autom...@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/configure.ac new/libvpd-2.2.8/configure.ac --- old/libvpd-2.2.6/configure.ac 2018-06-12 12:35:22.000000000 +0200 +++ new/libvpd-2.2.8/configure.ac 2020-11-06 12:02:06.000000000 +0100 @@ -4,7 +4,7 @@ AC_PREREQ([2.69]) #base -AC_INIT([libvpd],[2.2.6],[hegdevas...@in.ibm.com]) +AC_INIT([libvpd],[2.2.8],[hegdevas...@linux.vnet.ibm.com]) AC_CONFIG_HEADER([config/config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ #Release version GENERIC_MAJOR_VERSION=2 GENERIC_MINOR_VERSION=2 -GENERIC_MICRO_VERSION=6 +GENERIC_MICRO_VERSION=8 GENERIC_API_VERSION=$GENERIC_MAJOR_VERSION AC_SUBST(GENERIC_API_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/libvpd-ci/Dockerfile-fedora-rawhide new/libvpd-2.2.8/libvpd-ci/Dockerfile-fedora-rawhide --- old/libvpd-2.2.6/libvpd-ci/Dockerfile-fedora-rawhide 1970-01-01 01:00:00.000000000 +0100 +++ new/libvpd-2.2.8/libvpd-ci/Dockerfile-fedora-rawhide 2020-11-06 12:02:06.000000000 +0100 @@ -0,0 +1,6 @@ +FROM fedora:rawhide + +RUN dnf -y install gcc-g++ make sqlite-devel zlib-devel libstdc++-devel +RUN dnf -y install automake rpm-build git libvpd libtool +COPY . /build/ +WORKDIR /build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/libvpd-ci/Dockerfile-ubuntu-20.04 new/libvpd-2.2.8/libvpd-ci/Dockerfile-ubuntu-20.04 --- old/libvpd-2.2.6/libvpd-ci/Dockerfile-ubuntu-20.04 1970-01-01 01:00:00.000000000 +0100 +++ new/libvpd-2.2.8/libvpd-ci/Dockerfile-ubuntu-20.04 2020-11-06 12:02:06.000000000 +0100 @@ -0,0 +1,8 @@ +FROM ubuntu:20.04 +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update -qq +RUN apt-get update -qq && apt-get install -y libsqlite3-dev zlib1g-dev +RUN apt-get update -qq && apt-get install -y automake libtool git make g++ libstdc++-7-dev +COPY . /build/ +WORKDIR /build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/libvpd-ci/build-fedora-rawhide.sh new/libvpd-2.2.8/libvpd-ci/build-fedora-rawhide.sh --- old/libvpd-2.2.6/libvpd-ci/build-fedora-rawhide.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libvpd-2.2.8/libvpd-ci/build-fedora-rawhide.sh 2020-11-06 12:02:06.000000000 +0100 @@ -0,0 +1,15 @@ +#!/bin/bash + +set -uo pipefail +set -e +set -vx +MAKE_J=$(grep -c processor /proc/cpuinfo) + +./bootstrap.sh +./configure +make -j $MAKE_J +make -j $MAKE_J check +mkdir -p /root/rpmbuild/SOURCES/ +make dist-gzip +cp *.tar.gz /root/rpmbuild/SOURCES/ +rpmbuild -ba libvpd.spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/libvpd-ci/build-ubuntu-20.04.sh new/libvpd-2.2.8/libvpd-ci/build-ubuntu-20.04.sh --- old/libvpd-2.2.6/libvpd-ci/build-ubuntu-20.04.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libvpd-2.2.8/libvpd-ci/build-ubuntu-20.04.sh 2020-11-06 12:02:06.000000000 +0100 @@ -0,0 +1,12 @@ +#!/bin/bash + +set -uo pipefail +set -e +set -vx + +MAKE_J=$(grep -c processor /proc/cpuinfo) + +./bootstrap.sh +./configure +make -j $MAKE_J +make -j $MAKE_J check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/libvpd.spec.in new/libvpd-2.2.8/libvpd.spec.in --- old/libvpd-2.2.6/libvpd.spec.in 2018-06-12 12:35:22.000000000 +0200 +++ new/libvpd-2.2.8/libvpd.spec.in 2020-11-06 12:02:06.000000000 +0100 @@ -9,9 +9,9 @@ Group: System Environment/Libraries License: LGPLv2+ Vendor: IBM Corp. -ExclusiveArch: ppc64 ppc ppc64le -URL: http://linux-diag.sf.net/lsvpd.html -Source: http://downloads.sourceforge.net/linux-diag/%{name}/%{version}/%{name}-%{version}.tar.gz +ExclusiveArch: ppc64 ppc ppc64le +URL: https://github.com/power-ras/%{name}/releases +Source: https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: sqlite-devel zlib-devel libstdc++-devel BuildRequires: libtool automake @@ -64,6 +64,8 @@ %{_libdir}/pkgconfig/libvpd_cxx-2.pc %changelog +* Fri Nov 06 2020 Vasant Hegde <hegdevas...@linux.vnet.ibm.com> 2.2.8 +- VpdDbEnv: Make the sqlite operations asynchronous * Tue Jun 12 2018 Vasant Hegde <hegdevas...@linux.vnet.ibm.com> 2.2.6 - Changes run.vpdupdate creation path from /var/lib/lsvpd to /run diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvpd-2.2.6/src/vpddbenv.cpp new/libvpd-2.2.8/src/vpddbenv.cpp --- old/libvpd-2.2.6/src/vpddbenv.cpp 2018-06-12 12:35:22.000000000 +0200 +++ new/libvpd-2.2.8/src/vpddbenv.cpp 2020-11-06 12:02:06.000000000 +0100 @@ -61,6 +61,9 @@ struct stat st; bool dbExists; + sqlite3_stmt *pstmt; + const char *out; + string async = "PRAGMA synchronous = OFF"; mDbPath = mEnvDir + "/" + mDbFileName; dbExists = (stat( mDbPath.c_str( ), &st )) == 0; @@ -83,8 +86,6 @@ if( !dbExists ) { - sqlite3_stmt *pstmt; - const char *out; ostringstream sql; sql << "CREATE TABLE " << TABLE_NAME << " ( " << ID << " TEXT NOT NULL UNIQUE, " << DATA << " BLOB NOT NULL );"; @@ -107,8 +108,13 @@ } sqlite3_finalize( pstmt ); } - return; + SQLITE3_PREPARE( mpVpdDb, async.c_str( ), async.length( ) + 1, + &pstmt, &out ); + sqlite3_step( pstmt ); + sqlite3_finalize( pstmt ); + + return; CON_ERR: l.log( message.str( ), LOG_ERR ); VpdException ve( message.str( ) ); @@ -261,6 +267,10 @@ message << "SQLITE Error " << rc << ": " << sqlite3_errmsg( mpVpdDb ) << endl; l.log( message.str( ), LOG_ERR ); + + if ( rc == SQLITE_BUSY ) + l.log( "Another instance of vpdupdate running." ); + sqlite3_finalize( pstmt ); return false; } @@ -302,6 +312,10 @@ message << "SQLITE Error " << rc << ": " << sqlite3_errmsg( mpVpdDb ) << endl; l.log( message.str( ), LOG_ERR ); + + if ( rc == SQLITE_BUSY ) + l.log( "Another instance of vpdupdate running." ); + sqlite3_finalize( pstmt ); return false; } _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org