summaryrefslogtreecommitdiff
path: root/distro-configs
AgeCommit message (Collapse)Author
2021-07-27Try without --disable-database-connectivity when building for iOSTor Lillqvist
This at least makes the configure script succeed again for iOS. See ffc6d564b91692cd9d99a0eb3b1ceaf54f7db89e. Change-Id: Iad7a1561bea09ea0315bb0079af55aad63befc23
2021-06-26use --disable-xmlhelp for fuzzingCaolán McNamara
Change-Id: Ieb6abbf05cdd3577c1653fc0078ee2db6e840a28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117925 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-04Enable PdfIum for android buildmerttumer
Change-Id: I58d09db362f0de991eab3920683530e1ec43e2bc Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115373 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116296 Tested-by: Jenkins
2021-06-01configure: Refactor platform defaultsJan-Marek Glogowski
The main idea was to move complexity from source (and Makefiles) into configure.ac, because otherwise these must replicate the "same" branching, often resulting in diversions. Better to keep the logic in one place (configure.ac) and set additional variables to be used directly by source code and Makefiles. Notably this introduce the "using_*" platform flags, which should be considered constants. There is USING_X11, which actually tells, if the build uses the platform's X11 (and I opted for the removal of HAVE_FEATURE_X11). I also consider variables constant, after they have been exported by AC_SUBST, which should never be conditional, or some AC_DEFINE set them for a config header. A large block of defaults depends on $using_x11, so we set them to the same value, but just if the platform doesn't set it. The other important flag is $using_freetype_fontconfig, if the platform uses freetype and fontconfig. The headless plugin uses cairo for its drawing operations and freetype+fontconfig for text, so $test_cairo = $using_freetype_fontconfig. This is independent from a the cairo canvas! The OpenGL X11 code now depends on USING_X11, but it doesn't yet reflect the filter in Library_vcl.mk protecting glx. I don't know how correct this glx filter is, seeing that the source code just checked for "UNX - some non-X11 targets". Change-Id: Id1ba1a967a5d8d10ee217458be879ed00459f7e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116440 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-05-29fix coverity build failure due to --with-privacy-policy-url=...Caolán McNamara
Change-Id: Ic94cd5fd7aa472c58ff3e95e2b1759d4219ede21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116389 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-26fix callgrind job by providing dummy privacy-urlChristian Lohmaier
Change-Id: I786c14c19f1ac74e424be869771440c55be08877
2021-05-26fix also the Win64 tinderboxesChristian Lohmaier
they were using manual configuration instead of the distro-configs Change-Id: I82a690986e24e704c66297c9bc4c3d3d1e70b636
2021-05-26fix jenkins tinderboxes config after 15ab55c092e0b474827abe104b73c5bfab6ef28cChristian Lohmaier
Change-Id: I108536fbcd557ed899e1b6fda2316c9d89249681
2021-05-26add privacy URL to crashreport dialog & updatecheck tab in optionsChristian Lohmaier
Change-Id: I35cda87c35876469bf581be223bc608e29f07b09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116105 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-05-19Adapt Flatpak build to switch from qrcodegen to zxingStephan Bergmann
Change-Id: Ifcaa703d18a5bae03d389ca2fd69924c4c6ec0e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115773 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-05-18make --disable-odk the defaultNoel Grandin
Because developers (especially new ones) don't need this, or the extra dependencies it tends to trigger Update distro and jenkins configs so that the ones that were building ODK before, are still building it after this. Change-Id: I5dc71e70dc457b7921a146008d7d2317b199caab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115647 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-05WASM: add distro config, amend readmeThorsten Behrens
Let's move common configury to distro config, so people get necessary changes across updates w/o manual intervention. Change-Id: Ic27db86e7681bcef0632ed6b5fdd2fe8df0fdba3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114629 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-04-11Get rid of apache-commons-loggingStephan Bergmann
...using Java 1.4 java.util.logging.Logger instead also for the last remaining uses in reportbuilder. (The mention in swext/mediawiki/src/THIRDPARTYLICENSEREADME.html was presumably a leftover from 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16 "swext: Wiki Publisher does not use those apache-commons libraries".) Change-Id: Ia0bc598fe5844ced11cae497548ec7d09453a99d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113939 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-04-07Updated README.md files to represent current code / use Markdown formatHossein
Previously, all of the README files have been renamed to README.md and now, the contents of these files were changed to use Markdown format. Other than format inconsistency, some README.md files lacked information about modules, or were out of date. By using LibreOffice / OpenOffice wiki and other documentation websites, these files were updated. Now every README.md file has a title, and some description. The top-level README.md file is changed to add links to the modules. The result of processing the Markdown format README.md files can be seen at: https://docs.libreoffice.org/ Change-Id: Ic3b0c3c064a2498d6a435253b041df010cd7797a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113424 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-30drop ---disable-scripting again for fuzzingCaolán McNamara
Change-Id: I80aa5b856d8800f9499fcaf66244ca095e275d5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113378 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-30Update the iOS simulator conf file to match the device oneTor Lillqvist
(But note that it is unclear whether building for the iOS simulator actually works any longer, and I am not really interested in trying.) Change-Id: Ifb4fecdbd20162728bfcb0750264c0a627e66279
2021-03-29disable scripting for oss-fuzz tooCaolán McNamara
Change-Id: Ia7689f008517165d0bedb583c1452ac535553234 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113325 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-24Using .md extension/Markdown syntax for modules READMEHossein
Renaming all README files for all top level modules to README.md, applying no content change at this stage to be able to track history of the files. These files should be edited to use correct Markdown syntax later. Change-Id: I542fa3f3d32072156f16eaad2211a397cc212665 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112977 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-03-23qrcodegen was replaced by zxingCaolán McNamara
Change-Id: Ide907ba33bb7a67a7bef32d688137e5429707df5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112951 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-16Do build Pdfium for iOS, tooTor Lillqvist
For it to compile, the inclusion of <Carbon/Carbon.h> had to be replaced with <CoreGraphics/CoreGraphics.h>. That doesn't harm the macOS build either. This fixes the crash in https://github.com/CollaboraOnline/online/issues/1710 . I am not entirely sure yet whether the actual PDF import functionality now then works in the iOS app, though. Change-Id: Ie25e7c58632c0fdddb569d58217f23b26d1e5937 Signed-off-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112571 Tested-by: Jenkins
2020-12-25Remove vlc part since experimental since 5 yearsJulien Nabet
However considering git history about vlc part (see https://cgit.freedesktop.org/libreoffice/core/log/?qt=grep&q=vlc) it seems there's no real patch since 2013 + it's been explicitely indicated as experimental since 2015 See http://document-foundation-mail-archive.969070.n3.nabble.com/About-vcl-status-in-avmedia-keep-or-removed-unmaintained-code-since-7-years-tt4293282.html Of course if someone wants to keep on the work on it, it's always possible to revert the patch. Change-Id: Ia1602ea61b7ffa577148a80f974ebdcb71495fbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108283 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-10-04Add a LibreOfficeWinArm64.confJan-Marek Glogowski
This is just tested with a cross-build including Java: --with-distro-config=LibreOfficeWinArm64 \ --with-build-platform-configure-options="\ --with-jdk-home=C:/PROGRA~1/Java/JDK-14~1.1" \ --with-jdk-home=/cygdrive/c/lode/jdk-16-ea+25-windows-aarch64 Change-Id: I762049d34e6a00fec0960395f94d6537047f6061 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103643 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-10-01add distro-configs for jenkins android buildsChristian Lohmaier
Change-Id: I7923c16670d53bb52dac771776093d4b06fd05b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103725 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-09-21add an explicit --disable-qrcodegen configure optionCaolán McNamara
Change-Id: If8e965fa955aecdb9e7011bdddc690de9cad0c4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103120 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-14use new 32bit configure flags for jenkins windows-screenshot builderChristian Lohmaier
Change-Id: I02a5e3a018263184017dc397330781e9b60639c8
2020-09-11use 32bit configure flags for 32bit windows jenkins TBChristian Lohmaier
Change-Id: I621a049cbebb6e3ebe052098b1d945aaa9f075d7
2020-09-11WIN drop --enable-64bit to select Windows targetJan-Marek Glogowski
This changes the Windows build to use the default configure switch to select the target / host of the compiled binaries to get the possibility to cross compile on Windows the "default" way. Note that selecting i686-pc-cygwin on x86_64 doesn't do a cross- compilation, as no special build tools are needed, because x86_64 can run x86 binaries just fine. A consequence of the change is the default target host, which is now the same then the build system, instead of the previous x86 default. Change-Id: I5584f34f665573ebac40d5d7753d96addeb84dbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102479 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-07-01android: Add a CP x86 configuration too.Jan Holesovsky
Change-Id: I8d584811244cd613b8637d9dd2cf1bfe1985ecec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97610 Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 9213bfce95aa3300d87c5fece638a0d8101c718e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97579 Tested-by: Jenkins
2020-07-01Adapt Flatpak build to new Box2D external requirementStephan Bergmann
...introduced with a7f2239e649ea1b9ef611d758841584ab51abed0 "external: bundle box2d" Change-Id: Ia1a46dc517073d3cf7f221d3f7275741e94995a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97629 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-06-29Initial WIP steps for building for macOS on Apple SiliconTor Lillqvist
Don't use $host_os="darwin" for both macOS and iOS depending on $host_cpu. Soon macOS will run on either x86_64 or arm64. Instead, use "darwin" (or "macos") for macOS and "ios" for iOS. Some other early changes for arm64-apple-macos, too. Change-Id: Id89987d854ceba2cd87c6222db2081ccdec0c73e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96976 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-26android: Add a CP x86-64 configuration.Jan Holesovsky
Change-Id: Icdfee0a6609487f5ac2423c74344cb605b7e4fbf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97130 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-18use jdk11 also for the perfsuite jenkins configChristian Lohmaier
was forgotten when the other config were adjusted in 6cd885b46bf168a1fe0d91231a1b6d283f813ed3 Change-Id: I35de4248a6f835ed13cc1bdb28713b156a4785bd
2020-06-18go for the easy fix and use internal python for the callgrind jobChristian Lohmaier
instead of finding a way to not break it again for others (see https://gerrit.libreoffice.org/c/core/+/91748 and https://gerrit.libreoffice.org/c/core/+/90906 ) Change-Id: I3291dbc1552c7601a93a9b30a98ae43f238e2c5d
2020-05-26jenkins linux configs: use jdk 11 for masterChristian Lohmaier
mac uses /usr/libexec/java_home to determine jdk and without -v option to limit to a specific version returns latest one Change-Id: I8c8122ed71a31f990c3ffa1e71b180cbece7f172 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94862 Tested-by: Jenkins Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-04-30tango theme was removedCaolán McNamara
Change-Id: I351c92a6a2519c2c8b7b1c6868194c1bee81aa12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93215 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-29Remove tango icon theme, tdf#132022Rizal Muttaqin
Change-Id: Ifd1d3999d1c6eb9aba7919850859e6b7cb652e3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92055 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-04-22use without-latest-c++ in coverity confCaolán McNamara
Change-Id: Ie72fb05ef0d687c3f442f6372f591f94815cf9d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92674 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-09Try --disable-split-debug for distro-configs/Jenkins/linux_clang_dbgutil_64Stephan Bergmann
...in the hope that it will fix gdb backtrace generation for those Jenkins builds, as just discussed on Freenode #libreoffice-dev: > Apr 09 14:03:47 <sberg> mst___, cloph, didn't you discuss broken gdb > backtraces on some Jenkins bots the other day? > <https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/56703/console> is > another example of the bt for thread 1 missing, probably because gdb went > south or something > Apr 09 14:06:05 <llunak> sberg: that looks like gdb is too old to handle debug > info produced by that clang version > Apr 09 14:08:05 <llunak> sberg: and presumably --disable-split-debug would be > a workaround with some (not sure how big) performance cost > Apr 09 14:11:43 <mst___> yeah there were lots of complaints about > incomprehensible DWARFs in that log Change-Id: I69aa80fdd13148330d00231eefe37cbf965fe4d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91970 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-03-09Add --disable-compiler-plugins-analyzer-pch for Jenkins/linux_clang_dbgutil_64Stephan Bergmann
<https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/54883/> had been a case I noticed of a "Gerrit Linux clang/dbgutil" build failing due to stale PCH information: [...] > [build GEN] compilerplugins/clang/sharedvisitor/makeshared.plugininfo > fatal error: file '/usr/include/asm-generic/errno.h' has been modified since the precompiled header '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/compilerplugins/clang/sharedvisitor/clang.pch' was built > note: please rebuild precompiled header '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/compilerplugins/clang/sharedvisitor/clang.pch' [...] and this issue had apparently caused all those Gerrit Jenkins builds to fail for at least a day. For unmaintained builds like those, I think it is better to have a more robust setup, where stale PCH information cannot break the build. Also, as those builds do not make compilerplugins.clean and rather share it across builds, there should not be much of a performance impact when disabling PCH in the analyzer. (It turns out that compilerplugins/clang/sharedvisitor/analyzer.cxx would always have enabled PCH, as compilerplugins/Makefile-clang.mk always passes in some definition of LO_CLANG_USE_ANALYZER_PCH. Fixed that now.) Change-Id: I7b8b24c1049c501634bd59c5fb482bec72427cf6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90211 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2020-02-21Revert "make Linux Clang Jenkins builds use -Og"Luboš Luňák
Per discussion in https://gerrit.libreoffice.org/c/core/+/88918 the Jenkins Clang is 5.0.2, which seems to be too old to even handle properly some kind of debuginfo with -Og. So while this indeed does make Jenkins builds faster, this has to wait until Jenkins uses a Clang version that can handle this better :(. This reverts commit c922d13b5b0ad983e64a046405fca9cd048c75fc.
2020-02-19make Mac Jenkins build use --enable-optimizedLuboš Luňák
Since ccache is used, this will hopefully on average improve Jenkins build times by making tests run faster while compilations will usually get cached. Change-Id: I191f826f704001b83130c8baf6889a7a2b33ca7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88919 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-19make Linux Clang Jenkins builds use -OgLuboš Luňák
This should make builds run faster because unittests will run faster, while the compilations shouldn't take longer (primarily because of ccache use). Change-Id: I6ea5d7566397b09339b06a515712a9162df6e9fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88918 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-11Introduce INCLUDE: in the distro-configs...Jan Holesovsky
...to be able to have a common base for things, and then apply some additional stuff on top - in this case the Android branding for the CP builds. Change-Id: I43118bba84fddb8508cc4688c83c2d81a103d781 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88440 Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 8dd75f47d9d571ed557fd360b8f9ff7aaca335af) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88400 Tested-by: Jenkins
2019-12-09ofz#19296 disable skia for oss-fuzzCaolán McNamara
Change-Id: I85ee6689c71a445c59d6b054cd93ea1fbac5f8ba Reviewed-on: https://gerrit.libreoffice.org/84737 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-29Disable skia for onlineSamuel Mehrbrodt
Change-Id: Ia4ae44be19d21e6ec2c1ac6d7d9b2d0933bbb97e Reviewed-on: https://gerrit.libreoffice.org/84033 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-10-24gandalf is no longer using devtoolsetChristian Lohmaier
Change-Id: I3c9d48714994fe8c00da5a48ec2d05bba6b2ca2e
2019-10-16use --disable-symbols with Jenkins Win/Mac builds that use dbgutilLuboš Luňák
We want debug builds there, but the debugging symbols for debugger themselves are not actually needed (Linux builds use the debug symbols for printing backtraces when a unittest crashes, but Win/Mac do not). This should save generating the needless debug info (CPU and I/O). Change-Id: I3fc8bdb66e4822838216359b23b8a2dd5f2a0f42 Reviewed-on: https://gerrit.libreoffice.org/80732 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-16use --disable-dependency-tracking for Jenkins buildsLuboš Luňák
They always start with 'make clean' (at least according to the logs), so they are always one-time builds where creating dependencies is not needed. Change-Id: If402fbaa21bd213e3f781985479dd49c266ca511 Reviewed-on: https://gerrit.libreoffice.org/80730 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-15gandalf now has gcc9 / no devtoolsetChristian Lohmaier
Change-Id: I2e5ded126f99ea7eb79d2db57240203dd3025e67
2019-10-01Use --with-sytem-cairo for the ASan+UBSan tinderbox againStephan Bergmann
After 1ae450504cf57457f9702684b1517fda1dd3c481 "drop gtk2 support" removed the implicit --enable-gtk which removed the implicit --with-system-cairo, <https://ci.libreoffice.org/job/lo_ubsan/1402/> started to fail with > [build LNK] Executable/canvasdemo [...] > /home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libcairo.so.2: undefined reference to `__muloti4' [...] > clang-9: error: linker command failed with exit code 1 (use -v to see invocation) > /home/tdf/lode/jenkins/workspace/lo_ubsan/solenv/gbuild/LinkTarget.mk:635: recipe for target '/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/LinkTarget/Executable/canvasdemo' failed etc. Instead of trying to fix that, just explicitly build --with-system-cairo again. (Another approach could be to --enable-gtk3, which implicitly sets --with-system-cairo, too.) Change-Id: I335b2a694b85a15efae6002d890ce0d67811b2bb Reviewed-on: https://gerrit.libreoffice.org/79962 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>