[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] 16 commits: Bump symbol versions
Guido Günther
gitlab at salsa.debian.org
Fri Jan 17 15:58:53 GMT 2020
Guido Günther pushed to branch debian/experimental at Libvirt Packaging Team / libvirt
Commits:
70c56769 by Guido Günther at 2020-01-17T16:58:33+01:00
Bump symbol versions
- - - - -
eb6c6c18 by Guido Günther at 2020-01-17T16:58:33+01:00
gitlab-ci: Build package
We unfortunately can't use salsa-ci's prebuilt pipeline since
that hangs on large jobs:
https://salsa.debian.org/salsa/support/issues/180
We redirct output to a file to work around:
https://salsa.debian.org/salsa/support/issues/191
- - - - -
8adbb6f7 by Guido Günther at 2020-01-17T16:58:33+01:00
gitlab-ci: Run lintian
Gbp-Dch: Ignore
- - - - -
01b1e00e by Guido Günther at 2020-01-17T16:58:33+01:00
gitlab-ci: Make sure gbp dch sees the upstream branch
Otherwise it will not correctly pick up new upstream versions
- - - - -
6d6e28bf by Guido Günther at 2020-01-17T16:58:33+01:00
gitlab-ci: Make sure we also export the changelog
Otherwise we end up with the wrong changelog in the exported
directory.
Gbp-Dch: Ignore
- - - - -
0450954c by Guido Günther at 2020-01-17T16:58:33+01:00
gitlab-ci: Setup user name and email
This makes sure we don't get bogus changelog entries.
- - - - -
5639ffb7 by Christian Ehrhardt at 2020-01-17T16:58:33+01:00
d/control: bump build dep to python3
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
dc99d355 by Christian Ehrhardt at 2020-01-17T16:58:33+01:00
d/rules: set enable-dependency-tracking to avoid FTBFS
Temporary workaround until build uses meson:
[16:28] <cpaelzer> phrdina: hiho a question about b98f90cf "src: access: generate source files into build directory"
[16:28] <cpaelzer> I see the debian build entering a dir make[3]: Entering directory '/<<PKGBUILDDIR>>/debian/build/src'
[16:29] <cpaelzer> of that "<<PKGBUILDDIR>>/debian/build" is the builddir
[16:29] <cpaelzer> now later on I see the following fail
[16:29] <cpaelzer> ...
[16:29] <cpaelzer> 4259 /usr/bin/perl -w ../../../src/rpc/gendispatch.pl --mode=aclheader \
[16:29] <cpaelzer> 4260 remote REMOTE ../../../src/remote/remote_protocol.x \
[16:29] <cpaelzer> 4261 > access/viraccessapicheck.h
[16:29] <cpaelzer> 4262 /bin/bash: access/viraccessapicheck.h: No such file or directory
[16:29] <cpaelzer> phrdina: what would create the dir "access" in the build dir to be ready for hte generated file to be placed there
[16:30] <danpb> cpaelzer: i bet you have --disable-dependancy-tracking passed to configure
[16:30] <cpaelzer> src/access obviously existed in the past but with building relative to the build dir some step is missing
[16:30] <cpaelzer> danpb: checking for disable-dependancy-tracking ...
[16:31] <danpb> for reasons i don't understand this option breaks creation of sub-dirs when using separate VPATH build
[16:32] <cpaelzer> --disable-dependency-tracking
[16:32] <cpaelzer> it isn't in the debian packaging, but the tools set it by default
[16:32] <cpaelzer> hence I only found it in the build log
[16:32] <danpb> yeah, i was going to say that the debian build helpers probably set it
[16:33] <danpb> there's probably a more correct fix than just removing this cli flag
[16:33] <danpb> but we don't much care to investigate given that we're trying to switch to meson asap
[16:33] <danpb> so i've just been telling everyone to remove use of this flag
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
9aec71e1 by Christian Ehrhardt at 2020-01-17T16:58:33+01:00
d/rules: drop the no more existing phyp option
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
6908cf53 by Christian Ehrhardt at 2020-01-17T16:58:34+01:00
d/rules: enable build time self tests on all architectures
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
af131c77 by Christian Ehrhardt at 2020-01-17T16:58:34+01:00
d/rules: drop the no more existing xen configure option
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
a3a7c114 by Christian Ehrhardt at 2020-01-17T16:58:34+01:00
Further adapt d/p/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch for v6.0.0
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Gbp-Dch: Ignore
- - - - -
84367d9d by Christian Ehrhardt at 2020-01-17T16:58:34+01:00
d/control: add python3-docutils as build dependency
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
37f0a5c6 by Christian Ehrhardt at 2020-01-17T16:58:34+01:00
d/libvirt-doc.doc: install rendered docs
- new doc build properly puts all we need into
debian/tmp/usr/share/doc/libvirt/html/.
Simplifies many rules (src:docs mostly has .in files nowadays)
- devhelp became devguide and is installed there
- internals (html.in) rendered and installed thre
- kbase (rst) is rendered and installed there
- logos are installed there
- examples directory is there
- this change does not seem to re-introduce
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=492075
- dh_installdocs adds package name, so pull from libvirt/*
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
880f00e2 by Christian Ehrhardt at 2020-01-17T16:58:34+01:00
d/libvirt-daemon-system.examples: Drop examples that are now conf files
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
671aeca3 by Christian Ehrhardt at 2020-01-17T16:58:34+01:00
d/libvirt-doc.doc-base.libvirt-doc: adapt doc base to new file placement
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
- - - - -
8 changed files:
- debian/control
- debian/libvirt-daemon-system.examples
- debian/libvirt-doc.doc-base.libvirt-doc
- debian/libvirt-doc.docs
- debian/libvirt0.symbols
- debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
- debian/rules
- + debian/salsa-ci.yml
Changes:
=====================================
debian/control
=====================================
@@ -43,7 +43,8 @@ Build-Depends:
libdbus-1-dev [linux-any],
nfs-common,
systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390],
- python,
+ python3,
+ python3-docutils,
xsltproc,
zfsutils [kfreebsd-amd64 kfreebsd-i386],
po-debconf,
=====================================
debian/libvirt-daemon-system.examples
=====================================
@@ -1,4 +1,2 @@
-src/remote/libvirtd.conf
src/remote/libvirtd.policy
-src/remote/libvirtd.sasl
src/remote/libvirtd.sysctl
=====================================
debian/libvirt-doc.doc-base.libvirt-doc
=====================================
@@ -4,5 +4,5 @@ Abstract: Local copy of the web site of libvirt
Section: System/Administration
Format: HTML
-Index: /usr/share/doc/libvirt-doc/index.html
-Files: /usr/share/doc/libvirt-doc/*.html
+Index: /usr/share/doc/libvirt-doc/html/index.html
+Files: /usr/share/doc/libvirt-doc/html/*.html
=====================================
debian/libvirt-doc.docs
=====================================
@@ -1,12 +1 @@
-docs/*.rng
-docs/*.png
-docs/*.xml
-docs/*.html
-docs/*.gif
-docs/*.css
-docs/html/
-docs/devhelp/
-docs/internals/
-docs/kbase/
-docs/logos/
-examples/
+/usr/share/doc/libvirt/*
=====================================
debian/libvirt0.symbols
=====================================
@@ -121,7 +121,12 @@ libvirt.so.0 libvirt0 #MINVER#
*@LIBVIRT_5.2.0 5.2.0~rc1
*@LIBVIRT_5.5.0 5.6.0
*@LIBVIRT_5.6.0 5.6.0
- *@LIBVIRT_PRIVATE_5.6.0 5.6.0
+ *@LIBVIRT_5.7.0 6.0.0~rc1
+ *@LIBVIRT_5.8.0 6.0.0~rc1
+ *@LIBVIRT_5.9.0 6.0.0~rc1
+ *@LIBVIRT_5.10.0 6.0.0~rc1
+ *@LIBVIRT_6.0.0 6.0.0~rc1
+ *@LIBVIRT_PRIVATE_6.0.0 6.0.0~rc1
libvirt-qemu.so.0 libvirt0 #MINVER#
*@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -143,4 +148,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
*@LIBVIRT_ADMIN_1.3.0 1.2.18
*@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
*@LIBVIRT_ADMIN_3.0.0 3.0.0
- *@LIBVIRT_ADMIN_PRIVATE_5.6.0 5.6.0
+ *@LIBVIRT_ADMIN_PRIVATE_6.0.0 6.0.0~rc1
=====================================
debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
=====================================
@@ -18,8 +18,8 @@ require the 'TERM' environment variable to be set to the terminal type.
virCommandAddEnvPass(cmd, "KRB5CCNAME");
virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
virCommandAddEnvPass(cmd, "SSH_ASKPASS");
-+ virCommandAddEnvPass(cmd, "GPG_TTY", NULL);
-+ virCommandAddEnvPass(cmd, "TERM", NULL);
++ virCommandAddEnvPass(cmd, "GPG_TTY");
++ virCommandAddEnvPass(cmd, "TERM");
virCommandAddEnvPass(cmd, "DISPLAY");
virCommandAddEnvPass(cmd, "XAUTHORITY");
virCommandClearCaps(cmd);
=====================================
debian/rules
=====================================
@@ -18,14 +18,12 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
WITH_VBOX = --without-vbox
endif
ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 armhf arm64))
- MAKE_CHECK = 1
- WITH_XEN = --with-xen
WITH_LIBXL = --with-libxl
XEN_ENABLED = 1
else
- WITH_XEN = --without-xen
WITH_LIBXL = --without-libxl
endif
+ MAKE_CHECK = 1
WITH_STORAGE_LVM = --with-storage-lvm
WITH_STORAGE_ISCSI = --with-storage-iscsi
WITH_STORAGE_DISK = --with-storage-disk
@@ -84,7 +82,6 @@ else
WITH_APPARMOR = --without-apparmor
WITH_NSS_PLUGIN = --without-nss-plugin
WITH_DTRACE = --without-dtrace
- WITH_XEN = --without-xen
WITH_LIBXL = --without-libxl
WITH_VBOX = --without-vbox
endif
@@ -94,6 +91,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
--with-packager="$(DEB_BUILDUSER) $(DEB_BUILDDATE)" \
--with-packager-version="$(DEB_RELEASE)" \
--with-default-editor="sensible-editor" \
+ --enable-dependency-tracking \
--disable-silent-rules \
--disable-rpath \
--with-qemu \
@@ -119,13 +117,11 @@ DEB_CONFIGURE_EXTRA_ARGS := \
$(WITH_SELINUX) \
$(WITH_APPARMOR) \
--with-esx \
- --without-phyp \
$(WITH_CAPNG) \
--enable-debug \
$(WITH_MACVTAP) \
$(WITH_NETWORK) \
$(WITH_NETCF) \
- $(WITH_XEN) \
$(WITH_LIBXL) \
$(WITH_VBOX) \
$(WITH_LXC) \
=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,56 @@
+stages:
+ - build
+ - test
+
+variables:
+ # Default docker image to use
+ LV_DOCKER_IMAGE: debian:unstable
+ LV_WORKING_DIR: $CI_PROJECT_DIR/debian/output
+
+build-debian-package:
+ image: ${LV_DOCKER_IMAGE}
+ stage: build
+ timeout: 3h
+ before_script:
+ - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+ - export DEBIAN_FRONTEND=noninteractive
+ - apt-get -y update
+ - apt-get -y install build-essential git-buildpackage pristine-tar
+ - apt-get -y build-dep .
+ - rm -f ../* || true
+ - git config user.email 'libvirt at exmple.com'
+ - git config user.name 'Gitlab CI'
+ script:
+ - 'UPSTREAM_BRANCH=$(gbp config dch.upstream-branch)'
+ - git branch "${UPSTREAM_BRANCH}" "origin/${UPSTREAM_BRANCH}"
+ - gbp dch --git-author -S -a --ignore-branch
+ - mkdir -p "${LV_WORKING_DIR}/tarballs"
+ - gbp export-orig --tarball-dir="${LV_WORKING_DIR}/tarballs"
+ --pristine-tar
+ - git add debian/changelog
+ - gbp buildpackage --git-ignore-new
+ --git-ignore-branch
+ --git-export-dir="${LV_WORKING_DIR}/"
+ --git-export=INDEX
+ --git-tarball-dir="${LV_WORKING_DIR}/tarballs"
+ -j -b -uc -us > "${LV_WORKING_DIR}/build.log"
+ artifacts:
+ when: always
+ paths:
+ - "${LV_WORKING_DIR}/build.log"
+ - "${LV_WORKING_DIR}/*.deb"
+ - "${LV_WORKING_DIR}/*.buildinfo"
+ - "${LV_WORKING_DIR}/*.changes"
+
+lint-debian-package:
+ image: ${LV_DOCKER_IMAGE}
+ dependencies:
+ - build-debian-package
+ before_script:
+ - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+ - export DEBIAN_FRONTEND=noninteractive
+ - apt-get -y update
+ - apt-get -y install lintian
+ script:
+ - ls "${LV_WORKING_DIR}"
+ - lintian ${LV_LINTIAN_OPTS} ${LV_WORKING_DIR}/*.changes
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/cc6b955fe06b03bbd8e74813848680d24434a530...671aeca3f9cff3b8da38624e5af389a5aa7fa601
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/cc6b955fe06b03bbd8e74813848680d24434a530...671aeca3f9cff3b8da38624e5af389a5aa7fa601
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20200117/3485fa94/attachment-0001.html>
More information about the Pkg-libvirt-commits
mailing list