From f8ccce2c7a0c1323e0721f503322df525dd5b139 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Mar 2021 12:22:12 +0100 Subject: [PATCH] test-data/phony-guests: Fix phony RPM database, fix virt-inspector test. libguestfs 1.45.3 now reads the RPM database using librpm, which means our old phony database created by db_dump can no longer work. Instead provide a real (but very minimal) sqlite database. This commit also fixes the virt-inspector test since the RPM database contents are now different. (cherry picked from commit 46bf6fb473889ed28bd7220476120edcda47ae07) --- inspector/expected-fedora-luks.img.xml | 208 +++++++++++++++++++++++-- inspector/expected-fedora.img.xml | 208 +++++++++++++++++++++++-- 2 files changed, 398 insertions(+), 18 deletions(-) diff --git a/inspector/expected-fedora-luks.img.xml b/inspector/expected-fedora-luks.img.xml index df6060a73..72cddaf88 100644 --- a/inspector/expected-fedora-luks.img.xml +++ b/inspector/expected-fedora-luks.img.xml @@ -30,22 +30,212 @@ - test1 - 1.0 - 1.fc14 + basesystem + 11 + 10.fc33 + noarch + (none) + The skeleton package which defines a simple Fedora system + Basesystem defines the components of a basic Fedora system +(for example, the package installation order to use during bootstrapping). +Basesystem should be in every installation of a system, and it +should never be removed. + + + bash + 5.0.17 + 2.fc33 + x86_64 + https://www.gnu.org/software/bash + The GNU Bourne Again shell + The GNU Bourne Again shell (Bash) is a shell or command language +interpreter that is compatible with the Bourne shell (sh). Bash +incorporates useful features from the Korn shell (ksh) and the C shell +(csh). Most sh scripts can be run by bash without modification. + + + fedora-gpg-keys + 33 + 3 + noarch + https://fedoraproject.org/ + Fedora RPM keys + This package provides the RPM signature keys. + + + fedora-release + 33 + 3 + noarch + https://fedoraproject.org/ + Fedora release files + Fedora release files such as various /etc/ files that define the release +and systemd preset files that determine which services are enabled by default. + + + fedora-release-common + 33 + 3 + noarch + https://fedoraproject.org/ + Fedora release files + Release files common to all Editions and Spins of Fedora + + + fedora-release-identity-basic + 33 + 3 + noarch + https://fedoraproject.org/ + Package providing the basic Fedora identity + Provides the necessary files for a Fedora installation that is not identifying +itself as a particular Edition or Spin. + + + fedora-repos + 33 + 3 + noarch + https://fedoraproject.org/ + Fedora package repositories + Fedora package repository files for yum and dnf along with gpg public keys. + + + filesystem + 3.14 + 3.fc33 + x86_64 + https://pagure.io/filesystem + The basic directory layout for a Linux system + The filesystem package is one of the basic packages that is installed +on a Linux system. Filesystem contains the basic directory layout +for a Linux operating system, including the correct permissions for +the directories. + + + glibc + 2.32 + 4.fc33 + x86_64 + http://www.gnu.org/software/glibc/ + The GNU libc libraries + The glibc package contains standard libraries which are used by +multiple programs on the system. In order to save disk space and +memory, as well as to make upgrading easier, common system code is +kept in one place and shared between programs. This particular package +contains the most important sets of shared libraries: the standard C +library and the standard math library. Without these two libraries, a +Linux system will not function. + + + glibc-all-langpacks + 2.32 + 4.fc33 + x86_64 + http://www.gnu.org/software/glibc/ + All language packs for glibc. + + + glibc-common + 2.32 + 4.fc33 x86_64 + http://www.gnu.org/software/glibc/ + Common binaries and locale data for glibc + The glibc-common package includes common binaries for the GNU libc +libraries, as well as national language (locale) support. - test2 - 2.0 - 2.fc14 + gpg-pubkey + 9570ff31 + 5e3006fb + (none) + (none) + Fedora (33) <fedora-33-primary@fedoraproject.org> public key + -----BEGIN PGP PUBLIC KEY BLOCK----- +Version: rpm-4.16.1.2 (NSS-3) + +mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie +bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN +kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1 +Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF +QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm +2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k +UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c +oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+ +rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW +6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs +EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB +tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK +CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ +P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV +7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz +AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+ +2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC +GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT +EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+ +fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN +66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun +Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE +Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A== +=EPL3 +-----END PGP PUBLIC KEY BLOCK----- + + + + libgcc + 10.2.1 + 9.fc33 x86_64 + http://gcc.gnu.org + GCC version 10 shared support library + This package contains GCC shared support library which is needed +e.g. for exception handling support. + + + ncurses-base + 6.2 + 3.20200222.fc33 + noarch + https://invisible-island.net/ncurses/ncurses.html + Descriptions of common terminals + This package contains descriptions of common terminals. Other terminal +descriptions are included in the ncurses-term package. - test3 - 3.0 - 3.fc14 + ncurses-libs + 6.2 + 3.20200222.fc33 x86_64 + https://invisible-island.net/ncurses/ncurses.html + Ncurses libraries + The curses library routines are a terminal-independent method of +updating character screens with reasonable optimization. The ncurses +(new curses) library is a freely distributable replacement for the +discontinued 4.4 BSD classic curses library. + +This package contains the ncurses libraries. + + + setup + 2.13.7 + 2.fc33 + noarch + https://pagure.io/setup/ + A set of system configuration and setup files + The setup package contains a set of important system configuration and +setup files, such as passwd, group, and profile. + + + tzdata + 2021a + 1.fc33 + noarch + https://www.iana.org/time-zones + Timezone data + This package contains data files with rules for various timezones around +the world. diff --git a/inspector/expected-fedora.img.xml b/inspector/expected-fedora.img.xml index df6060a73..72cddaf88 100644 --- a/inspector/expected-fedora.img.xml +++ b/inspector/expected-fedora.img.xml @@ -30,22 +30,212 @@ - test1 - 1.0 - 1.fc14 + basesystem + 11 + 10.fc33 + noarch + (none) + The skeleton package which defines a simple Fedora system + Basesystem defines the components of a basic Fedora system +(for example, the package installation order to use during bootstrapping). +Basesystem should be in every installation of a system, and it +should never be removed. + + + bash + 5.0.17 + 2.fc33 + x86_64 + https://www.gnu.org/software/bash + The GNU Bourne Again shell + The GNU Bourne Again shell (Bash) is a shell or command language +interpreter that is compatible with the Bourne shell (sh). Bash +incorporates useful features from the Korn shell (ksh) and the C shell +(csh). Most sh scripts can be run by bash without modification. + + + fedora-gpg-keys + 33 + 3 + noarch + https://fedoraproject.org/ + Fedora RPM keys + This package provides the RPM signature keys. + + + fedora-release + 33 + 3 + noarch + https://fedoraproject.org/ + Fedora release files + Fedora release files such as various /etc/ files that define the release +and systemd preset files that determine which services are enabled by default. + + + fedora-release-common + 33 + 3 + noarch + https://fedoraproject.org/ + Fedora release files + Release files common to all Editions and Spins of Fedora + + + fedora-release-identity-basic + 33 + 3 + noarch + https://fedoraproject.org/ + Package providing the basic Fedora identity + Provides the necessary files for a Fedora installation that is not identifying +itself as a particular Edition or Spin. + + + fedora-repos + 33 + 3 + noarch + https://fedoraproject.org/ + Fedora package repositories + Fedora package repository files for yum and dnf along with gpg public keys. + + + filesystem + 3.14 + 3.fc33 + x86_64 + https://pagure.io/filesystem + The basic directory layout for a Linux system + The filesystem package is one of the basic packages that is installed +on a Linux system. Filesystem contains the basic directory layout +for a Linux operating system, including the correct permissions for +the directories. + + + glibc + 2.32 + 4.fc33 + x86_64 + http://www.gnu.org/software/glibc/ + The GNU libc libraries + The glibc package contains standard libraries which are used by +multiple programs on the system. In order to save disk space and +memory, as well as to make upgrading easier, common system code is +kept in one place and shared between programs. This particular package +contains the most important sets of shared libraries: the standard C +library and the standard math library. Without these two libraries, a +Linux system will not function. + + + glibc-all-langpacks + 2.32 + 4.fc33 + x86_64 + http://www.gnu.org/software/glibc/ + All language packs for glibc. + + + glibc-common + 2.32 + 4.fc33 x86_64 + http://www.gnu.org/software/glibc/ + Common binaries and locale data for glibc + The glibc-common package includes common binaries for the GNU libc +libraries, as well as national language (locale) support. - test2 - 2.0 - 2.fc14 + gpg-pubkey + 9570ff31 + 5e3006fb + (none) + (none) + Fedora (33) <fedora-33-primary@fedoraproject.org> public key + -----BEGIN PGP PUBLIC KEY BLOCK----- +Version: rpm-4.16.1.2 (NSS-3) + +mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie +bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN +kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1 +Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF +QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm +2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k +UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c +oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+ +rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW +6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs +EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB +tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK +CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ +P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV +7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz +AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+ +2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC +GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT +EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+ +fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN +66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun +Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE +Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A== +=EPL3 +-----END PGP PUBLIC KEY BLOCK----- + + + + libgcc + 10.2.1 + 9.fc33 x86_64 + http://gcc.gnu.org + GCC version 10 shared support library + This package contains GCC shared support library which is needed +e.g. for exception handling support. + + + ncurses-base + 6.2 + 3.20200222.fc33 + noarch + https://invisible-island.net/ncurses/ncurses.html + Descriptions of common terminals + This package contains descriptions of common terminals. Other terminal +descriptions are included in the ncurses-term package. - test3 - 3.0 - 3.fc14 + ncurses-libs + 6.2 + 3.20200222.fc33 x86_64 + https://invisible-island.net/ncurses/ncurses.html + Ncurses libraries + The curses library routines are a terminal-independent method of +updating character screens with reasonable optimization. The ncurses +(new curses) library is a freely distributable replacement for the +discontinued 4.4 BSD classic curses library. + +This package contains the ncurses libraries. + + + setup + 2.13.7 + 2.fc33 + noarch + https://pagure.io/setup/ + A set of system configuration and setup files + The setup package contains a set of important system configuration and +setup files, such as passwd, group, and profile. + + + tzdata + 2021a + 1.fc33 + noarch + https://www.iana.org/time-zones + Timezone data + This package contains data files with rules for various timezones around +the world. -- 2.31.1